py2ls 0.2.4.24__py3-none-any.whl → 0.2.4.25__py3-none-any.whl

py2ls/plot.py

@@ -2475,7 +2475,8 @@ def get_color(
                     "#B25E9D",
                     "#4B8C3B",
                     "#EF8632",
-                    "#24578E" "#FF2C00",
+                    "#24578E",
+                    "#FF2C00",
                 ]
             elif n == 8:
                 # colorlist = ['#1f77b4','#ff7f0e','#367B7F','#51B34F','#d62728','#aa40fc','#e377c2','#17becf']
@@ -3199,9 +3200,12 @@ def plotxy(
     zorder = 0
     for k in kind_:
         # preprocess data
-        data=df_preprocessing_(data, kind=k) 
-        if 'variable' in data.columns and 'value' in data.columns:
-            x,y='variable','value' 
+        try:
+            data=df_preprocessing_(data, kind=k)
+            if 'variable' in data.columns and 'value' in data.columns:
+                x,y='variable','value' 
+        except Exception as e:
+            print(e)
         zorder += 1
         # indicate 'col' features
         col = kwargs.get("col", None)
@@ -4496,18 +4500,19 @@ def subplot(
 #! radar chart
 def radar(
     data: pd.DataFrame,
-    title="Radar Chart",
+    columns=None,
     ylim=(0, 100),
-    color=get_color(5),
+    facecolor=get_color(5),
+    edgecolor="none",
+    edge_linewidth=0.5,
     fontsize=10,
     fontcolor="k",
     size=6,
     linewidth=1,
     linestyle="-",
-    alpha=0.5,
+    alpha=0.3,
+    fmt=".1f",
     marker="o",
-    edgecolor="none",
-    edge_linewidth=0.5,
     bg_color="0.8",
     bg_alpha=None,
     grid_interval_ratio=0.2,
@@ -4527,19 +4532,34 @@ def radar(
     ax=None,
     sp=2,
     verbose=True,
+    axis=0,
     **kwargs,
 ):
     """
     Example DATA:
         df = pd.DataFrame(
-        data=[
-            [80, 80, 80, 80, 80, 80, 80],
-            [90, 20, 95, 95, 30, 30, 80],
-            [60, 90, 20, 20, 100, 90, 50],
-        ],
-        index=["Hero", "Warrior", "Wizard"],
-        columns=["HP", "MP", "ATK", "DEF", "SP.ATK", "SP.DEF", "SPD"])
-
+                data=[
+                    [80, 90, 60],
+                    [80, 20, 90],
+                    [80, 95, 20],
+                    [80, 95, 20],
+                    [80, 30, 100],
+                    [80, 30, 90],
+                    [80, 80, 50],
+                ],
+                index=["HP", "MP", "ATK", "DEF", "SP.ATK", "SP.DEF", "SPD"],
+                columns=["Hero", "Warrior", "Wizard"],
+            )
+        usage 1: 
+            radar(data=df)
+        usage 2: 
+            radar(data=df["Wizard"])
+        usage 3:
+            radar(data=df, columns="Wizard")
+        usage 4:
+            nexttile = subplot(1, 2)
+            radar(data=df, columns="Wizard", ax=nexttile(projection="polar"))
+            pie(data=df, columns="Wizard", ax=nexttile(), width=0.5, pctdistance=0.7)
     Parameters:
         - data (pd.DataFrame): The data to plot. Each column corresponds to a variable, and each row represents a data point.
         - ylim (tuple): The limits of the radial axis (y-axis). Default is (0, 100).
@@ -4556,7 +4576,6 @@ def radar(
         - edge_linewidth (int): Line width for the marker edges.
         - bg_color (str): Background color for the radar chart.
         - grid_interval_ratio (float): Determines the intervals for the grid lines as a fraction of the y-limit.
-        - title (str): The title of the radar chart.
         - cmap (str): The colormap to use if `color` is a list.
         - legend_loc (str): The location of the legend.
         - legend_fontsize (int): Font size for the legend.
@@ -4573,22 +4592,22 @@ def radar(
         - sp (int): Padding for the ticks from the plot area.
         - **kwargs: Additional arguments for customization.
     """
-    if run_once_within() and verbose:
+    if run_once_within(20,reverse=True) and verbose:
         usage_="""usage:
         radar(
             data: pd.DataFrame, #The data to plot. Each column corresponds to a variable, and each row represents a data point.
-            title="Radar Chart",
             ylim=(0, 100),# ylim (tuple): The limits of the radial axis (y-axis). Default is (0, 100).
-            color=get_color(5),#The color(s) for the plot. Can be a single color or a list of colors.
+            facecolor=get_color(5),#The color(s) for the plot. Can be a single color or a list of colors.
+            edgecolor="none",#for the marker edges.
+            edge_linewidth=0.5,#for the marker edges.
             fontsize=10,# Font size for the angular labels (x-axis).
             fontcolor="k",# Color for the angular labels.
             size=6,#The size of the markers for each data point.
             linewidth=1, 
             linestyle="-",
             alpha=0.5,#for the filled area.
+            fmt=".1f",
             marker="o",# for the data points.
-            edgecolor="none",#for the marker edges.
-            edge_linewidth=0.5,#for the marker edges.
             bg_color="0.8",
             bg_alpha=None,
             grid_interval_ratio=0.2,#Determines the intervals for the grid lines as a fraction of the y-limit.
@@ -4618,9 +4637,25 @@ def radar(
             kws_figsets = v_arg
             kwargs.pop(k_arg, None)
             break
-    categories = list(data.columns)
+    if axis==1:
+        data=data.T
+    if isinstance(data, dict):
+        data = pd.DataFrame(pd.Series(data))
+    if ~isinstance(data, pd.DataFrame):
+        data=pd.DataFrame(data)
+    if isinstance(data, pd.DataFrame):
+        data=data.select_dtypes(include=np.number)
+    if isinstance(columns,str):
+        columns=[columns]
+    if columns is None:
+        columns = list(data.columns)
+    data=data[columns]
+    categories = list(data.index) 
     num_vars = len(categories)
 
+    # Set y-axis limits and grid intervals
+    vmin, vmax = ylim
+
     # Set up angle for each category on radar chart
     angles = np.linspace(0, 2 * np.pi, num_vars, endpoint=False).tolist()
     angles += angles[:1]  # Complete the loop to ensure straight-line connections
@@ -4644,9 +4679,6 @@ def radar(
     # Draw one axis per variable and add labels
     ax.set_xticks(angles[:-1])
     ax.set_xticklabels(categories)
-
-    # Set y-axis limits and grid intervals
-    vmin, vmax = ylim
     if circular:
         # * cicular style
         ax.yaxis.set_ticks(np.arange(vmin, vmax + 1, vmax * grid_interval_ratio))
@@ -4669,7 +4701,7 @@ def radar(
     else:
         # * spider style: spider-style grid (straight lines, not circles)
         # Create the spider-style grid (straight lines, not circles)
-        for i in range(1, int(vmax * grid_interval_ratio) + 1):
+        for i in range(1, int((vmax-vmin)/ ((vmax-vmin)*grid_interval_ratio))):#int(vmax * grid_interval_ratio) + 1): 
             ax.plot(
                 angles + [angles[0]],  # Closing the loop
                 [i * vmax * grid_interval_ratio] * (num_vars + 1)
@@ -4680,7 +4712,7 @@ def radar(
                 linewidth=grid_linewidth,
             )
         # set bg_color
-        ax.fill(angles, [vmax] * (data.shape[1] + 1), color=bg_color, alpha=bg_alpha)
+        ax.fill(angles, [vmax] * (data.shape[0] + 1), color=bg_color, alpha=bg_alpha)
         ax.yaxis.grid(False)
     # Move radial labels away from plotted line
     if tick_loc is None:
@@ -4702,14 +4734,20 @@ def radar(
     ax.tick_params(axis="x", pad=sp)  # move spines outward
     ax.tick_params(axis="y", pad=sp)  # move spines outward
     # colors
-    colors = (
-        get_color(data.shape[0])
-        if cmap is None
-        else plt.get_cmap(cmap)(np.linspace(0, 1, data.shape[0]))
-    )
+    if facecolor is not None:
+        if not isinstance(facecolor,list):
+            facecolor=[facecolor]
+        colors = facecolor
+    else:
+        colors = (
+            get_color(data.shape[0])
+            if cmap is None
+            else plt.get_cmap(cmap)(np.linspace(0, 1, data.shape[0]))
+        )
+
     # Plot each row with straight lines
-    for i, (index, row) in enumerate(data.iterrows()):
-        values = row.tolist()
+    for i, (col, val) in enumerate(data.items()):
+        values = val.tolist()
         values += values[:1]  # Close the loop
         ax.plot(
             angles,
@@ -4717,7 +4755,7 @@ def radar(
             color=colors[i],
             linewidth=linewidth,
             linestyle=linestyle,
-            label=index,
+            label=col,
             clip_on=False,
         )
         ax.fill(angles, values, color=colors[i], alpha=alpha)
@@ -4748,7 +4786,7 @@ def radar(
                     ax.text(
                         angle, 
                         offset_radius,
-                        str(value), 
+                        f"{value:{fmt}}", 
                         ha="center", 
                         va="center", 
                         fontsize=fontsize, 
@@ -4759,10 +4797,10 @@ def radar(
 
     ax.set_ylim(ylim)
     # Add markers for each data point
-    for i, row in enumerate(data.values):
+    for i,  (col, val) in enumerate(data.items()):
         ax.plot(
             angles,
-            list(row) + [row[0]],  # Close the loop for markers
+            list(val) + [val[0]],  # Close the loop for markers
             color=colors[i],
             marker=marker,
             markersize=size,
@@ -4787,3 +4825,276 @@ def radar(
             **kws_figsets,
         )
     return ax
+
+
+def pie(
+    data:pd.Series,
+    columns:list = None,
+    facecolor=None,
+    explode=[0.1],
+    startangle=90,
+    shadow=True,
+    fontcolor="k",
+    fmt=".2f", 
+    width=None,# the center blank
+    pctdistance=0.85,
+    labeldistance=1.1,
+    kws_wedge={},
+    kws_text={}, 
+    center=(0, 0),
+    radius=1,
+    frame=False,
+    fontsize=10,
+    edgecolor="white",
+    edgewidth=1,
+    cmap=None,
+    show_value=False,
+    show_label=True,# False: only show the outer layer, if it is None, not show
+    show_legend=True,
+    legend_loc="upper right",
+    bbox_to_anchor=[1.4, 1.1],
+    legend_fontsize=10,
+    rotation_correction=0,
+    verbose=True,
+    ax=None,
+    **kwargs
+): 
+
+    if run_once_within(20,reverse=True) and verbose:
+        usage_="""usage:
+            pie(
+            data:pd.Series,
+            columns:list = None,
+            facecolor=None,
+            explode=[0.1],
+            startangle=90,
+            shadow=True,
+            fontcolor="k",
+            fmt=".2f", 
+            width=None,# the center blank
+            pctdistance=0.85,
+            labeldistance=1.1,
+            kws_wedge={},
+            kws_text={}, 
+            center=(0, 0),
+            radius=1,
+            frame=False,
+            fontsize=10,
+            edgecolor="white",
+            edgewidth=1,
+            cmap=None,
+            show_value=False,
+            show_label=True,# False: only show the outer layer, if it is None, not show
+            show_legend=True,
+            legend_loc="upper right",
+            bbox_to_anchor=[1.4, 1.1],
+            legend_fontsize=10,
+            rotation_correction=0,
+            verbose=True,
+            ax=None,
+            **kwargs
+        )
+        
+    usage 1: 
+    data = {"Segment A": 30, "Segment B": 50, "Segment C": 20}
+
+    ax = pie(
+        data=data,
+        # columns="Segment A",
+        explode=[0, 0.2, 0],
+        # width=0.4,
+        show_label=False,
+        fontsize=10,
+        # show_value=1,
+        fmt=".3f",
+    )
+
+    # prepare dataset
+    df = pd.DataFrame(
+        data=[
+                [80, 90, 60],
+                [80, 20, 90],
+                [80, 95, 20],
+                [80, 95, 20],
+                [80, 30, 100],
+                [80, 30, 90],
+                [80, 80, 50],
+            ],
+            index=["HP", "MP", "ATK", "DEF", "SP.ATK", "SP.DEF", "SPD"],
+            columns=["Hero", "Warrior", "Wizard"],
+        )
+    usage 1: only plot one column
+        pie(
+            df,
+            columns="Wizard",
+            width=0.6,
+            show_label=False,
+            fmt=".0f",
+        )
+    usage 2: 
+        pie(df,columns=["Hero", "Warrior"],show_label=False)
+    usage 3: set different width
+        pie(df,
+            columns=["Hero", "Warrior", "Wizard"],
+            width=[0.3, 0.2, 0.2],
+            show_label=False,
+            fmt=".0f",
+            )
+    usage 4: set width the same for all columns
+        pie(df,
+            columns=["Hero", "Warrior", "Wizard"],
+            width=0.2,
+            show_label=False,
+            fmt=".0f",
+            )
+    usage 5: adjust the labels' offset
+        pie(df, columns="Wizard", width=0.6, show_label=False, fmt=".6f", labeldistance=1.2)
+
+    usage 6: 
+        nexttile = subplot(1, 2)
+        radar(data=df, columns="Wizard", ax=nexttile(projection="polar"))
+        pie(data=df, columns="Wizard", ax=nexttile(), width=0.5, pctdistance=0.7)
+    """
+        print(usage_)
+    # Convert data to a Pandas Series if needed
+    if isinstance(data, dict):
+        data = pd.DataFrame(pd.Series(data))
+    if ~isinstance(data, pd.DataFrame):
+        data=pd.DataFrame(data)
+
+    if isinstance(data, pd.DataFrame):
+        data=data.select_dtypes(include=np.number)
+    if isinstance(columns,str):
+        columns=[columns]
+    if columns is None:
+        columns = list(data.columns)
+    # data=data[columns]
+    # columns = list(data.columns)
+    # print(columns)
+    # 选择部分数据
+    df=data[columns]
+
+    if width is None:
+        if df.shape[1]>1:
+            width=1/(df.shape[1]+2)
+        else:
+            width=1
+    if isinstance(width,(float,int)):
+        width=[width]
+    if len(width)<df.shape[1]:
+        width=width*df.shape[1]
+    if isinstance(radius,(float,int)):
+        radius=[radius]
+    radius_tile=[1]*df.shape[1]
+    radius=radius_tile.copy()
+    for i in range(1,df.shape[1]):
+        radius[i]=radius_tile[i]-np.sum(width[:i])
+
+    # colors
+    if facecolor is not None:
+        if not isinstance(facecolor,list):
+            facecolor=[facecolor]
+        colors = facecolor
+    else:
+        colors = (
+            get_color(data.shape[0])
+            if cmap is None
+            else plt.get_cmap(cmap)(np.linspace(0, 1, data.shape[0]))
+        )
+    # to check if facecolor is nested list or not
+    is_nested = True if any(isinstance(i, list) for i in colors) else False
+    inested = 0
+    for column_,width_,radius_ in zip(columns, width,radius):
+        if column_!=columns[0]:
+            labels = data.index if show_label else None
+        else:
+            labels = data.index if show_label is not None else None
+        data = df[column_]
+        labels_legend=data.index
+        sizes = data.values
+        
+        # Set wedge and text properties if none are provided
+        kws_wedge = kws_wedge or {"edgecolor": edgecolor, "linewidth": edgewidth}
+        kws_wedge.update({"width":width_})
+        fontcolor=kws_text.get("color",fontcolor)
+        fontsize=kws_text.get("fontsize",fontsize)
+        kws_text.update({"color": fontcolor, "fontsize": fontsize})
+
+        if ax is None: 
+            ax=plt.gca()
+        if explode is not None:
+            if len(explode)<len(labels_legend):
+                explode.extend([0]*(len(labels_legend)-len(explode)))
+
+        if fmt:
+            if not fmt.startswith("%"):
+                autopct =f"%{fmt}%%"
+        else:
+            autopct=None
+
+        if show_value is None:
+            result = ax.pie(
+                sizes,
+                labels=labels,
+                autopct= None,
+                startangle=startangle + rotation_correction,
+                explode=explode,
+                colors=colors[inested] if is_nested else colors,
+                shadow=shadow,
+                pctdistance=pctdistance,
+                labeldistance=labeldistance,
+                wedgeprops=kws_wedge,
+                textprops=kws_text,
+                center=center,
+                radius=radius_,
+                frame=frame,
+                **kwargs
+            )
+        else:
+            result = ax.pie(
+                sizes,
+                labels=labels,
+                autopct=autopct if autopct else None,
+                startangle=startangle + rotation_correction,
+                explode=explode,
+                colors=colors[inested] if is_nested else colors,
+                shadow=shadow,#shadow,
+                pctdistance=pctdistance,
+                labeldistance=labeldistance,
+                wedgeprops=kws_wedge,
+                textprops=kws_text,
+                center=center,
+                radius=radius_,
+                frame=frame,
+                **kwargs
+            )
+        if len(result) == 3:
+            wedges, texts, autotexts = result
+        elif len(result) == 2:
+            wedges, texts = result
+            autotexts = None 
+        
+        # Show exact values on wedges if show_value is True
+        if show_value:
+            for i, (wedge, txt) in enumerate(zip(wedges, texts)):
+                angle = (wedge.theta2 - wedge.theta1) / 2 + wedge.theta1
+                x = np.cos(np.radians(angle)) * (pctdistance ) * radius_
+                y = np.sin(np.radians(angle)) * (pctdistance ) * radius_
+                if not fmt.startswith("{"):
+                    value_text = f"{sizes[i]:{fmt}}"
+                else:
+                    value_text = fmt.format(sizes[i]) 
+                ax.text(x, y, value_text, ha="center", va="center", fontsize=fontsize,color=fontcolor)
+        inested+=1
+    # Customize the legend
+    if show_legend:
+        ax.legend(
+            wedges,
+            labels_legend,
+            loc=legend_loc,
+            bbox_to_anchor=bbox_to_anchor,
+            fontsize=legend_fontsize,
+            title_fontsize=legend_fontsize,
+        ) 
+    ax.set(aspect="equal")
+    return ax

{py2ls-0.2.4.24.dist-info → py2ls-0.2.4.25.dist-info}/METADATA

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

{py2ls-0.2.4.24.dist-info → py2ls-0.2.4.25.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=zDvS1tQzhj3jaxp_j5i1xY_uYbQasIycR-JjrgiP__E,4232
+py2ls/.git/index,sha256=W0gAn4tn97ChfLYb6Wsl7Pg4WPz0MrQl9TtSf6yagGw,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
@@ -233,22 +233,23 @@ py2ls/data/usages_pd.json,sha256=4DgbPahF4G5Hd6G0TQurb6dBRVey67lpKdgK6A01Tww,266
 py2ls/data/usages_sns.json,sha256=rZ2uxBFhQr0UzvuPZMIF3ngQRFRZDAjgmI-0TNRFcdU,9620
 py2ls/db2ls.py,sha256=MMfFX47aIPIyu7fU9aPvX9lbPRPYOpJ_VXwlnWk-8qo,13615
 py2ls/doc.py,sha256=xN3g1OWfoaGUhikbJ0NqbN5eKy1VZVvWwRlhHMgyVEc,4243
+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=0YCt9QxaJbY1-qKRVtTJq9SRu3rrW99wHT2yuhHNGsw,300180
-py2ls/ml2ls copy.py,sha256=iZJrFLIrdfTieAY2BDsxQFTm29smwnJh0aC4hRB9VGM,113314
-py2ls/ml2ls.py,sha256=at-lzYJV4TPowOiQ2fzK5LLEZNP1DwIgpKhDQFIoFVw,178091
+py2ls/ips.py,sha256=6DgsZw6Z6u3_Y8FtMyO6NpddWiz90juy_ZSoY5rjtjI,303872
+py2ls/ml2ls.py,sha256=fp7zIZX-SMLYIBF5q8pqM9ekJh1R8jCfyGgA8YUMJlw,184553
 py2ls/mol.py,sha256=AZnHzarIk_MjueKdChqn1V6e4tUle3X1NnHSFA6n3Nw,10645
 py2ls/netfinder.py,sha256=R70NkrnO8LlXjT1y7bf2TN-yE4yOeAYhb0jDBiNp8XA,57536
+py2ls/nl2ls.py,sha256=UEIdok-OamFZFIvvz_PdZenu085zteMdaJd9mLu3F-s,11485
 py2ls/ocr.py,sha256=5lhUbJufIKRSOL6wAWVLEo8TqMYSjoI_Q-IO-_4u3DE,31419
-py2ls/plot.py,sha256=jFBglmV-czTxGlmhZ4VhGzN5shnYw3hFV2JoosoSW9U,190457
+py2ls/plot.py,sha256=NpQDc31GyWygkDEkBMl7q6D8VSfHtXeUwDUTOUAe6Vc,200060
 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/translator.py,sha256=77Tp_GjmiiwFbEIJD_q3VYpQ43XL9ZeJo6Mhl44mvh8,34284
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.2.4.24.dist-info/METADATA,sha256=fGGBQNu3mDAbHQ4-rsFLvGIwXv04UWouA4NcoZa9xtA,20078
-py2ls-0.2.4.24.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-py2ls-0.2.4.24.dist-info/RECORD,,
+py2ls-0.2.4.25.dist-info/METADATA,sha256=R29MJjrb1zGlKMcACwV_XEOGL0EBYjVADtlYo5kG0Kw,20078
+py2ls-0.2.4.25.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+py2ls-0.2.4.25.dist-info/RECORD,,