py2ls 0.2.5.10__py3-none-any.whl → 0.2.5.14__py3-none-any.whl

py2ls/plot.py

@@ -23,6 +23,7 @@ from .ips import (
     get_df_format,
     df_corr,
     df_scaler,
+    df2array,array2df
 )
 import scipy.stats as scipy_stats
 from .stats import *
@@ -1350,7 +1351,7 @@ def catplot(data, *args, **kwargs):
         # # Example usage:
         # custom_order = ['s', 'bx', 'e']
         # full_order = sort_catplot_layers(custom_order)
-
+    data=data.copy()
     ax = kwargs.get("ax", None)
     col = kwargs.get("col", None)
     report = kwargs.get("report", True)
@@ -1363,8 +1364,9 @@ def catplot(data, *args, **kwargs):
             df = data.copy()
             x = kwargs.get("x", None)
             y = kwargs.get("y", None)
-            hue = kwargs.get("hue", None)
+            hue = kwargs.get("hue", None) 
             data = df2array(data=data, x=x, y=y, hue=hue)
+            
             y_max_loc = np.max(data, axis=0)
             xticklabels = []
             if hue is not None:
@@ -1518,7 +1520,11 @@ def catplot(data, *args, **kwargs):
                 display_output(res)
 
             # when the xticklabels are too long, rotate the labels a bit
-            xangle = 30 if max([len(i) for i in xticklabels]) > 50 else 0
+            try:
+                xangle = 30 if max([len(i) for i in xticklabels]) > 50 else 0
+            except:
+                xangle = 0
+
             if kw_figsets is not None:
                 kw_figsets = {
                     "ylabel": y,
@@ -3259,13 +3265,13 @@ def plot_xy(
     x=None,
     y=None,
     ax=None,
-    kind: Union[str, list] = None,  # Specify the kind of plot
+    kind_: Union[str, list] = None,  # Specify the kind of plot
     verbose=False,
     **kwargs,
 ):
     # You can call the original plotxy function if needed
     # or simply replicate the functionality here
-    return plotxy(data, x, y, ax, kind, verbose, **kwargs)
+    return plotxy(data, x=x, y=y, ax=ax, kind_=kind_, verbose=verbose, **kwargs)
 
 
 def plotxy(
@@ -3353,7 +3359,7 @@ def plotxy(
     
     # ============ preprocess data ============
     try:
-        data = df_preprocessing_(data, kind=kind_[0])
+        data = df_preprocessing_(data, kind=kind_[0]) 
         if "variable" in data.columns and "value" in data.columns:
             x, y = "variable", "value"
     except Exception as e:
@@ -3903,7 +3909,7 @@ def df_preprocessing_(data, kind, verbose=False):
         "pointplot",  # Works well with wide format
         "ellipse",
     ]
-
+    print(kind)
     # Wide format (e.g., for heatmap and pairplot)
     if kind in wide_kinds:
         if df_format_ != "wide":

py2ls/stats.py

@@ -8,7 +8,7 @@ import matplotlib.pyplot as plt
 import warnings
 
 warnings.filterwarnings("ignore", category=RuntimeWarning)
-
+from .ips import df2array
 
 # FuncStars --v 0.1.1
 def FuncStars(
@@ -902,148 +902,5 @@ def df_wide_long(df):
         return "Long"
 
 
-def sort_rows_move_nan(arr, sort=False):
-    # Handle edge cases where all values are NaN
-    if np.all(np.isnan(arr)):
-        return arr  # Return unchanged if the entire array is NaN
-
-    if sort:
-        # 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)
-    else:
-        result_rows = []
-        for row in arr:
-            # Separate non-NaN and NaN values
-            non_nan_values = row[~np.isnan(row)]
-            nan_count = np.isnan(row).sum()
-            # Create a new row with non-NaN values followed by NaNs
-            new_row = np.concatenate([non_nan_values, [np.nan] * nan_count])
-            result_rows.append(new_row)
-        # Convert the list of rows back into a 2D NumPy array
-        result_arr = np.array(result_rows)
-
-    # Remove rows/columns that contain only NaNs
-    clean_arr = result_arr[~np.isnan(result_arr).all(axis=1)]
-    clean_arr_ = clean_arr[:, ~np.isnan(clean_arr).all(axis=0)]
-
-    return clean_arr_
-
-
-def df2array(data: pd.DataFrame, x=None, y=None, hue=None, sort=False):
-    if hue is None:
-        a = []
-        if sort:
-            cat_x = np.sort(data[x].unique().tolist()).tolist()
-        else:
-            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).T
-    else:
-        a = []
-        if sort:
-            cat_x = np.sort(data[x].unique().tolist()).tolist()
-            cat_hue = np.sort(data[hue].unique().tolist()).tolist()
-        else:
-            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).T
-
-
-def array2df(data: np.ndarray):
-    df = pd.DataFrame()
-    df["group"] = (
-        np.tile(
-            ["group" + str(i) for i in range(1, data.shape[1] + 1)], [data.shape[0], 1]
-        )
-        .reshape(-1, 1, order="F")[:, 0]
-        .tolist()
-    )
-    df["value"] = data.reshape(-1, 1, order="F")
-    return df
-
-
-def padcat(*args, fill_value=np.nan, axis=1, order="row"):
-    """
-    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 1).
-    order : str, optional
-        The order for flattening when required: "row" or "column" (default is "row").
-
-    Returns:
-    np.ndarray
-        A 2D array with the input arrays concatenated along the specified axis,
-        padded with fill_value where necessary.
-    """
-    # Set the order for processing
-    if "ro" in order.lower():
-        order = "C"  # row-major order
-    else:
-        order = "F"  # column-major order
-
-    # Process input arrays based on their dimensions
-    processed_arrays = []
-    for arg in args:
-        arr = np.asarray(arg)
-        if arr.ndim == 1:
-            processed_arrays.append(arr)  # Keep 1D arrays as is
-        elif arr.ndim == 2:
-            if axis == 0:
-                # If concatenating along rows, split 2D arrays into 1D arrays row-wise
-                processed_arrays.extend(arr)
-            elif axis == 1:
-                # If concatenating along columns, split 2D arrays into 1D arrays column-wise
-                processed_arrays.extend(arr.T)
-            else:
-                raise ValueError("axis must be 0 or 1")
-        else:
-            raise ValueError("Input arrays must be 1D or 2D")
-
-    if axis == 0:
-        # Concatenate along rows
-        max_len = max(arr.size for arr in processed_arrays)
-        result = np.full((len(processed_arrays), max_len), fill_value)
-        for i, arr in enumerate(processed_arrays):
-            result[i, : arr.size] = arr
-    elif axis == 1:
-        # Concatenate along columns
-        max_len = max(arr.size for arr in processed_arrays)
-        result = np.full((max_len, len(processed_arrays)), fill_value)
-        for i, arr in enumerate(processed_arrays):
-            result[: arr.size, i] = arr
-    else:
-        raise ValueError("axis must be 0 or 1")
-
-    return result
 
 
-# # Example usage:
-# a = [1, np.nan]
-# b = [1, 3, 4, np.nan, 2, np.nan]
-# c = [1, 2, 3, 4, 5, 6, 7, 8, 10]
-# d = padcat(a, b)
-# result1 = padcat(d, c)
-# result2 = padcat(a, b, c)
-# print("Result of padcat(d, c):\n", result1)
-# print("Result of padcat(a, b, c):\n", result2)

{py2ls-0.2.5.10.dist-info → py2ls-0.2.5.14.dist-info}/METADATA

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

{py2ls-0.2.5.10.dist-info → py2ls-0.2.5.14.dist-info}/RECORD

@@ -18,7 +18,7 @@ py2ls/.git/hooks/pre-receive.sample,sha256=pMPSuce7P9jRRBwxvU7nGlldZrRPz0ndsxAlI
 py2ls/.git/hooks/prepare-commit-msg.sample,sha256=6d3KpBif3dJe2X_Ix4nsp7bKFjkLI5KuMnbwyOGqRhk,1492
 py2ls/.git/hooks/push-to-checkout.sample,sha256=pT0HQXmLKHxt16-mSu5HPzBeZdP0lGO7nXQI7DsSv18,2783
 py2ls/.git/hooks/update.sample,sha256=jV8vqD4QPPCLV-qmdSHfkZT0XL28s32lKtWGCXoU0QY,3650
-py2ls/.git/index,sha256=c1AO_wJSDaf38yBek-Wd6EH8sKYZD1HlMgI2rHQTKDk,4232
+py2ls/.git/index,sha256=p_emoQrhXhCenpHHN8G7ox7DJvEZM0qvp4JBljVCJvM,4232
 py2ls/.git/info/exclude,sha256=ZnH-g7egfIky7okWTR8nk7IxgFjri5jcXAbuClo7DsE,240
 py2ls/.git/logs/HEAD,sha256=8ID7WuAe_TlO9g-ARxhIJYdgdL3u3m7-1qrOanaIUlA,3535
 py2ls/.git/logs/refs/heads/main,sha256=8ID7WuAe_TlO9g-ARxhIJYdgdL3u3m7-1qrOanaIUlA,3535
@@ -241,19 +241,21 @@ py2ls/ec2ls.py,sha256=PyLkiWYB8AJTIGdMn6VrEoE2vFtPYxt4WrCJfGQPFDk,2271
 py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,2325
 py2ls/fetch_update.py,sha256=9LXj661GpCEFII2wx_99aINYctDiHni6DOruDs_fdt8,4752
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
-py2ls/ich2ls.py,sha256=3E9R8oVpyYZXH5PiIQgT3CN5NxLe4Dwtm2LwaeacE6I,21381
-py2ls/ips.py,sha256=FJdNHEvDLHmmGeRCq1NlNlgumik-Gv5796pw8wfJAG8,487017
+py2ls/ich2ls.py,sha256=zXWdQzebBZjFIfpjgJuqZ6_7AnGehFTPX-BoNnAQwyc,81940
+py2ls/im2.py,sha256=inSdpU_IIvHG7FoXcdIvpGprPASySwJCR05Lpaa5fdU,3026
+py2ls/ips.py,sha256=UvEz8NOzvx8E5qsHuXhaU3tZLxI9m9_gDWrp9kt4uPc,689157
+py2ls/ips_lab.py,sha256=WmZVIatIWcfvuVrM88lVXygI7fnonI8a_5NSTnF0rTg,666051
 py2ls/ml2ls.py,sha256=I-JFPdikgEtfQjhv5gBz-QSeorpTJI_Pda_JwkTioBY,209732
 py2ls/mol.py,sha256=AZnHzarIk_MjueKdChqn1V6e4tUle3X1NnHSFA6n3Nw,10645
-py2ls/netfinder.py,sha256=OhqD3S9PuwweL2013D-q4GNP1WvJjuYfZzq5BZgGddE,68980
+py2ls/netfinder.py,sha256=GZinvZrKRV7h8GPPUBczFEcUKoHNLinh7PafnqMqsYg,81131
 py2ls/nl2ls.py,sha256=UEIdok-OamFZFIvvz_PdZenu085zteMdaJd9mLu3F-s,11485
 py2ls/ocr.py,sha256=WDFvx1oVxXjlyyFs2a6pizdu4-jEL5pTFLP960-HbyM,33939
-py2ls/plot.py,sha256=iE_T8G4Yv7QdnxVJH_zUsFOHL4zi9mga6FZhXpFb2XA,239505
+py2ls/plot.py,sha256=zS6x4BKquSoNZSMmpHi9-kb3ceXtELvnBnwxylm0Z4U,239669
 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=qBn2rJmNa_QLLUqjwYqXUlGzqmW94sgA1bxJU2FC3r0,39175
+py2ls/stats.py,sha256=xBXUHgV92iqNKtNaj7p5YouNJXKPrJcwkYJhc6lw8NI,34107
 py2ls/translator.py,sha256=77Tp_GjmiiwFbEIJD_q3VYpQ43XL9ZeJo6Mhl44mvh8,34284
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.2.5.10.dist-info/METADATA,sha256=H8N6X7SCqvk7cgK2N7ZFXTnKqNMFZsmlfmaQ17wrTfk,20632
-py2ls-0.2.5.10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py2ls-0.2.5.10.dist-info/RECORD,,
+py2ls-0.2.5.14.dist-info/METADATA,sha256=K7E7Fjc9zBYCM7IjUY2KR8yosnz9K4CAriQkziE_foU,20632
+py2ls-0.2.5.14.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py2ls-0.2.5.14.dist-info/RECORD,,