py2ls 0.1.8.3__py3-none-any.whl → 0.1.8.5__py3-none-any.whl

py2ls/plot.py

@@ -1,5 +1,6 @@
 import matplotlib.pyplot as plt
 import numpy as np
+import pandas as pd
 from matplotlib.colors import to_rgba
 from scipy.stats import gaussian_kde
 
@@ -318,6 +319,33 @@ def catplot(data, *args, **kwargs):
         # custom_order = ['s', 'bx', 'e']
         # full_order = sort_catplot_layers(custom_order)
 
+    # figsets
+    kw_figsets = kwargs.get("figsets", None)
+    # check the data type
+    if isinstance(data, pd.DataFrame):
+        df = data.copy()
+        x = kwargs.get("x", None)
+        y = kwargs.get("y", None)
+        hue = kwargs.get("hue", None)
+        data = df2array(data=data, x=x, y=y, hue=hue).T
+        xticklabels = []
+        if hue is not None:
+            for i in df[x].unique().tolist():
+                for j in df[hue].unique().tolist():
+                    xticklabels.append(i + "-" + j)
+        else:
+            for i in df[x].unique().tolist():
+                xticklabels.append(i)
+        ylabel = y
+        xlabe = x
+
+        kw_figsets = {
+            "ylabel": y,
+            "xlabel": x,
+            "xticklabels": xticklabels,
+            **kw_figsets,
+        }
+
     # full_order
     opt = kwargs.get("opt", {})
     ax = kwargs.get("ax", None)
@@ -470,7 +498,10 @@ def catplot(data, *args, **kwargs):
                 opt[key].update(kwargs[key])
             else:
                 opt[key] = kwargs[key]
-    xloc = opt["loc"]["xloc"]
+    if isinstance(opt["loc"]["xloc"], list):
+        xloc = np.array(opt["loc"]["xloc"])
+    else:
+        xloc = opt["loc"]["xloc"]
     layers = sort_catplot_layers(opt["layer"])
     for layer in layers:
         if layer == "b" and opt["b"]["go"]:
@@ -485,8 +516,7 @@ def catplot(data, *args, **kwargs):
             plot_violin(data, opt["v"], xloc, ax)
         elif all([layer == "l", opt["l"]["go"], opt["s"]["go"]]):
             plot_lines(data, opt["l"], opt["s"], ax)
-    # figsets
-    kw_figsets = kwargs.get("figsets", None)
+
     if kw_figsets is not None:
         figsets(ax=ax, **kw_figsets)
     return ax
@@ -1357,7 +1387,42 @@ def add_colorbar(im, width=None, pad=None, **kwargs):
     return fig.colorbar(im, cax=cax, **kwargs)  # draw cbar
 
 
-def padcat(*args, fill_value=np.nan, axis=1):
+# def padcat(*args, fill_value=np.nan, axis=1):
+#     """
+#     Concatenate vectors with padding.
+
+#     Parameters:
+#     *args : variable number of list or 1D arrays
+#         Input arrays to concatenate.
+#     fill_value : scalar, optional
+#         The value to use for padding the shorter lists (default is np.nan).
+#     axis : int, optional
+#         The axis along which to concatenate (0 for rows, 1 for columns, default is 0).
+
+#     Returns:
+#     np.ndarray
+#         A 2D array with the input arrays concatenated along the specified axis, padded with fill_value where necessary.
+#     """
+#     if axis == 0:
+#         # Concatenate along rows
+#         max_len = max(len(lst) for lst in args)
+#         result = np.full((len(args), max_len), fill_value)
+#         for i, lst in enumerate(args):
+#             result[i, : len(lst)] = lst
+#     elif axis == 1:
+#         # Concatenate along columns
+#         max_len = max(len(lst) for lst in args)
+#         result = np.full((max_len, len(args)), fill_value)
+#         for i, lst in enumerate(args):
+#             result[: len(lst), i] = lst
+#     else:
+#         raise ValueError("axis must be 0 or 1")
+
+#     return result
+import numpy as np
+
+
+def padcat(*args, fill_value=np.nan, axis=1, order="row"):
     """
     Concatenate vectors with padding.
 
@@ -1367,25 +1432,78 @@ def padcat(*args, fill_value=np.nan, axis=1):
     fill_value : scalar, optional
         The value to use for padding the shorter lists (default is np.nan).
     axis : int, optional
-        The axis along which to concatenate (0 for rows, 1 for columns, default is 0).
+        The axis along which to concatenate (0 for rows, 1 for columns, default is 1).
 
     Returns:
     np.ndarray
-        A 2D array with the input arrays concatenated along the specified axis, padded with fill_value where necessary.
+        A 2D array with the input arrays concatenated along the specified axis,
+        padded with fill_value where necessary.
     """
+    # Convert all inputs to 1D NumPy arrays
+    if "ro" in order.lower():
+        order = "C"  # in row
+    else:
+        order = "F"  # column
+    arrays = [np.asarray(arg).flatten(order=order) for arg in args]
+
     if axis == 0:
         # Concatenate along rows
-        max_len = max(len(lst) for lst in args)
-        result = np.full((len(args), max_len), fill_value)
-        for i, lst in enumerate(args):
-            result[i, : len(lst)] = lst
+        max_len = max(arr.size for arr in arrays)
+        result = np.full((len(arrays), max_len), fill_value)
+        for i, arr in enumerate(arrays):
+            result[i, : arr.size] = arr
     elif axis == 1:
         # Concatenate along columns
-        max_len = max(len(lst) for lst in args)
-        result = np.full((max_len, len(args)), fill_value)
-        for i, lst in enumerate(args):
-            result[: len(lst), i] = lst
+        max_len = max(arr.size for arr in arrays)
+        result = np.full((max_len, len(arrays)), fill_value)
+        for i, arr in enumerate(arrays):
+            result[: arr.size, i] = arr
     else:
         raise ValueError("axis must be 0 or 1")
 
     return result
+
+
+def sort_rows_move_nan(arr):
+    # Handle edge cases where all values are NaN
+    if np.all(np.isnan(arr)):
+        return arr  # Return unchanged if the entire array is NaN
+
+    # Replace NaNs with a temporary large value for sorting
+    temp_value = (
+        np.nanmax(arr[np.isfinite(arr)]) + 1 if np.any(np.isfinite(arr)) else np.inf
+    )
+    arr_no_nan = np.where(np.isnan(arr), temp_value, arr)
+
+    # Sort each row
+    sorted_arr = np.sort(arr_no_nan, axis=1)
+
+    # Move NaNs to the end
+    result_arr = np.where(sorted_arr == temp_value, np.nan, sorted_arr)
+
+    # Remove rows that contain only NaNs
+    clean_arr = result_arr[~np.isnan(result_arr).all(axis=1)]
+
+    # Remove columns that contain only NaNs
+    clean_arr_ = clean_arr[:, ~np.isnan(clean_arr).all(axis=0)]
+
+    return clean_arr_
+
+
+def df2array(data: pd.DataFrame, x, y, hue=None):
+    if hue is None:
+        a = []
+        cat_x = data[x].unique().tolist()
+        for i, x_ in enumerate(cat_x):
+            new_ = data.loc[data[x] == x_, y].to_list()
+            a = padcat(a, new_, axis=0)
+        return sort_rows_move_nan(a.reshape(2**i, -1))
+    else:
+        a = []
+        cat_x = data[x].unique().tolist()
+        cat_hue = data[hue].unique().tolist()
+        for i, x_ in enumerate(cat_x):
+            for j, hue_ in enumerate(cat_hue):
+                new_ = data.loc[(data[x] == x_) & (data[hue] == hue_), y].to_list()
+                a = padcat(a, new_, axis=0)
+        return sort_rows_move_nan(a.reshape(2 ** ((i + 1) * (j + 1)), -1))

{py2ls-0.1.8.3.dist-info → py2ls-0.1.8.5.dist-info}/METADATA

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

{py2ls-0.1.8.3.dist-info → py2ls-0.1.8.5.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=nGGA9Xqa5MzU5X7aE7Mfkk0qrnOkn3DGYulKuh-Ew48,100571
-py2ls/netfinder.py,sha256=MY_0TQY_zaRBZ6wfR4RxNCGrU93HFmDVDRRy1EXl75o,47566
-py2ls/plot.py,sha256=WIAUDd4cRjFTX_Y_SWwsSw9_gIQF_Ye6R_-MvhB9G1k,50437
+py2ls/ips.py,sha256=mBFTARM6Pvj5EaVRR05CXCBlyNcbX2JfMQWBjnxONjI,100773
+py2ls/netfinder.py,sha256=OMStrwMAASf1ajlyEfseoaEygo7G5WKBAFRE0LY15Lw,49477
+py2ls/plot.py,sha256=odZsLi4jG_WLULurpdGnWEyLC_RD_Yz2_EW-DqhJu98,54285
 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.3.dist-info/METADATA,sha256=-paqLVPq6PniDxsUdZ0UVwJQIry2DrS958ohish7h2o,20017
-py2ls-0.1.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.8.3.dist-info/RECORD,,
+py2ls-0.1.8.5.dist-info/METADATA,sha256=E0XmdaV6guqdnsCWF2XHqfkPHxrltAgElzNII6oWq8g,20017
+py2ls-0.1.8.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.8.5.dist-info/RECORD,,