py2ls 0.1.9.5__tar.gz → 0.1.9.6__tar.gz

{py2ls-0.1.9.5 → py2ls-0.1.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py2ls
-Version: 0.1.9.5
+Version: 0.1.9.6
 Summary: py(thon)2(too)ls
 Author: Jianfeng
 Author-email: Jianfeng.Liu0413@gmail.com

{py2ls-0.1.9.5 → py2ls-0.1.9.6}/py2ls/plot.py

@@ -10,7 +10,7 @@ from cycler import cycler
 import logging
 import os
 
-from .ips import fsave, fload, mkdir, listdir
+from .ips import fsave, fload, mkdir, listdir, figsave
 from .stats import *
 
 # Suppress INFO messages from fontTools
@@ -311,13 +311,118 @@ def catplot(data, *args, **kwargs):
         violin_positions = np.nanmean(violin_positions, axis=0)
         for i, (x, ys) in enumerate(zip(violin_positions, data.T)):
             ys = ys[~np.isnan(ys)]
-            kde = gaussian_kde(ys, bw_method=opt_v["BandWidth"])
-            min_val, max_val = ys.min(), ys.max()
-            y_vals = np.linspace(min_val, max_val, opt_v["NumPoints"])
-            kde_vals = kde(y_vals)
-            kde_vals = kde_vals / kde_vals.max() * opt_v["x_width"]
-            if label is not None and i < len(label):
-                if len(ys) > 1:
+            if np.all(ys == ys[0]):  # Check if data is constant
+                print(
+                    "Data is constant; KDE cannot be applied. Plotting a flat line instead."
+                )
+                if vertical:
+                    ax.plot(
+                        [x - opt_v["x_width"] / 2, x + opt_v["x_width"] / 2],
+                        [ys[0], ys[0]],
+                        color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
+                        lw=2,
+                        label=label[i] if label else None,
+                    )
+                else:
+                    ax.plot(
+                        [ys[0], ys[0]],
+                        [x - opt_v["x_width"] / 2, x + opt_v["x_width"] / 2],
+                        color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
+                        lw=2,
+                        label=label[i] if label else None,
+                    )
+            else:
+                kde = gaussian_kde(ys, bw_method=opt_v["BandWidth"])
+                min_val, max_val = ys.min(), ys.max()
+                y_vals = np.linspace(min_val, max_val, opt_v["NumPoints"])
+                kde_vals = kde(y_vals)
+                kde_vals = kde_vals / kde_vals.max() * opt_v["x_width"]
+                if label is not None and i < len(label):
+                    if len(ys) > 1:
+                        if "r" in opt_v["loc"].lower():
+                            ax.fill_betweenx(
+                                y_vals,
+                                x,
+                                x + kde_vals,
+                                color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
+                                alpha=opt_v["FaceAlpha"],
+                                edgecolor=opt_v["EdgeColor"],
+                                label=label[i],
+                                lw=opt_v["LineWidth"],
+                                hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
+                            )
+                        elif (
+                            "l" in opt_v["loc"].lower()
+                            and not "f" in opt_v["loc"].lower()
+                        ):
+                            ax.fill_betweenx(
+                                y_vals,
+                                x - kde_vals,
+                                x,
+                                color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
+                                alpha=opt_v["FaceAlpha"],
+                                edgecolor=opt_v["EdgeColor"],
+                                label=label[i],
+                                lw=opt_v["LineWidth"],
+                                hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
+                            )
+                        elif (
+                            "o" in opt_v["loc"].lower()
+                            or "both" in opt_v["loc"].lower()
+                        ):
+                            ax.fill_betweenx(
+                                y_vals,
+                                x - kde_vals,
+                                x + kde_vals,
+                                color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
+                                alpha=opt_v["FaceAlpha"],
+                                edgecolor=opt_v["EdgeColor"],
+                                label=label[i],
+                                lw=opt_v["LineWidth"],
+                                hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
+                            )
+                        elif "i" in opt_v["loc"].lower():
+                            if i % 2 == 1:  # odd number
+                                ax.fill_betweenx(
+                                    y_vals,
+                                    x - kde_vals,
+                                    x,
+                                    color=opt_v["FaceColor"][
+                                        i % len(opt_v["FaceColor"])
+                                    ],
+                                    alpha=opt_v["FaceAlpha"],
+                                    edgecolor=opt_v["EdgeColor"],
+                                    label=label[i],
+                                    lw=opt_v["LineWidth"],
+                                    hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
+                                )
+                            else:
+                                ax.fill_betweenx(
+                                    y_vals,
+                                    x,
+                                    x + kde_vals,
+                                    color=opt_v["FaceColor"][
+                                        i % len(opt_v["FaceColor"])
+                                    ],
+                                    alpha=opt_v["FaceAlpha"],
+                                    edgecolor=opt_v["EdgeColor"],
+                                    label=label[i],
+                                    lw=opt_v["LineWidth"],
+                                    hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
+                                )
+                        elif "f" in opt_v["loc"].lower():
+                            ax.fill_betweenx(
+                                y_vals,
+                                x - kde_vals,
+                                x + kde_vals,
+                                color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
+                                alpha=opt_v["FaceAlpha"],
+                                edgecolor=opt_v["EdgeColor"],
+                                label=label[i],
+                                lw=opt_v["LineWidth"],
+                                hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
+                            )
+                else:
                     if "r" in opt_v["loc"].lower():
                         ax.fill_betweenx(
                             y_vals,
@@ -326,7 +431,8 @@ def catplot(data, *args, **kwargs):
                             color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
                             alpha=opt_v["FaceAlpha"],
                             edgecolor=opt_v["EdgeColor"],
-                            label=label[i],
+                            lw=opt_v["LineWidth"],
+                            hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
                         )
                     elif (
                         "l" in opt_v["loc"].lower() and not "f" in opt_v["loc"].lower()
@@ -338,7 +444,8 @@ def catplot(data, *args, **kwargs):
                             color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
                             alpha=opt_v["FaceAlpha"],
                             edgecolor=opt_v["EdgeColor"],
-                            label=label[i],
+                            lw=opt_v["LineWidth"],
+                            hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
                         )
                     elif "o" in opt_v["loc"].lower() or "both" in opt_v["loc"].lower():
                         ax.fill_betweenx(
@@ -348,7 +455,8 @@ def catplot(data, *args, **kwargs):
                             color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
                             alpha=opt_v["FaceAlpha"],
                             edgecolor=opt_v["EdgeColor"],
-                            label=label[i],
+                            lw=opt_v["LineWidth"],
+                            hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
                         )
                     elif "i" in opt_v["loc"].lower():
                         if i % 2 == 1:  # odd number
@@ -359,7 +467,8 @@ def catplot(data, *args, **kwargs):
                                 color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
                                 alpha=opt_v["FaceAlpha"],
                                 edgecolor=opt_v["EdgeColor"],
-                                label=label[i],
+                                lw=opt_v["LineWidth"],
+                                hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
                             )
                         else:
                             ax.fill_betweenx(
@@ -369,7 +478,8 @@ def catplot(data, *args, **kwargs):
                                 color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
                                 alpha=opt_v["FaceAlpha"],
                                 edgecolor=opt_v["EdgeColor"],
-                                label=label[i],
+                                lw=opt_v["LineWidth"],
+                                hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
                             )
                     elif "f" in opt_v["loc"].lower():
                         ax.fill_betweenx(
@@ -379,64 +489,9 @@ def catplot(data, *args, **kwargs):
                             color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
                             alpha=opt_v["FaceAlpha"],
                             edgecolor=opt_v["EdgeColor"],
-                            label=label[i],
+                            lw=opt_v["LineWidth"],
+                            hatch=opt_v["hatch"][i % len(opt_v["FaceColor"])],
                         )
-            else:
-                if "r" in opt_v["loc"].lower():
-                    ax.fill_betweenx(
-                        y_vals,
-                        x,
-                        x + kde_vals,
-                        color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
-                        alpha=opt_v["FaceAlpha"],
-                        edgecolor=opt_v["EdgeColor"],
-                    )
-                elif "l" in opt_v["loc"].lower() and not "f" in opt_v["loc"].lower():
-                    ax.fill_betweenx(
-                        y_vals,
-                        x - kde_vals,
-                        x,
-                        color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
-                        alpha=opt_v["FaceAlpha"],
-                        edgecolor=opt_v["EdgeColor"],
-                    )
-                elif "o" in opt_v["loc"].lower() or "both" in opt_v["loc"].lower():
-                    ax.fill_betweenx(
-                        y_vals,
-                        x - kde_vals,
-                        x + kde_vals,
-                        color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
-                        alpha=opt_v["FaceAlpha"],
-                        edgecolor=opt_v["EdgeColor"],
-                    )
-                elif "i" in opt_v["loc"].lower():
-                    if i % 2 == 1:  # odd number
-                        ax.fill_betweenx(
-                            y_vals,
-                            x - kde_vals,
-                            x,
-                            color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
-                            alpha=opt_v["FaceAlpha"],
-                            edgecolor=opt_v["EdgeColor"],
-                        )
-                    else:
-                        ax.fill_betweenx(
-                            y_vals,
-                            x,
-                            x + kde_vals,
-                            color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
-                            alpha=opt_v["FaceAlpha"],
-                            edgecolor=opt_v["EdgeColor"],
-                        )
-                elif "f" in opt_v["loc"].lower():
-                    ax.fill_betweenx(
-                        y_vals,
-                        x - kde_vals,
-                        x + kde_vals,
-                        color=opt_v["FaceColor"][i % len(opt_v["FaceColor"])],
-                        alpha=opt_v["FaceAlpha"],
-                        edgecolor=opt_v["EdgeColor"],
-                    )
 
     def plot_ridgeplot(data, x, y, opt_r, **kwargs_figsets):
         # in the sns.FacetGrid class, the 'hue' argument is the one that is the one that will be represented by colors with 'palette'
@@ -939,11 +994,13 @@ def catplot(data, *args, **kwargs):
         opt["v"].setdefault("x_dist", opt["v"]["x_width"])
         opt["v"].setdefault("loc", "r")
         opt["v"].setdefault("EdgeColor", "none")
+        opt["v"].setdefault("LineWidth", 0.5)
         opt["v"].setdefault("FaceColor", color_custom)
         opt["v"].setdefault("FaceAlpha", 1)
         opt["v"].setdefault("BandWidth", "scott")
         opt["v"].setdefault("Function", "pdf")
         opt["v"].setdefault("Kernel", "gau")
+        opt["v"].setdefault("hatch", None)
         opt["v"].setdefault("NumPoints", 500)
         opt["v"].setdefault("BoundaryCorrection", "reflection")
 

{py2ls-0.1.9.5 → py2ls-0.1.9.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py2ls"
-version = "0.1.9.5"
+version = "0.1.9.6"
 description = "py(thon)2(too)ls"
 authors = ["Jianfeng <Jianfeng.Liu0413@gmail.com>"]
 readme = "README.md"