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

lessPy/plt_plotly.py

@@ -17,7 +17,7 @@ import plotly.graph_objects as go
 
 from .plotly_utils import (
     as_plotly_color, axis_base, axis_num, get_tick_fmt, make_trans,
-    plot_border, plotly_style, sym_at, to_hex, x_grid, y_grid,
+    plot_border, plotly_style, marks, to_hex, x_grid, y_grid,
 )
 from .utils import get_option
 
@@ -47,6 +47,7 @@ def plt_plotly(groups, by_name=None,
                se_polys=None, se_fill=None,
                ellipses=None, ellipse_fill=None,
                ellipse_color=None, ellipse_lwd=1,
+               sizes=None, size_name=None,
                style_opts=None):
     """Scatterplot / time-series renderer for XY().
 
@@ -107,19 +108,34 @@ def plt_plotly(groups, by_name=None,
             hover = hover.replace(
                 "<extra></extra>", f"<br>{by_name}: {nm}"
                                    "<extra></extra>")
+        # bubbles: a pixel diameter per point, its value in the hover
+        custom = None
+        if sizes is not None:
+            custom = sizes[i][1]
+            hover = hover.replace(
+                "<extra></extra>",
+                f"<br>{size_name}: %{{customdata:.{digits_d}f}}"
+                "<extra></extra>")
         marker = dict(
-            symbol=sym_at(shape, i), size=px, sizemode="diameter",
+            size=px if sizes is None else sizes[i][0],
+            sizemode="diameter",
             color=make_trans(fills[i], pt_opacity), opacity=1,
-            line=dict(color=to_hex(borders[i]), width=1),
-        ) if "markers" in mode_pts else None
+            line=dict(color=as_plotly_color(borders[i]), width=1),
+        )
+        pts_kw = (marks(shape, i, mode_pts, marker)
+                  if "markers" in mode_pts else dict(mode=mode_pts))
+        # a single series' line takes segment_color when it is given;
+        #   several series keep the color that distinguishes them
+        ln_col = (style_opts["segment_color"]
+                  if not has_groups and get_option("segment_color_set")
+                  else borders[i])
         fig.add_trace(go.Scatter(
-            x=xv, y=yv, mode=mode_pts,
+            x=xv, y=yv, **pts_kw,
             name=None if nm is None else str(nm),
             legendgroup=None if nm is None else str(nm),
-            marker=marker,
-            line=(dict(color=to_hex(borders[i]), width=ln_width)
+            line=(dict(color=as_plotly_color(ln_col), width=ln_width)
                   if connect else None),
-            hovertemplate=hover,
+            hovertemplate=hover, customdata=custom,
             # connected series show a legend-only line sample below
             showlegend=has_groups and not connect,
         ))
@@ -127,15 +143,15 @@ def plt_plotly(groups, by_name=None,
             fig.add_trace(go.Scatter(
                 x=xv[:2], y=yv[:2], mode="lines",
                 name=str(nm), legendgroup=str(nm),
-                line=dict(color=to_hex(borders[i]), width=ln_width),
+                line=dict(color=as_plotly_color(borders[i]), width=ln_width),
                 hoverinfo="skip", showlegend=True,
             ))
 
     # ellipses: border per group when grouped, else ellipse_color
     if ellipses:
         for k, (ex, ey) in enumerate(ellipses):
-            edge = (to_hex(borders[k]) if has_groups
-                    else to_hex(ellipse_color))
+            edge = (as_plotly_color(borders[k % n_grp]) if has_groups
+                    else as_plotly_color(ellipse_color))
             fig.add_trace(go.Scatter(
                 x=ex, y=ey, mode="lines",
                 line=dict(color=edge, width=ellipse_lwd),
@@ -171,8 +187,8 @@ def plt_plotly(groups, by_name=None,
                 name="Fit" if single else f"Fit: {nm}",
                 legendgroup="fit" if single else str(nm),
                 line=dict(
-                    color=(to_hex(fit_color) if single
-                           else to_hex(fills[i])),
+                    color=(as_plotly_color(fit_color) if single
+                           else as_plotly_color(fills[i])),
                     width=fit_lwd),
                 hovertemplate=(
                     f"{x_lab}: {xpart}<br>{lbl}: {ypart}"
@@ -185,7 +201,7 @@ def plt_plotly(groups, by_name=None,
         ax_x = axis_base()
         ax_x["title"]["text"] = x_lab
         ax_x.update(showgrid=True,
-                    gridcolor=to_hex(style_opts["grid_col"]),
+                    gridcolor=as_plotly_color(style_opts["grid_col"]),
                     gridwidth=1)
         shapes = y_grid(gridT2) + plot_border()
     else:
@@ -193,7 +209,7 @@ def plt_plotly(groups, by_name=None,
         shapes = x_grid(gridT1) + y_grid(gridT2) + plot_border()
     ax_y = axis_num(y_lab, ax["axT2"], ax["axL2"])
 
-    leg_color = to_hex(style_opts["lab_color"])
+    leg_color = as_plotly_color(style_opts["lab_color"])
     fig.update_layout(
         xaxis=ax_x, yaxis=ax_y,
         shapes=shapes,
@@ -209,12 +225,12 @@ def plt_plotly(groups, by_name=None,
                 family="Arial", color=leg_color),
             orientation="v", x=1.05, y=0.5,
             xanchor="left", yanchor="middle",
-            bgcolor=to_hex(style_opts["window_fill"]),
+            bgcolor=as_plotly_color(style_opts["window_fill"]),
             bordercolor="#CCCCCC", borderwidth=1,
             itemsizing="constant",
         ),
-        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"]),
     )
 
     if main:

lessPy/plt_smooth.py

@@ -129,7 +129,7 @@ def plt_smooth(xv, yv, smooth_points, smooth_size, smooth_power,
     for ex, ey in ellipses or []:
         fig.add_trace(go.Scatter(
             x=ex, y=ey, mode="lines",
-            line=dict(color=to_hex(ellipse_color),
+            line=dict(color=as_plotly_color(ellipse_color),
                       width=ellipse_lwd),
             fill="toself",
             fillcolor=as_plotly_color(ellipse_fill),
@@ -145,7 +145,7 @@ def plt_smooth(xv, yv, smooth_points, smooth_size, smooth_power,
         fig.add_trace(go.Scatter(
             x=fl["x"], y=fl["y"], mode="lines", name="Fit",
             legendgroup="fit",
-            line=dict(color=to_hex(fit_color), width=fit_lwd),
+            line=dict(color=as_plotly_color(fit_color), width=fit_lwd),
             hoverinfo="skip", showlegend=True))
 
     ax_x = axis_num(x_lab, ax["axT1"], ax["axL1"])
@@ -156,8 +156,8 @@ def plt_smooth(xv, yv, smooth_points, smooth_size, smooth_power,
         xaxis=ax_x, yaxis=ax_y,
         shapes=x_grid(gridT1) + y_grid(gridT2) + 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"]),
     )
 
     if main:

lessPy/plt_time.py

@@ -56,11 +56,18 @@ def _agg_one(dser, yser, ts_unit, aggfun):
         per = dser
     else:
         per = dser.dt.to_period(_PERIOD_FREQ[ts_unit])
-        # trailing partial period: last date short of period end
+        # trailing partial period: its last date short of the period
+        # end AND fewer observations than the median of the earlier
+        # periods, so data dated at period starts keeps its complete
+        # final period. R analog: ts_truncate() (plt.time.R)
         last_per = per.iloc[int(np.argmax(dser.to_numpy()))]
         if dser.max() < last_per.end_time.normalize():
-            keep = (per != last_per).to_numpy()
-            dser, yser, per = dser[keep], yser[keep], per[keep]
+            n_per = per.value_counts()
+            others = n_per.drop(last_per)
+            n_full = float(np.median(others)) if len(others) else 0
+            if n_per[last_per] < n_full:
+                keep = (per != last_per).to_numpy()
+                dser, yser, per = dser[keep], yser[keep], per[keep]
     if len(dser) == 0:
         return (np.array([], dtype="datetime64[ns]"),
                 np.array([]))

lessPy/prob_norm.py

@@ -8,7 +8,7 @@
 
 import numpy as np
 
-from .utils import fmt
+from .utils import fmt, file_output, show_plots
 
 _FILL_NRM = "#E8E8E8"      # grey91
 _FILL_INT = "#9FB6CD"      # slategray3
@@ -57,8 +57,8 @@ def prob_norm(lo=None, hi=None, mu=0, sigma=1, nrm_color="black",
 
     print(f"Probability:  {prob}")
 
-    return ProbNormResults(prob=prob, lo=lo_v, hi=hi_v, mu=mu,
-                           sigma=sigma, plots={"norm": fig})
+    return show_plots(ProbNormResults(prob=prob, lo=lo_v, hi=hi_v, mu=mu,
+                           sigma=sigma, plots={"norm": fig}))
 
 
 def _plot(lo, hi, lo_lbl, hi_lbl, mu, sigma, prob, nrm_color,
@@ -109,3 +109,7 @@ def _plot(lo, hi, lo_lbl, hi_lbl, mu, sigma, prob, nrm_color,
                                showarrow=False,
                                font=dict(size=11))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+prob_norm = file_output(prob_norm)

lessPy/prob_tcut.py

@@ -9,7 +9,7 @@
 
 import numpy as np
 
-from .utils import fmt
+from .utils import fmt, file_output, show_plots
 
 _BG = "#F9F9FC"             # rgb(249,249,252)
 _TAIL = "#8B475D"           # palevioletred4
@@ -51,8 +51,8 @@ def prob_tcut(df, alpha=0.05, digits_d=3, y_axis=False,
                 fill, color_tail, nrm_color, color_t)
 
     print(f"Probability:  {cutoff}")
-    return ProbTcutResults(cutoff=cutoff, df=df, alpha=alpha,
-                           plots={"tcut": fig})
+    return show_plots(ProbTcutResults(cutoff=cutoff, df=df, alpha=alpha,
+                           plots={"tcut": fig}))
 
 
 def _cut_line(fig, x, top, color):
@@ -129,3 +129,7 @@ def _plot(df, alpha, t_lo, t_hi, n_lo, n_hi, digits_d, y_axis,
                     bordercolor="black", borderwidth=0.5,
                     font=dict(size=10)))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+prob_tcut = file_output(prob_tcut)

lessPy/prob_znorm.py

@@ -11,6 +11,8 @@
 
 import numpy as np
 
+from .utils import file_output, show_plots
+
 
 class ProbZnormResults:
     """Result of prob_znorm(): mu/sigma and the plotly figure in
@@ -46,7 +48,7 @@ def prob_znorm(mu=0, sigma=1, color_border="gray10", r=0.10,
            f"{round(b * 255)},{a})"
 
     fig = _plot(mu, sigma, border, fill, main, y_axis, z)
-    return ProbZnormResults(mu=mu, sigma=sigma, plots={"znorm": fig})
+    return show_plots(ProbZnormResults(mu=mu, sigma=sigma, plots={"znorm": fig}))
 
 
 def _gray_to_hex(color):
@@ -108,3 +110,7 @@ def _plot(mu, sigma, border, fill, main, y_axis, z):
                                showarrow=False,
                                font=dict(size=11))
     return fig
+
+
+# pdf_file= and png_file= write the figures, as lessR's pdf_file=
+prob_znorm = file_output(prob_znorm)

lessPy/profile_plotly.py

@@ -21,6 +21,7 @@ import plotly.graph_objects as go
 
 from .utils import get_option
 from .plotly_utils import (
+    as_plotly_color,
     axis_num, facet_layout, make_trans, plot_border, plotly_style,
     to_hex, y_grid,
 )
@@ -75,9 +76,9 @@ def profile_facet_plotly(cells, x_levels, series, y_tick, y_lab_tick,
                 marker=dict(symbol="circle", size=px,
                             sizemode="diameter",
                             color=make_trans(fills[j], 1),
-                            line=dict(color=to_hex(fills[j]),
+                            line=dict(color=as_plotly_color(fills[j]),
                                       width=1)),
-                line=dict(color=to_hex(fills[j]), width=ln_width),
+                line=dict(color=as_plotly_color(fills[j]), width=ln_width),
                 hovertemplate=hover,
                 showlegend=grouped and i == 0,
             ))
@@ -114,8 +115,8 @@ def profile_facet_plotly(cells, x_levels, series, y_tick, y_lab_tick,
                     yanchor="top", font=dict(size=title_size))
                if main else None),
         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"]),
         **axes,
     )
     return fig

lessPy/radar_plotly.py

@@ -20,6 +20,7 @@ import plotly.graph_objects as go
 
 from .utils import get_option
 from .plotly_utils import (
+    as_plotly_color,
     BASE_COLORS, facet_layout, make_trans, plotly_style, to_hex,
 )
 
@@ -182,7 +183,7 @@ def radar_plotly(x=None, x_name=None, by_name=None, main=None,
             text=main, x=0.5, xanchor="center",
             y=0.97, yanchor="top",
             font=dict(size=title_size,
-                      color=to_hex(get_option("lab_color",
+                      color=as_plotly_color(get_option("lab_color",
                                               "black")))),
         margin=dict(t=round(title_size * 2.2), b=10,
                     l=20 if n_fac == 1 else r_margin,
@@ -191,11 +192,11 @@ def radar_plotly(x=None, x_name=None, by_name=None, main=None,
         annotations=anns,
         legend=dict(
             x=1.02, xanchor="left", y=1.0, yanchor="top",
-            bordercolor=to_hex(style_opts["panel_border"]),
+            bordercolor=as_plotly_color(style_opts["panel_border"]),
             borderwidth=1,
             font=dict(size=round(18 * ax_cex)),
         ),
         template=None,
-        paper_bgcolor=to_hex(style_opts["window_fill"]),
+        paper_bgcolor=as_plotly_color(style_opts["window_fill"]),
     )
     return fig