tpattern 0.1.5__tar.gz → 0.1.7__tar.gz

{tpattern-0.1.5/tpattern.egg-info → tpattern-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpattern
-Version: 0.1.5
+Version: 0.1.7
 Summary: Open, auditable temporal & sequential pattern analysis (T-patterns) for sport and behaviour
 Author-email: Andrew Callaway <acallaway@bournemouth.ac.uk>
 License-Expression: MIT

{tpattern-0.1.5 → tpattern-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tpattern"
-version = "0.1.5"
+version = "0.1.7"
 description = "Open, auditable temporal & sequential pattern analysis (T-patterns) for sport and behaviour"
 readme = "README.md"
 requires-python = ">=3.9"

tpattern-0.1.7/tests/test_report_dendrogram.py

@@ -0,0 +1,51 @@
+"""Regression: report()/patterns_overview must handle a single composite pattern.
+
+With cols=2, plt.subplots returns a 2-axis ndarray even for one pattern; the old
+code wrapped that array in a list and passed it to pattern_dendrogram, which then
+called ndarray.plot(). The de-duplication work collapsed the quickstart to exactly
+one composite, exposing the crash in report().
+"""
+import matplotlib
+matplotlib.use("Agg")
+
+from tpattern import Config, Engine, calibrate, report
+from tpattern.viz import patterns_overview
+from tpattern.synthetic import SyntheticSpec, make_dataset
+
+
+def _planted():
+    obs, _ = make_dataset(SyntheticSpec(
+        n_seq=300, planted=[("A", 0), ("B", 1500)], plant_fraction=0.15,
+        jitter=200, bg_rate=2.5, seed=7))
+    return obs
+
+
+def test_patterns_overview_single_composite(tmp_path):
+    obs = _planted()
+    comps = [p for p in Engine(obs, Config(min_lag=1)).detect() if p.level >= 1]
+    assert comps, "planted data should yield at least one composite"
+    out = tmp_path / "ov.png"
+    patterns_overview(comps[:1], str(out))   # the n == 1 path
+    assert out.exists() and out.stat().st_size > 0
+
+
+def test_report_writes_dendrogram(tmp_path):
+    obs = _planted()
+    r = calibrate(obs, Config(min_lag=1), null="profile", B=50, seed=1)
+    import os
+    w = report(r, str(tmp_path / "out"), title="t")
+    assert os.path.exists(w["dendrograms"]) and os.path.getsize(w["dendrograms"]) > 0
+
+
+def test_forest_plot_degenerate_ci(tmp_path):
+    """An odds-ratio CI can hit 0 or inf (a group with a zero cell); forest_plot
+    must not set a non-positive/inf limit on its log x-axis."""
+    import warnings
+    from tpattern import forest_plot
+    items = [{"label": "a", "or": 2.0, "lo": 0.0, "hi": float("inf")},
+             {"label": "b", "or": 1.5, "lo": 0.8, "hi": 3.0}]
+    out = tmp_path / "forest.png"
+    with warnings.catch_warnings():
+        warnings.simplefilter("error", UserWarning)
+        forest_plot(items, str(out))
+    assert out.exists() and out.stat().st_size > 0

{tpattern-0.1.5 → tpattern-0.1.7}/tpattern/__init__.py

@@ -6,7 +6,7 @@ behavior: T-patterns and their detection. Behavior Research Methods,
 Instruments, & Computers, 32(1), 93-110.
 """
 
-__version__ = "0.1.5"   # defined before submodule imports (methods.py reads it)
+__version__ = "0.1.7"   # defined before submodule imports (methods.py reads it)
 
 from .io import Observation, read_observation, read_sample, read_table
 from .pattern import Instance, Pattern

{tpattern-0.1.5 → tpattern-0.1.7}/tpattern/advisor.py

@@ -50,12 +50,55 @@ class Recommendation:
     notes: list[str] = field(default_factory=list)
 
     def __str__(self) -> str:
-        lines = [f"Dataset: {self.n_obs} observations, {self.n_events} events\n"]
+        """Readable plain-text view: each setting, its recommended value, then the
+        wrapped reason. Kept ANSI/markup-free so it can be pasted verbatim."""
+        import textwrap
+        w = 76
+
+        def wrap(text, first, rest):
+            return textwrap.fill(text, width=w, initial_indent=first,
+                                 subsequent_indent=rest)
+
+        out = ["=" * w,
+               f"RECOMMENDED SETTINGS   ({self.n_obs:,} observations, "
+               f"{self.n_events:,} events)",
+               "=" * w]
         for c in self.choices:
-            lines.append(f"[{c.option}]  ->  {c.recommended}\n    {c.rationale}")
+            out += ["", f"  {c.option}  ->  {c.recommended}",
+                    wrap(c.rationale, "     ", "     ")]
         for n in self.notes:
-            lines.append(f"[note]  {n}")
-        return "\n".join(lines)
+            out += ["", wrap(n, "  * ", "    ")]
+        return "\n".join(out)
+
+    def _repr_html_(self) -> str:
+        """Rich rendering in notebooks (Colab/Jupyter): the recommended value in
+        bold, the setting name and explanation in normal weight. Shown when you
+        display the object (a bare `rec` or `display(rec)`); `print(rec)` still
+        gives the plain-text view above."""
+        import html
+
+        def esc(s):
+            return html.escape(str(s))
+
+        rows = "".join(
+            '<div style="margin:0 0 11px 0;">'
+            f'<div><span style="color:#6b7280;">{esc(c.option)}:</span> '
+            f'<strong style="color:#111;">{esc(c.recommended)}</strong></div>'
+            f'<div style="color:#4b5563;margin-top:2px;">{esc(c.rationale)}</div>'
+            '</div>'
+            for c in self.choices)
+        notes = ""
+        if self.notes:
+            lis = "".join(f'<li style="color:#4b5563;margin:2px 0;">{esc(n)}</li>'
+                          for n in self.notes)
+            notes = f'<ul style="margin:6px 0 0 0;padding-left:18px;">{lis}</ul>'
+        return (
+            '<div style="font-family:system-ui,-apple-system,Segoe UI,sans-serif;'
+            'font-size:13px;line-height:1.5;max-width:780px;">'
+            '<div style="font-weight:600;font-size:14px;margin-bottom:8px;'
+            'padding-bottom:5px;border-bottom:1px solid #e5e7eb;">'
+            f'Recommended settings &nbsp;&middot;&nbsp; {self.n_obs:,} observations, '
+            f'{self.n_events:,} events</div>{rows}{notes}</div>')
 
     def methods_text(self) -> str:
         """A ready-to-adapt Methods paragraph, grounded in the measured values."""

{tpattern-0.1.5 → tpattern-0.1.7}/tpattern/report.py

@@ -141,10 +141,15 @@ def forest_plot(items, outfile: str, title: str = "Effect sizes (odds ratios)",
     fig, ax = plt.subplots(figsize=(9, 0.6 * n + 1.4))
     ys = list(range(n, 0, -1))          # top-to-bottom in given order
 
-    # fix x-range up front so label anchoring is stable on the log scale
+    # fix x-range up front so label anchoring is stable on the log scale.
+    # An odds-ratio CI can hit 0 or inf when a group has a zero cell, and neither
+    # is a valid limit on a log axis, so fall back to sensible finite bounds.
     los = [it["lo"] for it in items]; his = [it["hi"] for it in items]
+    pos_lo = [x for x in los if x and x > 0]
+    fin_hi = [x for x in his if x not in (float("inf"), float("nan")) and x > 0]
     ax.set_xscale("log")
-    ax.set_xlim(min(los) * 0.7, max(his) * 1.35)
+    ax.set_xlim((min(pos_lo) if pos_lo else 0.1) * 0.7,
+                (max(fin_hi) if fin_hi else 10.0) * 1.35)
     ax.set_ylim(0.3, n + 0.9)
     # label in axes-x (fixed left/right), data-y
     tx = blended_transform_factory(ax.transAxes, ax.transData)

{tpattern-0.1.5 → tpattern-0.1.7}/tpattern/viz.py

@@ -99,7 +99,9 @@ def patterns_overview(patterns: list, outfile: str, max_rows: int = 8,
     cols = 2
     rows = (n + cols - 1) // cols
     fig, axes = plt.subplots(rows, cols, figsize=(12, 3.0 * rows))
-    axes = axes.flatten() if n > 1 else [axes]
+    # plt.subplots returns an ndarray whenever rows*cols > 1 (cols is always 2 here,
+    # so even a single pattern yields a 2-axis array); flatten it, else wrap the lone Axes.
+    axes = axes.flatten() if hasattr(axes, "flatten") else [axes]
     for ax, p in zip(axes, comps):
         pattern_dendrogram(p, title=f"N={p.N}, level {p.level}", ci_unit=ci_unit, ax=ax)
     for ax in axes[n:]:

{tpattern-0.1.5 → tpattern-0.1.7/tpattern.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpattern
-Version: 0.1.5
+Version: 0.1.7
 Summary: Open, auditable temporal & sequential pattern analysis (T-patterns) for sport and behaviour
 Author-email: Andrew Callaway <acallaway@bournemouth.ac.uk>
 License-Expression: MIT

{tpattern-0.1.5 → tpattern-0.1.7}/tpattern.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ tests/test_contrast.py
 tests/test_dedup.py
 tests/test_guided.py
 tests/test_null_compare.py
+tests/test_report_dendrogram.py
 tests/test_reproduction.py
 tests/test_support_reporting.py
 tests/test_synthetic.py