lessPython 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

lessPy/utils.py

@@ -8,9 +8,9 @@ import math
 
 # style settings; R analog: options() set by lessR style()
 _OPTIONS = {
-    "main_size":     1.0,
-    "lab_size":      1.0,
-    "axis_size":     0.9,
+    "main_size":     1.16,      # zzz_on.R
+    "lab_size":      1.05,      # zzz_on.R
+    "axis_size":     0.80,      # zzz_on.R
     "axis_color":    "black",
     "lab_color":     "black",
     "grid_color":    "gray90",
@@ -23,6 +23,7 @@ _OPTIONS = {
     "panel_fill":    "white",
     "window_fill":   "white",
     "digits_d":      2,
+    "suggest":       True,      # >>> Suggestions, as R
     "pt_color":      "#324E5C",   # rgb(50,78,92), zzz_on.R
     "trans_pt_fill": 0.10,
     "segment_color": "gray40",
@@ -159,9 +160,10 @@ def resolve_facet(data, facet, fun):
                 "facet names a categorical variable for its "
                 "panels")
         if len(facet) > 2:
-            print(f"facet has {len(facet)} variables. {fun}() "
-                  "uses the first two: "
-                  f"{facet[0]}, {facet[1]}.")
+            from .stats_out import advise
+            advise(f"facet has {len(facet)} variables. {fun}() "
+                   "uses the first two: "
+                   f"{facet[0]}, {facet[1]}.")
         f1 = get_column(data, facet[0], "facet")
         if len(facet) == 1:
             return f1, facet[0], None, None
@@ -273,3 +275,38 @@ def pretty(lo, hi, n=5):
     vals = [(ns + i) * unit for i in range(int(nu - ns) + 1)]
     # avoid -0.0 and float dust such as 0.30000000000000004
     return [round(v, 10) + 0.0 for v in vals]
+
+
+def _in_notebook():
+    """True in a notebook kernel (Jupyter, Colab, VS Code), False in
+    a script, the terminal, or the IPython console."""
+    try:
+        from IPython import get_ipython
+    except ImportError:
+        return False
+    ip = get_ipython()
+    return ip is not None and getattr(ip, "kernel", None) is not None
+
+
+def show_plots(result):
+    """Show the figures an analysis returns, as lessR draws its
+    graphics as it runs. Only in a notebook: elsewhere fig.show()
+    opens a browser tab per figure, so the figures stay in .plots
+    (or .attrs["plots"] for a returned DataFrame). Displayed as a
+    notebook displays a returned Chart() figure; a display failure
+    leaves the figures in .plots rather than lose the analysis.
+    Returns result."""
+    attrs = getattr(result, "attrs", None)
+    plots = (attrs.get("plots") if isinstance(attrs, dict)
+             else getattr(result, "plots", None))
+    if plots and _in_notebook():
+        from IPython.display import display
+        try:
+            for fig in plots.values():
+                if fig is not None:
+                    display(fig)
+        except Exception as e:
+            import warnings
+            warnings.warn(f"figures not displayed ({e}); they are "
+                          "in .plots, show one with .show()")
+    return result

lessPy/vbs_plotly.py

@@ -200,9 +200,10 @@ def vbs_plotly(x, x_name=None, vbs_plot="vbs",
     strip = "s" in vbs_plot
 
     # grouped replication measures, .param.VBS() group branch;
-    # by and facet share the branch, as .param.VBS() does
-    grp = by if by is not None else facet
-    grp_ord = by_order if by is not None else facet_order
+    # by and facet share the branch, the facet levels when both are
+    # given (.param.VBS(): facet1 <- by0 only when facet1 is missing)
+    grp = facet if facet is not None else by
+    grp_ord = facet_order if facet is not None else by_order
     if grp is not None:
         mx_gc = max((grp == nm).sum() for nm in grp_ord)
         mc_w = max(int(np.unique(x[grp == nm],
@@ -210,7 +211,9 @@ def vbs_plotly(x, x_name=None, vbs_plot="vbs",
                    for nm in grp_ord if (grp == nm).any())
         reps = (n - n_ux) / n > 0.15 and mc_w > 0.05 * n
 
-    # jitter_x breaks ties in the data itself, as in X.R
+    # jitter_x breaks ties in the data itself, as in X.R; the violin
+    # bandwidth is read from the data as given, as .param.VBS() does
+    x_given = x.copy()
     if jitter_x is None:
         if grp is None:
             jitter_x = 1.1 * (1 - np.exp(-0.03 * mx_c))
@@ -263,6 +266,14 @@ def vbs_plotly(x, x_name=None, vbs_plot="vbs",
     vpart = f"%{{x:{val_fmt}}}" if val_fmt else "%{x}"
     rng_ = np.random.default_rng(n)      # reproducible spread
     jy = 0.5 if jitter_y is None else float(jitter_y)
+    # the values plotted, for X()'s "Parameter values" report; one
+    # bandwidth only when one violin is drawn (facets take their own)
+    from .stats_out import record_stats
+    record_stats(pt_size=float(cex), out_size=float(out_cex),
+                 jitter_x=float(jitter_x), jitter_y=jy,
+                 bw=(float(bw) if bw is not None else
+                     float(band_width(x_given, bw_iter)) if facet is None
+                     else None))
 
     # facet units, first level in the TOP band (reading order, as
     # lessR as.table=TRUE); facet2 stacks one section of facet
@@ -326,7 +337,7 @@ def vbs_plotly(x, x_name=None, vbs_plot="vbs",
         # violin: mirrored KDE, max width = vbs_ratio
         if violin and len(xu) > 1:
             h = (bw if bw is not None
-                 else band_width(xu, bw_iter))
+                 else band_width(x_given[um], bw_iter))
             grid = np.linspace(xu.min() - 3 * h,
                                xu.max() + 3 * h, 512)
             dens = kde(xu, grid, h)