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

py2ls/ips.py

@@ -924,13 +924,14 @@ def pdf2img(dir_pdf, dir_save=None, page=None, kind="png", verbose=True, **kws):
         page = [page]
     if page is None:
         page = [pdfinfo_from_path(dir_pdf)["Pages"]]
-    if len(page) == 1 and page != pdfinfo_from_path(dir_pdf)["Pages"]:
+    if len(page) == 1 and page != [pdfinfo_from_path(dir_pdf)["Pages"]]:
         page = [page[0], page[0]]
     else:
         page = [1, page[0]]
-    pages = convert_from_path(dir_pdf, first_page=page[0], last_page=page[1], **kws)
+    print(page)
+    pages = convert_from_path(dir_pdf, first_page=page[0], last_page=page[-1], **kws)
     if dir_save is None:
-        dir_save = newfolder(dirname(dir_pdf), basename(dir_pdf).split(".")[0] + "_img")
+        dir_save = mkdir(dirname(dir_pdf), basename(dir_pdf).split(".")[0] + "_img")
     for i, page in enumerate(pages):
         if verbose:
             print(f"processing page: {i+1}")

py2ls/plot.py

@@ -333,18 +333,39 @@ def catplot(data, *args, **kwargs):
             for i in df[x].unique().tolist():
                 for j in df[hue].unique().tolist():
                     xticklabels.append(i + "-" + j)
+            x_len = len(df[x].unique().tolist())
+            hue_len = len(df[hue].unique().tolist())
+            xticks = generate_xticks_with_gap(x_len, hue_len)
+            default_x_width = 0.85
         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,
-        }
+            xticks = np.arange(1, len(xticklabels) + 1)
+            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
+        if kw_figsets is not None:
+            kw_figsets = {
+                "ylabel": y,
+                "xlabel": x,
+                "xticks": xticks,
+                "xticklabels": xticklabels,
+                "xangle": xangle,
+                **kw_figsets,
+            }
+        else:
+            kw_figsets = {
+                "ylabel": y,
+                "xlabel": x,
+                "xticks": xticks,
+                "xticklabels": xticklabels,
+                "xangle": xangle,
+            }
+    else:
+        xticks = np.arange(1, data.shape[1] + 1)
+        default_x_width = 0.5
+        xangle = 0
 
     # full_order
     opt = kwargs.get("opt", {})
@@ -375,7 +396,7 @@ def catplot(data, *args, **kwargs):
 
     opt.setdefault("loc", {})
     opt["loc"].setdefault("go", 0)
-    opt["loc"].setdefault("xloc", np.arange(1, data.shape[1] + 1))
+    opt["loc"].setdefault("xloc", xticks)
 
     # export setting
     opt.setdefault("export", {})
@@ -394,7 +415,7 @@ def catplot(data, *args, **kwargs):
     opt["b"].setdefault("EdgeAlpha", 1)
     opt["b"].setdefault("LineStyle", "-")
     opt["b"].setdefault("LineWidth", 0.8)
-    opt["b"].setdefault("x_width", 0.5)
+    opt["b"].setdefault("x_width", default_x_width)
     opt["b"].setdefault("ShowBaseLine", "off")
     opt["b"].setdefault("hatch", None)
 
@@ -1433,30 +1454,49 @@ def padcat(*args, fill_value=np.nan, axis=1, order="row"):
         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.
     """
-    # Convert all inputs to 1D NumPy arrays
+    # Set the order for processing
     if "ro" in order.lower():
-        order = "C"  # in row
+        order = "C"  # row-major order
     else:
-        order = "F"  # column
-    arrays = [np.asarray(arg).flatten(order=order) for arg in args]
+        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 arrays)
-        result = np.full((len(arrays), max_len), fill_value)
-        for i, arr in enumerate(arrays):
+        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 arrays)
-        result = np.full((max_len, len(arrays)), fill_value)
-        for i, arr in enumerate(arrays):
+        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")
@@ -1464,6 +1504,17 @@ def padcat(*args, fill_value=np.nan, axis=1, order="row"):
     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)
+
+
 def sort_rows_move_nan(arr):
     # Handle edge cases where all values are NaN
     if np.all(np.isnan(arr)):
@@ -1490,20 +1541,50 @@ def sort_rows_move_nan(arr):
     return clean_arr_
 
 
-def df2array(data: pd.DataFrame, x, y, hue=None):
+def df2array(data: pd.DataFrame, x, y, hue=None, sort=False):
     if hue is None:
         a = []
-        cat_x = data[x].unique().tolist()
+        if sort:
+            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.reshape(2**i, -1))
+            a = padcat(a, new_, axis=0).T
+        return sort_rows_move_nan(a)
     else:
         a = []
-        cat_x = data[x].unique().tolist()
-        cat_hue = data[hue].unique().tolist()
+        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.reshape(2 ** ((i + 1) * (j + 1)), -1))
+        return sort_rows_move_nan(a)
+
+
+def generate_xticks_with_gap(x_len, hue_len):
+    """
+    Generate a concatenated array based on x_len and hue_len,
+    and return only the positive numbers.
+
+    Parameters:
+    - x_len: int, number of segments to generate
+    - hue_len: int, length of each hue
+
+    Returns:
+    - numpy array: Concatenated array containing only positive numbers
+    """
+
+    arrays = [
+        np.arange(1, hue_len + 1) + hue_len * (x_len - i) + (x_len - i)
+        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]
+
+    return positive_array

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

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

{py2ls-0.1.8.5.dist-info → py2ls-0.1.8.7.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=mBFTARM6Pvj5EaVRR05CXCBlyNcbX2JfMQWBjnxONjI,100773
+py2ls/ips.py,sha256=6eNvNwaCDj2jyjter7VPL9oEGB2jS4ge9mSgiIrvZfo,100788
 py2ls/netfinder.py,sha256=OMStrwMAASf1ajlyEfseoaEygo7G5WKBAFRE0LY15Lw,49477
-py2ls/plot.py,sha256=odZsLi4jG_WLULurpdGnWEyLC_RD_Yz2_EW-DqhJu98,54285
+py2ls/plot.py,sha256=a0-U-NE31dEhiD-aBNWRIL81sBKfCIqeJeaefu-FpVE,57128
 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.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,,
+py2ls-0.1.8.7.dist-info/METADATA,sha256=yBv9UvJ5xZzrjdmCzBxhOuqIU3jAK1_StxP3ofxNtoE,20017
+py2ls-0.1.8.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.8.7.dist-info/RECORD,,