lessPython 0.3.0__tar.gz → 0.3.1__tar.gz

{lesspython-0.3.0/src/lessPython.egg-info → lesspython-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lessPython
-Version: 0.3.0
+Version: 0.3.1
 Summary: Python port of R's lessR: analytic-view visualizations, statistical models, and data utilities, rendered with plotly
 Author-email: "David W. Gerbing" <gerbing@pdx.edu>
 License-Expression: GPL-2.0-or-later
@@ -119,6 +119,13 @@ when the analysis runs, even when the result is assigned, as
 `r = lp.Regression(...)`. From a script, show one with
 `r.plots["scatter"].show()`.
 
+Every function that draws also takes `pdf_file=` and `png_file=`
+(needs the png extra, `pip install "lessPython[png]"`, then
+`plotly_get_chrome -y` once). A name such as `png_file="reg"`
+names the file, or with several figures is the stem of each
+name (`reg_scatter_matrix.png`), as lessR's `pdf_file=`. On Colab
+the files also download to your computer.
+
 ## Development install
 
 ```

{lesspython-0.3.0 → lesspython-0.3.1}/README.md

@@ -82,6 +82,13 @@ when the analysis runs, even when the result is assigned, as
 `r = lp.Regression(...)`. From a script, show one with
 `r.plots["scatter"].show()`.
 
+Every function that draws also takes `pdf_file=` and `png_file=`
+(needs the png extra, `pip install "lessPython[png]"`, then
+`plotly_get_chrome -y` once). A name such as `png_file="reg"`
+names the file, or with several figures is the stem of each
+name (`reg_scatter_matrix.png`), as lessR's `pdf_file=`. On Colab
+the files also download to your computer.
+
 ## Development install
 
 ```

{lesspython-0.3.0 → lesspython-0.3.1}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lessPython"
-version = "0.3.0"
+version = "0.3.1"
 description = "Python port of R's lessR: analytic-view visualizations, statistical models, and data utilities, rendered with plotly"
 authors = [{ name = "David W. Gerbing", email = "gerbing@pdx.edu" }]
 readme = "README.md"

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/ANOVA.py

@@ -22,10 +22,10 @@ import pandas as pd
 import plotly.graph_objects as go
 
 from .plotly_utils import (
-    BASE_COLORS, axis_cat, axis_format, axis_num, make_trans,
+    as_plotly_color, BASE_COLORS, axis_cat, axis_format, axis_num, make_trans,
     plot_border, plotly_style, to_hex, x_grid)
 from .Regression import _getdigits, _prntbl
-from .utils import fmt, get_column, get_option, pretty, show_plots
+from .utils import fmt, get_column, get_option, pretty, file_output, show_plots
 
 
 class ANOVAResults:
@@ -380,6 +380,8 @@ def _oneway(fit, yv, gv, y_name, x_name, levels, n_keep, d,
         lines += _prntbl(tukey, d).split("\n")
 
     plots = {}
+    if graphics and tukey is not None:
+        plots["tukey"] = _tukey_plot(tukey, x_name, d)
     if graphics:
         plots["means"] = _anova_means_plot(
             yv, gv, y_name, x_name, levels, jitter_x, d)
@@ -394,6 +396,59 @@ def _oneway(fit, yv, gv, y_name, x_name, levels, n_keep, d,
         tukey=tukey, plots=plots))
 
 
+def _tukey_plot(tukey, x_name, d):
+    """Each pairwise difference of means with its 95% family-wise
+    interval, the first comparison at the top, and a dashed
+    reference line at 0. ~ .ANOVAz1 plot(TukeyHSD())"""
+    style = plotly_style()
+    k = len(tukey)
+    ypos = list(range(k, 0, -1))
+    col = as_plotly_color(get_option("pt_color", "#324E5C"))
+    fig = go.Figure()
+    for yp, (lbl, r) in zip(ypos, tukey.iterrows()):
+        fig.add_trace(go.Scatter(
+            x=[r["lwr"], r["upr"]], y=[yp, yp], mode="lines",
+            line=dict(color=col, width=2), hoverinfo="skip",
+            showlegend=False))
+    fig.add_trace(go.Scatter(
+        x=tukey["diff"], y=ypos, mode="markers",
+        marker=dict(symbol="circle", size=9, color=col),
+        customdata=np.column_stack([tukey["lwr"], tukey["upr"],
+                                    tukey["p adj"]]),
+        text=list(tukey.index),
+        hovertemplate=("%{text}<br>diff: %{x:." + str(d) + "f}"
+                       "<br>95% CI: %{customdata[0]:." + str(d)
+                       + "f} to %{customdata[1]:." + str(d) + "f}"
+                       "<br>p adj: %{customdata[2]:.3f}"
+                       "<extra></extra>"),
+        showlegend=False))
+    axT1 = pretty(min(0.0, float(tukey["lwr"].min())),
+                  max(0.0, float(tukey["upr"].max())))
+    ax_x = axis_num(f"Differences in mean levels of {x_name}", axT1,
+                    axis_format(axT1, d))
+    ax_x.update(showgrid=True,
+                gridcolor=as_plotly_color(style["grid_col"]),
+                gridwidth=1, griddash="dot",
+                range=[axT1[0], axT1[-1]], zeroline=False)
+    ax_y = axis_cat("")
+    ax_y.update(tickmode="array", tickvals=ypos,
+                ticktext=list(tukey.index), range=[0.5, k + 0.5])
+    zero = dict(type="line", xref="x", yref="paper", x0=0, x1=0,
+                y0=0, y1=1, layer="below",
+                line=dict(color=as_plotly_color("gray50"), width=1,
+                          dash="dash"))
+    fig.update_layout(
+        xaxis=ax_x, yaxis=ax_y, shapes=[zero] + list(plot_border()),
+        template=None,
+        plot_bgcolor=as_plotly_color(style["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style["window_fill"]),
+        title=dict(text="95% family-wise confidence level",
+                   x=0.5, xanchor="center",
+                   font=dict(size=round(
+                       16 * get_option("main_size", 1)))))
+    return fig
+
+
 def _anova_means_plot(yv, gv, y_name, x_name, levels, jitter_x,
                       d):
     """Scatterplot of the response by factor level, jittered
@@ -410,18 +465,18 @@ def _anova_means_plot(yv, gv, y_name, x_name, levels, jitter_x,
         x=xn, y=yv, mode="markers",
         marker=dict(symbol="circle", size=6,
                     color=make_trans(pt, 0.85), opacity=1,
-                    line=dict(color=to_hex(pt), width=1)),
+                    line=dict(color=as_plotly_color(pt), width=1)),
         hoverinfo="y", showlegend=False))
     means = [yv[gv == lv].mean() for lv in levels]
     for i, mval in enumerate(means):
         fig.add_shape(type="line", xref="x", yref="y",
                       x0=-0.5, x1=len(levels) - 0.5,
                       y0=mval, y1=mval, layer="below",
-                      line=dict(color=to_hex("gray70"), width=1))
+                      line=dict(color=as_plotly_color("gray70"), width=1))
     fig.add_trace(go.Scatter(
         x=list(range(len(levels))), y=means, mode="markers",
         marker=dict(symbol="diamond", size=13,
-                    color=to_hex(get_option("fit_color",
+                    color=as_plotly_color(get_option("fit_color",
                                             "#5C4032"))),
         hoverinfo="x+y", showlegend=False))
     axT2 = pretty(float(yv.min()), float(yv.max()))
@@ -431,13 +486,13 @@ def _anova_means_plot(yv, gv, y_name, x_name, levels, jitter_x,
                 ticktext=levels, range=[-0.5, len(levels) - 0.5])
     ax_y = axis_num(y_name, axT2, axis_format(axT2, d))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style["grid_col"]),
+                gridcolor=as_plotly_color(style["grid_col"]),
                 gridwidth=1, griddash="dot")
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y, shapes=fig.layout.shapes
         + tuple(plot_border()), template=None,
-        plot_bgcolor=to_hex(style["panel_fill"]),
-        paper_bgcolor=to_hex(style["window_fill"]),
+        plot_bgcolor=as_plotly_color(style["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text="Scatterplot with Cell Means",
                    x=0.5, xanchor="center",
                    font=dict(size=round(
@@ -644,13 +699,13 @@ def _cat_line_fig(title, x_name, y_name, levels_x, series, d,
                 range=[-0.4, len(levels_x) - 0.6])
     ax_y = axis_num(y_name, axT2, axis_format(axT2, d))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style["grid_col"]),
+                gridcolor=as_plotly_color(style["grid_col"]),
                 gridwidth=1, griddash="dot")
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y, shapes=plot_border(),
         template=None, legend=dict(title=dict(text=legend_title)),
-        plot_bgcolor=to_hex(style["panel_fill"]),
-        paper_bgcolor=to_hex(style["window_fill"]),
+        plot_bgcolor=as_plotly_color(style["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=title, x=0.5, xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
@@ -678,3 +733,7 @@ def _blocks_plot(x1v, yvals, x2v, y_name, f1, f2, l1, l2, d,
         sub = dp[dp["b"] == b].set_index("a")["y"]
         series.append((b, [sub.get(a, np.nan) for a in l1]))
     return _cat_line_fig(title, f1, y_name, l1, series, d, f2)
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+ANOVA = file_output(ANOVA)

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/Chart.py

@@ -402,7 +402,8 @@ def _chart_per_variable(data, items, cols, fill, xlab, main, quiet):
     R analog: bc.data.frame()"""
     from plotly.subplots import make_subplots
     import plotly.graph_objects as go
-    from .plotly_utils import (BASE_COLORS, auto_text_color,
+    from .plotly_utils import (
+                               as_plotly_color, BASE_COLORS, auto_text_color,
                                axis_format, plotly_style, to_hex)
     from .stats_out import _counts_1d
     show = not resolve_quiet(quiet)
@@ -466,8 +467,8 @@ def _chart_per_variable(data, items, cols, fill, xlab, main, quiet):
                quiet)
     fig.update_layout(
         template=None, height=140 + 260 * n_row,
-        plot_bgcolor=to_hex(st["panel_fill"]),
-        paper_bgcolor=to_hex(st["window_fill"]),
+        plot_bgcolor=as_plotly_color(st["panel_fill"]),
+        paper_bgcolor=as_plotly_color(st["window_fill"]),
         title=(dict(text=main, x=0.5) if main else None))
     return fig
 
@@ -1916,6 +1917,26 @@ def Chart(x, y=None, data=None, filter=None, by=None, facet=None,
                 facet_name=facet_ttl, y_name=y_name, stat=stat)
         elif main == "":
             main = None
+        # a palette name in fill names the palette, not a color, as
+        #   for the bar chart. A sequential palette shades each slice
+        #   by its value off the palette's ramp, larger darker, as
+        #   for the treemap. R analog: Chart.R pie palette branch
+        if isinstance(fill, str) and fill in _palette_names():
+            from .hier_plotly import _HIER_SEQ
+            slices = list(tbl.columns if isinstance(tbl, pd.DataFrame)
+                          else tbl.index)
+            vals = (tbl.sum(axis=0) if isinstance(tbl, pd.DataFrame)
+                    else tbl).to_numpy(dtype=float)
+            if (fill.lower() in _HIER_SEQ and len(slices) > 1
+                    and np.ptp(vals) > 0):
+                from .getColors import getColors
+                ramp = [c[:7] for c in getColors(fill.lower(), n=256,
+                                                 quiet=True)]
+                pos = (vals - vals.min()) / np.ptp(vals)
+                fill = [ramp[i] for i in
+                        np.round(pos * (len(ramp) - 1)).astype(int)]
+            else:
+                fill = _color_range(fill, len(slices))
         return pie_plotly(
             tbl,
             x_name=x, y_name=y_name, by_name=by, main=main,
@@ -1984,6 +2005,30 @@ def Chart(x, y=None, data=None, filter=None, by=None, facet=None,
     return fig
 
 
+def _with_height(func):
+    """height= in inches, as lessR's Chart(height=), converted at
+    96 pixels per inch, so pdf_file= also writes that height.
+    None keeps the figure's own height."""
+    import functools
+
+    @functools.wraps(func)
+    def wrapper(*args, height=None, **kwargs):
+        if height is not None and (isinstance(height, bool) or
+                                   not isinstance(height, (int, float))
+                                   or height <= 0):
+            raise ValueError(
+                f"height is in inches, a positive number such as "
+                f"height=4, not {height!r}")
+        fig = func(*args, **kwargs)
+        if height is not None and hasattr(fig, "layout"):
+            fig.update_layout(height=round(96 * height))
+        return fig
+
+    return wrapper
+
+
 # font_size= scales all text of the returned figure
 from .style import with_theme as _with_theme  # noqa: E402
-Chart = font_scaled(attach_stats(_with_theme(Chart, own_param=True)))
+from .utils import file_output  # noqa: E402
+Chart = file_output(_with_height(font_scaled(attach_stats(
+    _with_theme(Chart, own_param=True)))))

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/Correlation.py

@@ -12,7 +12,7 @@
 import numpy as np
 import pandas as pd
 
-from .utils import fmt, get_column, get_option, show_plots
+from .utils import fmt, get_column, get_option, file_output, show_plots
 
 
 class CorrelationResults:
@@ -110,6 +110,7 @@ def _two_var(x, y, x_name, y_name, method, brief):
         r, p = sps.pearsonr(xk, yk)
         df = n - 2
         t = r * np.sqrt(df / (1 - r ** 2))
+        stat_nm = "t"
         p = 2 * sps.t.sf(abs(t), df)
         z = np.arctanh(r)
         sig = 1 / np.sqrt(n - 3)
@@ -119,17 +120,41 @@ def _two_var(x, y, x_name, y_name, method, brief):
         sym, sym_pop = "r", "Correlation"
         cov = float(np.cov(xk, yk)[0, 1])
     elif method == "spearman":
+        # the statistic cor.test() reports: S, the sum of the squared
+        #   rank differences, with no df. R analog: cr.main.R
+        #   names(ct$statistic)
         res = sps.spearmanr(xk, yk)
         r, p = float(res.statistic), float(res.pvalue)
-        t, df = res.statistic * np.sqrt(
-            (n - 2) / (1 - r ** 2)), n - 2
+        t, df, stat_nm = (n ** 3 - n) * (1 - r) / 6, None, "S"
         method_txt = "Spearman's rank correlation rho"
         sym = sym_pop = "rho"
     else:
+        # cor.test(): T, the count of concordant pairs, with its exact
+        #   p-value for n < 50 and no ties, else z with the variance
+        #   corrected for ties
         res = sps.kendalltau(xk, yk)
-        r, p = float(res.statistic), float(res.pvalue)
-        t = res.statistic
+        r = float(res.statistic)
+        _, xt = np.unique(xk, return_counts=True)
+        _, yt = np.unique(yk, return_counts=True)
+        ties = (xt > 1).any() or (yt > 1).any()
         df = None
+        if n < 50 and not ties:
+            t, stat_nm = (r + 1) * n * (n - 1) / 4, "T"
+            p = float(sps.kendalltau(xk, yk, method="exact").pvalue)
+        else:
+            T0 = n * (n - 1) / 2
+            S = r * np.sqrt((T0 - (xt * (xt - 1)).sum() / 2)
+                            * (T0 - (yt * (yt - 1)).sum() / 2))
+            v0 = n * (n - 1) * (2 * n + 5)
+            vt = (xt * (xt - 1) * (2 * xt + 5)).sum()
+            vu = (yt * (yt - 1) * (2 * yt + 5)).sum()
+            v1 = (xt * (xt - 1)).sum() * (yt * (yt - 1)).sum()
+            v2 = ((xt * (xt - 1) * (xt - 2)).sum()
+                  * (yt * (yt - 1) * (yt - 2)).sum())
+            var_S = ((v0 - vt - vu) / 18 + v1 / (2 * n * (n - 1))
+                     + v2 / (9 * n * (n - 1) * (n - 2)))
+            t, stat_nm = S / np.sqrt(var_S), "z"
+            p = float(2 * sps.norm.sf(abs(t)))
         method_txt = "Kendall's rank correlation tau"
         sym = sym_pop = "tau"
 
@@ -152,9 +177,9 @@ def _two_var(x, y, x_name, y_name, method, brief):
     else:
         L.append(f"Sample Correlation: {sym} = {fmt(r, 3)}")
     L.append("")
-    dfs = "NA" if df is None else str(df)
-    L.append(f"Hypothesis Test of 0 {sym_pop}:  t = {fmt(t, 3)}, "
-             f" df = {dfs},  p-value = {fmt(p, 3)}")
+    dfs = "" if df is None else f",  df = {df}"
+    L.append(f"Hypothesis Test of 0 {sym_pop}:  {stat_nm} = "
+             f"{fmt(t, 3)}{dfs},  p-value = {fmt(p, 3)}")
     if method == "pearson":
         L.append("95% Confidence Interval for Correlation:  "
                  f"{fmt(lb, 3)} to {fmt(ub, 3)}")
@@ -228,7 +253,7 @@ def _matrix(df, miss, show, method, digits_d, heat_map, main):
 def _heatmap(df, main):
     import plotly.graph_objects as go
 
-    from .plotly_utils import plotly_style, to_hex
+    from .plotly_utils import as_plotly_color, plotly_style, to_hex
     labels = list(df.columns)
     Z = df.to_numpy(dtype=float).copy()
     np.fill_diagonal(Z, np.nan)
@@ -239,9 +264,13 @@ def _heatmap(df, main):
         colorbar=dict(title="r")))
     fig.update_yaxes(autorange="reversed")
     fig.update_layout(
-        template=None, paper_bgcolor=to_hex(style["window_fill"]),
+        template=None, paper_bgcolor=as_plotly_color(style["window_fill"]),
         title=dict(text=main or "Correlations", x=0.5,
                    xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+Correlation = file_output(Correlation)

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/Flows.py

@@ -9,7 +9,7 @@
 import numpy as np
 import pandas as pd
 
-from .plotly_utils import BASE_COLORS, make_trans, to_hex
+from .plotly_utils import as_plotly_color, BASE_COLORS, make_trans, to_hex
 from .utils import get_column, get_option
 
 
@@ -96,7 +96,7 @@ def Flows(value, stage1, stage2, stage3=None, data=None,
         node=dict(
             label=nodes, color=node_color, x=node_x, y=node_y,
             pad=12, thickness=16,
-            line=dict(color=to_hex(border_gray), width=1),
+            line=dict(color=as_plotly_color(border_gray), width=1),
             hovertemplate="%{label}<extra></extra>"),
         link=dict(
             source=src, target=tgt, value=val, color=lcol,
@@ -116,5 +116,5 @@ def Flows(value, stage1, stage2, stage3=None, data=None,
                     r=30, b=30, l=30),
         font=dict(size=round(15 * labels_size)),
         template=None,
-        paper_bgcolor=to_hex(get_option("window_fill", "white")))
+        paper_bgcolor=as_plotly_color(get_option("window_fill", "white")))
     return fig

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/Logit.py

@@ -36,13 +36,13 @@ import pandas as pd
 import plotly.graph_objects as go
 
 from .plotly_utils import (
-    axis_format, axis_num, make_trans, plot_border,
+    as_plotly_color, axis_format, axis_num, make_trans, plot_border,
     plotly_style, to_hex, x_grid)
 from .plt_mat_plotly import scatter_matrix
 from .logit_rmd import logit_rmd
 from .Regression import (
     _expand_indicators, _parse_formula, _prntbl)
-from .utils import fmt, get_column, get_option, pretty, show_plots
+from .utils import fmt, get_column, get_option, pretty, file_output, show_plots
 
 
 class LogitResults:
@@ -564,13 +564,13 @@ def _logit_plot(xv, y01, mu, levels, y_name, x_name, pc,
                     color=make_trans(pt_fill,
                                      1 - transparency),
                     opacity=1,
-                    line=dict(color=to_hex(pt_fill),
+                    line=dict(color=as_plotly_color(pt_fill),
                               width=1)),
         hoverinfo="x+y", showlegend=False))
     od = np.argsort(xv, kind="stable")
     fig.add_trace(go.Scatter(
         x=xv[od], y=mu[od], mode="lines",
-        line=dict(color=to_hex(pt_fill), width=2),
+        line=dict(color=as_plotly_color(pt_fill), width=2),
         hoverinfo="skip", showlegend=False))
     axT1 = pretty(float(xv.min()), float(xv.max()))
     axT2 = [0, 0.2, 0.4, 0.6, 0.8, 1]
@@ -579,7 +579,7 @@ def _logit_plot(xv, y01, mu, levels, y_name, x_name, pc,
     ax_y = axis_num(y_lab, axT2,
                     [f"{v:g}" for v in axT2])
     ax_y.update(range=[-0.10, 1.10], showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
     shapes = x_grid(axT1) + plot_border()
     if pc is not None:                 # threshold crosshairs
@@ -588,13 +588,13 @@ def _logit_plot(xv, y01, mu, levels, y_name, x_name, pc,
         shapes.append(dict(
             type="line", xref="paper", yref="y",
             x0=0, x1=1, y0=pc, y1=pc,
-            line=dict(color=to_hex("gray35"), width=0.75,
+            line=dict(color=as_plotly_color("gray35"), width=0.75,
                       dash="dash")))
         if float(xv.min()) <= x_cut <= float(xv.max()):
             shapes.append(dict(
                 type="line", xref="x", yref="paper",
                 x0=x_cut, x1=x_cut, y0=0, y1=1,
-                line=dict(color=to_hex("gray35"), width=0.75,
+                line=dict(color=as_plotly_color("gray35"), width=0.75,
                           dash="dash")))
     anns = []
     if levels is not None:             # right-axis level labels
@@ -605,11 +605,15 @@ def _logit_plot(xv, y01, mu, levels, y_name, x_name, pc,
                 xanchor="left",
                 font=dict(size=round(
                     14 * get_option("axis_size", 0.9)),
-                    color=to_hex(get_option(
+                    color=as_plotly_color(get_option(
                         "axis_color", "black")))))
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y, shapes=shapes,
         annotations=anns, template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]))
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+Logit = file_output(Logit)

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/Regression.py

@@ -51,7 +51,7 @@ from .plotly_utils import (
     make_trans, plot_border, plotly_style, to_hex, x_grid)
 from .utils import (
     category_order, fmt, get_column, get_option, pretty,
-    show_plots)
+    file_output, show_plots)
 from .X import _breaks_from_args
 
 
@@ -1228,13 +1228,13 @@ def _moderation_plot(fit, Xd, y_name, mod_info, d):
     ax_x = axis_num(x_name, axT1, axis_format(axT1, d))
     ax_y = axis_num(y_name, axT2, axis_format(axT2, d))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(axT1) + plot_border(), template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         legend=dict(title=dict(text=w_name)),
         title=dict(text="Moderator Variable Interaction Plot",
                    x=0.5, xanchor="center",
@@ -1331,13 +1331,13 @@ def _reg_ancova_plot(fit, Xd, yv, y_name, info, d):
     ax_x = axis_num(cov, axT1, axis_format(axT1, d))
     ax_y = axis_num(y_name, axT2, axis_format(axT2, d))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(axT1) + plot_border(), template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         legend=dict(title=dict(text=fac)),
         title=dict(text="Scatterplot and Least-Squares Lines",
                    x=0.5, xanchor="center",
@@ -1384,11 +1384,11 @@ def _reg_scatter(xv, yv, x_name, y_name, fit, smapi, digits_d,
                     sizemode="diameter",
                     color=make_trans(pt_fill, 0.9),
                     opacity=1,
-                    line=dict(color=to_hex(pt_fill), width=1)),
+                    line=dict(color=as_plotly_color(pt_fill), width=1)),
         hoverinfo="x+y", showlegend=False))
     fig.add_trace(go.Scatter(
         x=xs, y=sf["mean"].to_numpy(), mode="lines",
-        line=dict(color=to_hex(get_option("fit_color",
+        line=dict(color=as_plotly_color(get_option("fit_color",
                                           "#5C4032")),
                   width=get_option("fit_lwd", 2)),
         hoverinfo="skip", showlegend=False))
@@ -1405,7 +1405,7 @@ def _reg_scatter(xv, yv, x_name, y_name, fit, smapi, digits_d,
     ax_y = axis_num(y_name, axT2,
                     axis_format(axT2, digits_d))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
     title = ("Reg Line, Confidence & Prediction Intervals"
              if with_bands
@@ -1413,8 +1413,8 @@ def _reg_scatter(xv, yv, x_name, y_name, fit, smapi, digits_d,
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(axT1) + plot_border(), template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         title=dict(text=title, x=0.5, xanchor="center",
                    font=dict(size=round(
                        16 * get_option("main_size", 1)))))
@@ -1444,14 +1444,14 @@ def _reg_resfit(fitted, resid, cooks, cooks_cut, labels,
                     sizemode="diameter",
                     color=make_trans(pt_fill, 0.9),
                     opacity=1,
-                    line=dict(color=to_hex(pt_fill), width=0.5)),
+                    line=dict(color=as_plotly_color(pt_fill), width=0.5)),
         hoverinfo="x+y", showlegend=False))
     flag = np.where(cooks >= cut)[0]
     for i in flag:
         fig.add_annotation(
             x=float(fitted[i]), y=float(resid[i]),
             text=str(labels[i]), showarrow=False, yshift=12,
-            font=dict(size=11, color=to_hex("gray30")))
+            font=dict(size=11, color=as_plotly_color("gray30")))
     axT1 = pretty(float(fitted.min()), float(fitted.max()))
     axT2 = pretty(float(resid.min()), float(resid.max()))
     ax_x = axis_num("Fitted Values", axT1,
@@ -1459,18 +1459,18 @@ def _reg_resfit(fitted, resid, cooks, cooks_cut, labels,
     ax_y = axis_num("Residuals", axT2,
                     axis_format(axT2, digits_d))
     ax_y.update(showgrid=True,
-                gridcolor=to_hex(style_opts["grid_col"]),
+                gridcolor=as_plotly_color(style_opts["grid_col"]),
                 gridwidth=1, griddash="dot")
     shapes = x_grid(axT1) + plot_border()
     shapes.append(dict(                # zero residual line
         type="line", xref="paper", yref="y",
         x0=0, x1=1, y0=0, y1=0,
-        line=dict(color=to_hex("gray50"), width=1,
+        line=dict(color=as_plotly_color("gray50"), width=1,
                   dash="dash")))
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y, shapes=shapes, template=None,
-        plot_bgcolor=to_hex(style_opts["panel_fill"]),
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        plot_bgcolor=as_plotly_color(style_opts["panel_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
         title=dict(
             text=("Residuals vs Fitted Values<br>"
                   f"<sup>{sub}</sup>"),
@@ -1491,3 +1491,7 @@ def _reg_dn_residual(resid):
                     show_histogram=True, hist_edges=edges,
                     main="Distribution of Residuals")
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+Regression = file_output(Regression)

{lesspython-0.3.0 → lesspython-0.3.1}/src/lessPy/X.py

@@ -659,5 +659,6 @@ def _per_variable(func):
 # font_size= scales all text of the returned figure
 from .stats_out import attach_stats as _attach_stats  # noqa: E402
 from .style import with_theme as _with_theme  # noqa: E402
-X = _per_variable(font_scaled(_attach_stats(_with_theme(X),
-                                            capture=True)))
+from .utils import file_output  # noqa: E402
+X = file_output(_per_variable(font_scaled(_attach_stats(
+    _with_theme(X), capture=True))))