py2ls 0.1.9.2__py3-none-any.whl → 0.1.9.3__py3-none-any.whl

py2ls/plot.py

@@ -467,6 +467,9 @@ def catplot(data, *args, **kwargs):
         # custom_order = ['s', 'bx', 'e']
         # full_order = sort_catplot_layers(custom_order)
 
+    ax = kwargs.get("ax", None)
+    if "ax" not in locals() or ax is None:
+        ax = plt.gca()
     col = kwargs.get("col", None)
     if not col:
         # figsets
@@ -496,8 +499,9 @@ def catplot(data, *args, **kwargs):
                 # ! stats info
                 stats_param = kwargs.get("stats", False)
                 res = pd.DataFrame()  # Initialize an empty DataFrame to store results
+                ihue = 1
                 for i in df[x].unique().tolist():
-                    print(i)
+                    print(i)  # to indicate which 'x'
                     if hue and stats_param:
                         if isinstance(stats_param, dict):
                             if "factor" in stats_param.keys():
@@ -511,11 +515,18 @@ def catplot(data, *args, **kwargs):
                         else:
                             res_tmp = "did not work properly"
                         display_output(res_tmp)
-                        res_tmp = [{"x": i, **res_tmp}]
+                        xloc_curr = hue_len * (ihue - 1)
+                        # add_asterisks(ax,res_tmp,xticks[xloc_curr:xloc_curr+hue_len],legend_hue)
+                        # res_tmp = [{"x": i, **res_tmp}]
+                        # print("here")
+                        # df_=pd.DataFrame([res_tmp])
+                        # display(df_['pval'][0].tolist()[0])
                         res = pd.concat(
                             [res, pd.DataFrame([res_tmp])], ignore_index=True
                         )
+                    ihue += 1
                 display_output(res)
+
             else:
                 # ! stats info
                 stats_param = kwargs.get("stats", False)
@@ -580,9 +591,7 @@ def catplot(data, *args, **kwargs):
                 opt.update(style_load)
             except:
                 print(f"cannot find the style'{style_name}'")
-        ax = kwargs.get("ax", None)
-        if "ax" not in locals() or ax is None:
-            ax = plt.gca()
+
         opt.setdefault("c", default_colors)
         # if len(opt["c"]) < data.shape[1]:
         #     additional_colors = plt.cm.winter(
@@ -771,6 +780,34 @@ def catplot(data, *args, **kwargs):
         if show_legend:
             ax.legend()
 
+        # ! add asterisks in the plot
+        if stats_param:
+            if hue is None:
+                display(res)
+                add_asterisks(ax, res, xticks_x_loc, xticklabels)
+            else:  # hue is not None
+                ihue = 1
+                for i in df[x].unique().tolist():
+                    if hue and stats_param:
+                        if isinstance(stats_param, dict):
+                            if "factor" in stats_param.keys():
+                                res_tmp = FuncMultiCmpt(data=df, dv=y, **stats_param)
+                            else:
+                                res_tmp = FuncMultiCmpt(
+                                    data=df[df[x] == i], dv=y, factor=hue, **stats_param
+                                )
+                        elif bool(stats_param):
+                            res_tmp = FuncMultiCmpt(data=df, dv=y, factor=hue)
+                        else:
+                            res_tmp = "did not work properly"
+                        xloc_curr = hue_len * (ihue - 1)
+                        add_asterisks(
+                            ax,
+                            res_tmp,
+                            xticks[xloc_curr : xloc_curr + hue_len],
+                            legend_hue,
+                        )
+                    ihue += 1
         style_export = kwargs.get("style_export", None)
         if style_export and (style_export != style_use):
             dir_curr_script = os.path.dirname(os.path.abspath(__file__))
@@ -1620,3 +1657,33 @@ def remove_colors_in_dict(
     if "loc" in data:
         del data["loc"]
     return data
+
+
+def add_asterisks(ax, res, xticks_x_loc, xticklabels, **kwargs_funcstars):
+    pval_groups = res["res_tab"]["PR(>F)"].tolist()[0]
+    # print(f"p=:{pval_groups}")
+    # print(f"xticks:{xticks}")
+    # print(f"xticks_x_loc:{xticks_x_loc}")
+    if pval_groups <= 0.05:
+        A_list = res["res_posthoc"]["A"].tolist()
+        B_list = res["res_posthoc"]["B"].tolist()
+        xticklabels_array = np.array(xticklabels)
+        yscal_ = 0.99
+        for A, B, P in zip(
+            res["res_posthoc"]["A"].tolist(),
+            res["res_posthoc"]["B"].tolist(),
+            res["res_posthoc"]["p-unc"].tolist(),
+        ):
+            index_A = np.where(xticklabels_array == A)[0][0]
+            index_B = np.where(xticklabels_array == B)[0][0]
+            print(index_A, A, index_B, B, P)
+            FuncStars(
+                ax=ax,
+                x1=xticks_x_loc[index_A],
+                x2=xticks_x_loc[index_B],
+                pval=P,
+                yscale=yscal_,
+                **kwargs_funcstars,
+            )
+            if P <= 0.05:
+                yscal_ -= 0.1

py2ls/stats.py

@@ -18,6 +18,7 @@ def FuncStars(
     xlim=None,
     symbol="*",
     yscale=0.95,
+    y_loc=None,
     x1=0,
     x2=1,
     alpha=0.05,
@@ -48,7 +49,8 @@ def FuncStars(
     if report_scale > 0:
         report_scale = -np.abs(report_scale)
     yscale = np.float64(yscale)
-    y_loc = np.min(ylim) + yscale * (np.max(ylim) - np.min(ylim))
+    if y_loc is None:
+        y_loc = np.min(ylim) + yscale * (np.max(ylim) - np.min(ylim))
     xcenter = np.mean([x1, x2])
     # ns / *
     if alpha < pval:
@@ -101,11 +103,9 @@ def FuncStars(
             color=symbolcolor,
         )
     # lines indicators
-    if linego:  # and 0 < pval <= 0.05:
-        print(pval)
-        print(linego)
+    if linego and 0 < pval <= 0.05:
         # horizontal line
-        if yscale < 0.99:
+        if yscale <= 0.99:
             plt.plot(
                 [x1 + np.abs(np.diff(xlim)) * 0.01, x2 - np.abs(np.diff(xlim)) * 0.01],
                 [
@@ -211,45 +211,45 @@ def FuncCmpt(x1, x2, pmc="auto", pair="unpaired", verbose=True):
 
     # pmc correction: 'parametric'/'non-parametric'/'auto'
     # meawhile get the opposite setting (to compare the results)
-    def corr_pmc(pmc):
-        cfg_pmc = None
-        if pmc.lower() in {"pmc", "parametric"} and pmc.lower() not in {
-            "npmc",
-            "nonparametric",
-            "non-parametric",
-        }:
-            cfg_pmc = "parametric"
-        elif pmc.lower() in {
-            "npmc",
-            "nonparametric",
-            "non-parametric",
-        } and pmc.lower() not in {"pmc", "parametric"}:
-            cfg_pmc = "non-parametric"
-        else:
-            cfg_pmc = "auto"
-        return cfg_pmc
-
-    def corr_pair(pair):
-        cfg_pair = None
-        if "pa" in pair.lower() and "np" not in pair.lower():
-            cfg_pair = "paired"
-        elif "np" in pair.lower():
-            cfg_pair = "unpaired"
-        return cfg_pair
-
-    def check_normality(data, verbose=True):
-        stat_shapiro, pval_shapiro = stats.shapiro(data)
-        if pval_shapiro > 0.05:
-            Normality = True
-        else:
-            Normality = False
-        if verbose:
-            (
-                print(f"\n normally distributed\n")
-                if Normality
-                else print(f"\n NOT normally distributed\n")
-            )
-        return Normality
+    # def corr_pmc(pmc):
+    #     cfg_pmc = None
+    #     if pmc.lower() in {"pmc", "parametric"} and pmc.lower() not in {
+    #         "npmc",
+    #         "nonparametric",
+    #         "non-parametric",
+    #     }:
+    #         cfg_pmc = "parametric"
+    #     elif pmc.lower() in {
+    #         "npmc",
+    #         "nonparametric",
+    #         "non-parametric",
+    #     } and pmc.lower() not in {"pmc", "parametric"}:
+    #         cfg_pmc = "non-parametric"
+    #     else:
+    #         cfg_pmc = "auto"
+    #     return cfg_pmc
+
+    # def corr_pair(pair):
+    #     cfg_pair = None
+    #     if "pa" in pair.lower() and "np" not in pair.lower():
+    #         cfg_pair = "paired"
+    #     elif "np" in pair.lower():
+    #         cfg_pair = "unpaired"
+    #     return cfg_pair
+
+    # def check_normality(data, verbose=True):
+    #     stat_shapiro, pval_shapiro = stats.shapiro(data)
+    #     if pval_shapiro > 0.05:
+    #         Normality = True
+    #     else:
+    #         Normality = False
+    #     if verbose:
+    #         (
+    #             print(f"\n normally distributed\n")
+    #             if Normality
+    #             else print(f"\n NOT normally distributed\n")
+    #         )
+    #     return Normality
 
     def sub_cmpt_2group(x1, x2, cfg_pmc="pmc", pair="unpaired", verbose=True):
         output = {}
@@ -261,7 +261,7 @@ def FuncCmpt(x1, x2, pmc="auto", pair="unpaired", verbose=True):
                 x1, x2, center="median", proportiontocut=0.05
             )
             VarType = True if pval_lev > 0.05 and nX1 == nX2 else False
-
+            print(pair)
             if "np" in pair:  # 'unpaired'
                 if VarType and Normality:
                     # The independent t-test requires that the dependent variable is approximately normally
@@ -647,17 +647,18 @@ def corr_pair(pair):
     return cfg_pair
 
 
-def check_normality(data):
+def check_normality(data, verbose=True):
     stat_shapiro, pval_shapiro = stats.shapiro(data)
     if pval_shapiro > 0.05:
         Normality = True
     else:
         Normality = False
-    (
-        print(f"\n normally distributed\n")
-        if Normality
-        else print(f"\n NOT normally distributed\n")
-    )
+    if verbose:
+        (
+            print(f"\n normally distributed\n")
+            if Normality
+            else print(f"\n NOT normally distributed\n")
+        )
     return Normality
 
 

{py2ls-0.1.9.2.dist-info → py2ls-0.1.9.3.dist-info}/METADATA

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

{py2ls-0.1.9.2.dist-info → py2ls-0.1.9.3.dist-info}/RECORD

@@ -142,12 +142,12 @@ py2ls/export_requirements.py,sha256=x2WgUF0jYKz9GfA1MVKN-MdsM-oQ8yUeC6Ua8oCymio,
 py2ls/freqanalysis.py,sha256=F4218VSPbgL5tnngh6xNCYuNnfR-F_QjECUUxrPYZss,32594
 py2ls/ips.py,sha256=N7MdOCgJXDQu73YkJQTtDN3RSntzXX7V0MOJ1NYBLEk,100572
 py2ls/netfinder.py,sha256=OMStrwMAASf1ajlyEfseoaEygo7G5WKBAFRE0LY15Lw,49477
-py2ls/plot.py,sha256=4vB2uT7RCZZejS4e3_fuR7qd7CWGwzkMatJWWVRbEzo,63454
+py2ls/plot.py,sha256=Z8Sd9sjOJrdYW84CLmVDactHSQY_9qJ0Dje3hKMybC4,66229
 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=_d_Uee-6DQQavxAjieKnFEJuKu5CNvFPjEPygd-DeYM,47222
+py2ls/stats.py,sha256=sR0exykzzT_NXkQr7YIazKhJg6AKmLS0N6jtzy07Lm0,47366
 py2ls/translator.py,sha256=bc5FB-wqC4TtQz9gyCP1mE38HqNRJ_pmuRIgKnAlMzM,30581
 py2ls/wb_detector.py,sha256=7y6TmBUj9exCZeIgBAJ_9hwuhkDh1x_-yg4dvNY1_GQ,6284
-py2ls-0.1.9.2.dist-info/METADATA,sha256=Z45KdY73Mk_IfBDplBdsKk2udIvRFjVh_HRbzMH31B4,20017
-py2ls-0.1.9.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-py2ls-0.1.9.2.dist-info/RECORD,,
+py2ls-0.1.9.3.dist-info/METADATA,sha256=YkiP0cRJZqlWq9frWtnKdXQTePQy98rr7tqy3Gd706Y,20017
+py2ls-0.1.9.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+py2ls-0.1.9.3.dist-info/RECORD,,