py2ls 0.1.8.8__py3-none-any.whl → 0.1.8.9__py3-none-any.whl

py2ls/ips.py

@@ -45,7 +45,8 @@ from langdetect import detect
 from duckduckgo_search import DDGS
 
 from . import netfinder
-from .plot import get_color
+
+# from .plot import get_color
 
 try:
     get_ipython().run_line_magic("load_ext", "autoreload")
@@ -1354,18 +1355,12 @@ def fsave(
 
     def save_json(fpath_fname, var_dict_or_df):
         with open(fpath_fname, "w") as f_json:
-            # Check if var_dict_or_df is a DataFrame
             if isinstance(var_dict_or_df, pd.DataFrame):
-                # Convert DataFrame to a list of dictionaries
                 var_dict_or_df = var_dict_or_df.to_dict(orient="dict")
-
-            # Check if var_dict_or_df is a dictionary
             if isinstance(var_dict_or_df, dict):
-                # Convert NumPy arrays to lists
                 for key, value in var_dict_or_df.items():
                     if isinstance(value, np.ndarray):
                         var_dict_or_df[key] = value.tolist()
-
             # Save the dictionary or list of dictionaries to a JSON file
             json.dump(var_dict_or_df, f_json, indent=4)
 

py2ls/plot.py

@@ -8,6 +8,7 @@ import matplotlib
 import matplotlib.ticker as tck
 from cycler import cycler
 import logging
+from .ips import fsave
 
 # Suppress INFO messages from fontTools
 logging.getLogger("fontTools").setLevel(logging.WARNING)
@@ -57,7 +58,7 @@ def catplot(data, *args, **kwargs):
             xloc, opt_e["loc"], opt_e["x_width"], data.shape[0]
         )
         error_positions = np.nanmean(error_positions, axis=0)
-        errors = np.nanstd(data, axis=0)
+        errors = np.nanstd(data, axis=0, ddof=1)
         if opt_e["error"] == "sem":
             errors /= np.sqrt(np.sum(~np.isnan(data), axis=0))
 
@@ -212,6 +213,9 @@ def catplot(data, *args, **kwargs):
             color=bx_opt["MeanLineColor"],
             linewidth=bx_opt["MeanLineWidth"],
         )
+        # MeanLine or MedianLine only keep only one
+        if bx_opt["MeanLine"]:  # MeanLine has priority
+            bx_opt["MedianLine"] = False
         bxp = ax.boxplot(
             data,
             positions=X_bx,
@@ -231,6 +235,9 @@ def catplot(data, *args, **kwargs):
             widths=bx_opt["x_width"],
             label=label,
         )
+        if not bx_opt["MedianLine"]:
+            for median in bxp["medians"]:
+                median.set_visible(False)
 
         if bx_opt["BoxLineWidth"] < 0.1:
             bx_opt["EdgeColor"] = "none"
@@ -471,12 +478,15 @@ def catplot(data, *args, **kwargs):
             xticks = generate_xticks_with_gap(x_len, hue_len)
             default_x_width = 0.85
             legend_hue = df[hue].unique().tolist()
+            default_colors = get_color(hue_len)
         else:
             for i in df[x].unique().tolist():
                 xticklabels.append(i)
-            xticks = np.arange(1, len(xticklabels) + 1)
+            xticks = np.arange(1, len(xticklabels) + 1).tolist()
             legend_hue = xticklabels
+            default_colors = get_color(len(xticklabels))
             default_x_width = 0.5
+
         # when the xticklabels are too long, rotate the labels a bit
 
         xangle = 30 if max([len(i) for i in xticklabels]) > 5 else 0
@@ -498,7 +508,7 @@ def catplot(data, *args, **kwargs):
                 "xangle": xangle,
             }
     else:
-        xticks = np.arange(1, data.shape[1] + 1)
+        xticks = np.arange(1, data.shape[1] + 1).tolist()
         default_x_width = 0.5
         xangle = 0
 
@@ -507,27 +517,12 @@ def catplot(data, *args, **kwargs):
     ax = kwargs.get("ax", None)
     if "ax" not in locals() or ax is None:
         ax = plt.gca()
-
-    default_colors = (
-        np.array(
-            [
-                [0, 0, 0],
-                [234, 37, 46],
-                [0, 154, 222],
-                [175, 89, 186],
-                [255, 198, 37],
-                [242, 133, 34],
-            ]
-        )
-        / 255.0
-    )
-
     opt.setdefault("c", default_colors)
-    if len(opt["c"]) < data.shape[1]:
-        additional_colors = plt.cm.winter(
-            np.linspace(0, 1, data.shape[1] - len(opt["c"]))
-        )
-        opt["c"] = np.vstack([opt["c"], additional_colors[:, :3]])
+    # if len(opt["c"]) < data.shape[1]:
+    #     additional_colors = plt.cm.winter(
+    #         np.linspace(0, 1, data.shape[1] - len(opt["c"]))
+    #     )
+    #     opt["c"] = np.vstack([opt["c"], additional_colors[:, :3]])
 
     opt.setdefault("loc", {})
     opt["loc"].setdefault("go", 0)
@@ -545,7 +540,7 @@ def catplot(data, *args, **kwargs):
     opt["b"].setdefault("go", 1)
     opt["b"].setdefault("loc", "c")
     opt["b"].setdefault("FaceColor", opt["c"])
-    opt["b"].setdefault("FaceAlpha", 0.65)
+    opt["b"].setdefault("FaceAlpha", 1)
     opt["b"].setdefault("EdgeColor", "k")
     opt["b"].setdefault("EdgeAlpha", 1)
     opt["b"].setdefault("LineStyle", "-")
@@ -576,13 +571,13 @@ def catplot(data, *args, **kwargs):
     opt.setdefault("s", {})
     opt["s"].setdefault("go", 1)
     opt["s"].setdefault("loc", "r")
-    opt["s"].setdefault("FaceColor", opt["c"])
+    opt["s"].setdefault("FaceColor", "w")
     opt["s"].setdefault("cmap", None)
     opt["s"].setdefault("FaceAlpha", 1)
     opt["s"].setdefault("x_width", opt["b"]["x_width"] / 5)
     opt["s"].setdefault("Marker", "o")
-    opt["s"].setdefault("MarkerSize", 10)
-    opt["s"].setdefault("LineWidth", 0.5)
+    opt["s"].setdefault("MarkerSize", 15)
+    opt["s"].setdefault("LineWidth", 0.8)
     opt["s"].setdefault("MarkerEdgeColor", "k")
 
     opt.setdefault("l", {})
@@ -597,7 +592,7 @@ def catplot(data, *args, **kwargs):
     opt["bx"].setdefault("loc", "r")
     opt["bx"].setdefault("FaceColor", opt["c"])
     opt["bx"].setdefault("EdgeColor", "k")
-    opt["bx"].setdefault("FaceAlpha", 0.7)
+    opt["bx"].setdefault("FaceAlpha", 0.85)
     opt["bx"].setdefault("EdgeAlpha", 1)
     opt["bx"].setdefault("LineStyle", "-")
     opt["bx"].setdefault("x_width", 0.2)
@@ -620,6 +615,7 @@ def catplot(data, *args, **kwargs):
     opt["bx"].setdefault("CapLineColor", "k")
     opt["bx"].setdefault("CapLineWidth", 0.5)
     opt["bx"].setdefault("CapSize", 0.2)
+    opt["bx"].setdefault("MedianLine", True)
     opt["bx"].setdefault("MedianLineStyle", "-")
     opt["bx"].setdefault("MedianStyle", "line")
     opt["bx"].setdefault("MedianLineColor", "k")
@@ -705,7 +701,13 @@ def catplot(data, *args, **kwargs):
 
     if kw_figsets is not None:
         figsets(ax=ax, **kw_figsets)
-    return ax
+    show_legend = kwargs.get("show_legend", True)
+    if show_legend:
+        ax.legend()
+    export_style = kwargs.get("export_style", None)
+    if export_style:
+        fsave(export_style, opt)
+    return ax, opt
 
 
 def get_cmap():
@@ -1356,14 +1358,16 @@ def stdshade(ax=None, *args, **kwargs):
         yMean = np.nanmean(y, axis=0)
     if paraStdSem == "sem":
         if smth > 1:
-            wings = savgol_filter(np.nanstd(y, axis=0) / np.sqrt(y.shape[0]), smth, 1)
+            wings = savgol_filter(
+                np.nanstd(y, axis=0, ddof=1) / np.sqrt(y.shape[0]), smth, 1
+            )
         else:
-            wings = np.nanstd(y, axis=0) / np.sqrt(y.shape[0])
+            wings = np.nanstd(y, axis=0, ddof=1) / np.sqrt(y.shape[0])
     elif paraStdSem == "std":
         if smth > 1:
-            wings = savgol_filter(np.nanstd(y, axis=0), smth, 1)
+            wings = savgol_filter(np.nanstd(y, axis=0, ddof=1), smth, 1)
         else:
-            wings = np.nanstd(y, axis=0)
+            wings = np.nanstd(y, axis=0, ddof=1)
 
     # fill_kws = kwargs.get('fill_kws', {})
     # line_kws = kwargs.get('line_kws', {})
@@ -1668,6 +1672,6 @@ def generate_xticks_with_gap(x_len, hue_len):
         for i in range(max(x_len, hue_len), 0, -1)  # i iterates from 3 to 1
     ]
     concatenated_array = np.concatenate(arrays)
-    positive_array = concatenated_array[concatenated_array > 0]
+    positive_array = concatenated_array[concatenated_array > 0].tolist()
 
     return positive_array

{py2ls-0.1.8.8.dist-info → py2ls-0.1.8.9.dist-info}/METADATA

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

{py2ls-0.1.8.8.dist-info → py2ls-0.1.8.9.dist-info}/RECORD

@@ -134,14 +134,14 @@ py2ls/db2ls.py,sha256=MMfFX47aIPIyu7fU9aPvX9lbPRPYOpJ_VXwlnWk-8qo,13615
 py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
 py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,2325
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
-py2ls/ips.py,sha256=6eNvNwaCDj2jyjter7VPL9oEGB2jS4ge9mSgiIrvZfo,100788
+py2ls/ips.py,sha256=N7MdOCgJXDQu73YkJQTtDN3RSntzXX7V0MOJ1NYBLEk,100572
 py2ls/netfinder.py,sha256=OMStrwMAASf1ajlyEfseoaEygo7G5WKBAFRE0LY15Lw,49477
-py2ls/plot.py,sha256=E6cV26ixVa8HFYTsTvaEtc-CgLYvaA7OhPg6S0eBZ2M,62740
+py2ls/plot.py,sha256=9_vyFNoPX4c8b0AS3lyFu18QKec5je3f0G8T7di9K9o,63197
 py2ls/setuptools-70.1.0-py3-none-any.whl,sha256=2bi3cUVal8ip86s0SOvgspteEF8SKLukECi-EWmFomc,882588
 py2ls/sleep_events_detectors.py,sha256=bQA3HJqv5qnYKJJEIhCyhlDtkXQfIzqksnD0YRXso68,52145
 py2ls/stats.py,sha256=Wd9yCKQ_61QD29WMEgMuEcreFxF91NmlPW65iWT2B5w,39041
 py2ls/translator.py,sha256=bc5FB-wqC4TtQz9gyCP1mE38HqNRJ_pmuRIgKnAlMzM,30581
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.8.8.dist-info/METADATA,sha256=tnUzLUWK94WS_DVJ1Jxcn_fRFrQRktuceHW0WMRfS5g,20017
-py2ls-0.1.8.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.8.8.dist-info/RECORD,,
+py2ls-0.1.8.9.dist-info/METADATA,sha256=7-nSwoDVg7Yf3lZ8pqIZ6b-voypM-2p9vwDWoSLqGFs,20017
+py2ls-0.1.8.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.8.9.dist-info/RECORD,,