[Graph] Some cleanup

Author: bobot

smtcomp/generate_graphics.py

@@ -64,16 +64,17 @@ def create_output(
 
     # Replace integer by names
     # It should be possible to do it later in altair; the html file would be smaller
-    for lookup, replaced in [
-        (defs.Answer, "answer"),
-        (defs.Answer, "answer2"),
-        (defs.Logic, "logic"),
-        (defs.Division, "division"),
-    ]:
-        lf_lookup = pl.DataFrame(
-            data=((int(n), str(n)) for n in lookup), schema=[(replaced, pl.Int8), ("pretty", pl.String)]
-        ).lazy()
-        results = results.join(lf_lookup, how="left", on=replaced).drop(replaced).rename({"pretty": replaced})
+    if True:
+        for lookup, replaced in [
+            (defs.Answer, "answer"),
+            (defs.Answer, "answer2"),
+            (defs.Logic, "logic"),
+            (defs.Division, "division"),
+        ]:
+            lf_lookup = pl.DataFrame(
+                data=((int(n), str(n)) for n in lookup), schema=[(replaced, pl.Int8), ("pretty", pl.String)]
+            ).lazy()
+            results = results.join(lf_lookup, how="left", on=replaced).drop(replaced).rename({"pretty": replaced})
 
     buckets = results.select(c_bucket.unique())
 

smtcomp/main.py

@@ -1131,12 +1131,11 @@ def generate_certificates(
 @app.command()
 def generate_graphics(
     data: Path,
-    output_dir: Path,
+    output: Path,
     logic: list[defs.Logic] = [],
     division: list[defs.Division] = [],
     track: defs.Track = defs.Track.SingleQuery,
     src: List[Path] = typer.Argument(None),
-    kind: smtcomp.scoring.Kind = typer.Argument(default="par"),
 ) -> None:
     """
     Generate graphics in html format
@@ -1150,4 +1149,4 @@ def generate_graphics(
 
     results = smtcomp.scoring.add_disagreements_info(results, track).filter(disagreements=False).drop("disagreements")
 
-    smtcomp_generate_graphics.create_output(config, results, output_dir / "test.html", logic, division)
+    smtcomp_generate_graphics.create_output(config, results, output, logic, division)