Integration of Marimo Tutorials for xtc-paper

pyproject.toml

@@ -20,8 +20,10 @@ dev = [
     "pytest-xdist",
     "pyright==1.1.407",
     "types-PyYAML",
-    "marimo==0.19.6",
+    "marimo>=0.20.0",
     "ruff==0.14.10",
+    "matplotlib",
+    "plotly"
 ]
 
 [tool.setuptools]
@@ -66,7 +68,7 @@ reportMissingImports = false
 #reportMissingTypeArgument = "error"
 
 [tool.mypy]
-python_version = "3.10"
+python_version = "3.12"
 packages = ["xtc", "docs.marimo"]
 ignore_missing_imports = true
 check_untyped_defs = true
@@ -102,3 +104,6 @@ exclude = [
 ]
 line-length = 88
 indent-width = 4
+
+[tool.marimo.runtime]
+output_max_bytes = 11_000_000

requirements_dev.txt

@@ -11,3 +11,5 @@ pytest-xdist
 pyright==1.1.407
 types-PyYAML
 ruff==0.14.10
+altair
+plotly

src/xtc/cli/display_results.py

@@ -85,16 +85,27 @@ def draw_cor(
     Y: Sequence[float],
     ref_label: str | None = None,
     label: str | None = None,
+    alpha: float = 1,
 ):
     ax.scatter(
         Yref,
         Y,
         label=label,
+        alpha=alpha,
     )
     if ref_label:
         ax.set_xlabel(ref_label)
 
 
+def draw_diag(
+    ax: Any,
+    ymin: float = 0,
+    ymax: float = 1,
+):
+    xy = [[ymin, ymax]] * 2
+    ax.plot(*xy, alpha=0.6, color="grey", linestyle="--")
+
+
 def save_fig(fname: str | Path):
     fig = plt.gcf()
     dpi = fig.dpi
@@ -120,6 +131,11 @@ def display_results(results: Sequence[ns], args: ns):
         setattr(axes, type, axs[idx])
         idx += 1
 
+    Ymin = min([min(r.Y) for r in results])
+    Ymax = max([max(r.Y) for r in results])
+    ymin = (Ymin * 100) // 10 / 10
+    ymax = (Ymax * 100 + 9) // 10 / 10
+
     if args.pmf:
         for res in results:
             draw_pmf(axes.pmf, res.Y, label=res.label)
@@ -134,10 +150,18 @@ def display_results(results: Sequence[ns], args: ns):
 
     if args.cor:
         assert len(results) >= 2
+        if args.diag:
+            draw_diag(axes.cor, ymin, ymax)
         ref = results[0]
         for res in results[1:]:
-            print("XXX", len(ref.Y), len(res.Y))
-            draw_cor(axes.cor, ref.Y, res.Y, ref_label=ref.label, label=res.label)
+            draw_cor(
+                axes.cor,
+                ref.Y,
+                res.Y,
+                ref_label=ref.label,
+                label=res.label,
+                alpha=args.alpha,
+            )
         axes.cor.legend(loc="upper left")
         axes.cor.set_title("Peak performance correlation")
 
@@ -175,12 +199,24 @@ def main():
         default=False,
         help="draw correlation",
     )
+    parser.add_argument(
+        "--diag",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="draw diagonal on correlation",
+    )
     parser.add_argument(
         "--show",
         action=argparse.BooleanOptionalAction,
         default=True,
         help="show figure",
     )
+    parser.add_argument(
+        "--alpha",
+        type=float,
+        default=0.6,
+        help="correlation alpha",
+    )
     parser.add_argument(
         "--debug", action=argparse.BooleanOptionalAction, help="debug mode"
     )