AutoStatLib 0.2.5__tar.gz → 0.2.6__tar.gz

{autostatlib-0.2.5/src/AutoStatLib.egg-info → autostatlib-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoStatLib
-Version: 0.2.5
+Version: 0.2.6
 Summary: AutoStatLib - a simple statistical analysis tool
 Author: Stemonitis, SciWare LLC
 Author-email: konung-yaropolk <yaropolk1995@gmail.com>
@@ -509,15 +509,16 @@ License:                   GNU LESSER GENERAL PUBLIC LICENSE
         
         That's all there is to it!
         
-Project-URL: Homepage, https://github.com/konung-yaropolk/NPL
-Project-URL: Issues, https://github.com/konung-yaropolk/NPL/issues
+Project-URL: Homepage, https://github.com/konung-yaropolk/AutoStatLib
+Project-URL: Repository, https://github.com/konung-yaropolk/AutoStatLib.git
+Project-URL: Issues, https://github.com/konung-yaropolk/AutoStatLib/issues
 Keywords: Science,Statistics
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)
 Classifier: Operating System :: OS Independent
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
@@ -620,26 +621,30 @@ results = analysis.GetResult()
 The results dictionary keys with representing value types:
 ```
 {
-    'p-value':                     String
-    'Significance(p<0.05)':        Boolean
-    'Stars_Printed':               String
-    'Test_Name':                   String
-    'Groups_Compared':             Integer
-    'Population_Mean':             Float   (taken from the input)
-    'Data_Normaly_Distributed':    Boolean
-    'Parametric_Test_Applied':     Boolean
-    'Paired_Test_Applied':         Boolean
-    'Tails':                       Integer (taken from the input)
-    'p-value_exact':               Float
-    'Stars':                       Integer
-    'Warnings':                    String
-    'Groups_N':                    List of integers
-    'Groups_Median':               List of floats
-    'Groups_Mean':                 List of floats
-    'Groups_SD':                   List of floats
-    'Groups_SE':                   List of floats
-    'Samples':                     List of input values by groups
+    'p-value' :                    String
+    'Significance(p<0.05)' :       Boolean
+    'Stars_Printed' :              String
+    'Test_Name' :                  String
+    'Groups_Compared' :            Integer
+    'Population_Mean' :            Float   (taken from the input)
+    'Data_Normaly_Distributed' :   Boolean
+    'Parametric_Test_Applied' :    Boolean
+    'Paired_Test_Applied' :        Boolean
+    'Tails' :                      Integer (taken from the input)
+    'p-value_exact' :              Float
+    'Stars' :                      Integer
+    'Warnings' :                   String
+    'Groups_N' :                   List of integers
+    'Groups_Median' :              List of floats
+    'Groups_Mean' :                List of floats
+    'Groups_SD' :                  List of floats
+    'Groups_SE' :                  List of floats
+    'Samples' :                    List of input values by groups
                                            (taken from the input)
+    'Posthoc_Matrix' :             2D List of floats
+    'Posthoc_Matrix_bool' :        2D List of Boolean
+    'Posthoc_Matrix_printed':      2D List of String
+    'Posthoc_Matrix_stars':        2D List of String
 }
 ```
 If errors occured, *GetResult()* returns an empty dictionary

{autostatlib-0.2.5 → autostatlib-0.2.6}/README.md

@@ -84,26 +84,30 @@ results = analysis.GetResult()
 The results dictionary keys with representing value types:
 ```
 {
-    'p-value':                     String
-    'Significance(p<0.05)':        Boolean
-    'Stars_Printed':               String
-    'Test_Name':                   String
-    'Groups_Compared':             Integer
-    'Population_Mean':             Float   (taken from the input)
-    'Data_Normaly_Distributed':    Boolean
-    'Parametric_Test_Applied':     Boolean
-    'Paired_Test_Applied':         Boolean
-    'Tails':                       Integer (taken from the input)
-    'p-value_exact':               Float
-    'Stars':                       Integer
-    'Warnings':                    String
-    'Groups_N':                    List of integers
-    'Groups_Median':               List of floats
-    'Groups_Mean':                 List of floats
-    'Groups_SD':                   List of floats
-    'Groups_SE':                   List of floats
-    'Samples':                     List of input values by groups
+    'p-value' :                    String
+    'Significance(p<0.05)' :       Boolean
+    'Stars_Printed' :              String
+    'Test_Name' :                  String
+    'Groups_Compared' :            Integer
+    'Population_Mean' :            Float   (taken from the input)
+    'Data_Normaly_Distributed' :   Boolean
+    'Parametric_Test_Applied' :    Boolean
+    'Paired_Test_Applied' :        Boolean
+    'Tails' :                      Integer (taken from the input)
+    'p-value_exact' :              Float
+    'Stars' :                      Integer
+    'Warnings' :                   String
+    'Groups_N' :                   List of integers
+    'Groups_Median' :              List of floats
+    'Groups_Mean' :                List of floats
+    'Groups_SD' :                  List of floats
+    'Groups_SE' :                  List of floats
+    'Samples' :                    List of input values by groups
                                            (taken from the input)
+    'Posthoc_Matrix' :             2D List of floats
+    'Posthoc_Matrix_bool' :        2D List of Boolean
+    'Posthoc_Matrix_printed':      2D List of String
+    'Posthoc_Matrix_stars':        2D List of String
 }
 ```
 If errors occured, *GetResult()* returns an empty dictionary

{autostatlib-0.2.5 → autostatlib-0.2.6}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)",
     "Operating System :: OS Independent",
-    "Development Status :: 2 - Pre-Alpha",
+    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
     "Natural Language :: English",
@@ -32,8 +32,9 @@ classifiers = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/konung-yaropolk/NPL"
-Issues = "https://github.com/konung-yaropolk/NPL/issues"
+Homepage = "https://github.com/konung-yaropolk/AutoStatLib"
+Repository = "https://github.com/konung-yaropolk/AutoStatLib.git"
+Issues = "https://github.com/konung-yaropolk/AutoStatLib/issues"
 
 [tool.setuptools.dynamic]
 version = {attr = "AutoStatLib.__version__"}

{autostatlib-0.2.5 → autostatlib-0.2.6}/src/AutoStatLib/AutoStatLib.py

@@ -16,7 +16,7 @@ class StatisticalAnalysis(StatisticalTests, NormalityTests, TextFormatting, Help
                  paired=False,
                  tails=2,
                  popmean=None,
-                 posthoc=False,
+                 posthoc=True,
                  verbose=True):
         self.results = None
         self.error = False
@@ -92,6 +92,7 @@ class StatisticalAnalysis(StatisticalTests, NormalityTests, TextFormatting, Help
         self.p_value = None
         self.posthoc_matrix_df = None
         self.posthoc_matrix = []
+        self.posthoc_name = None
 
         self.log('\n' + '-'*67)
         self.log('Statistical analysis __init__iated for data in {} groups\n'.format(
@@ -174,7 +175,6 @@ class StatisticalAnalysis(StatisticalTests, NormalityTests, TextFormatting, Help
         else:
             self.run_test_auto()
 
-
         # print the results
         self.results = self.create_results_dict()
         self.print_results()
@@ -186,9 +186,8 @@ class StatisticalAnalysis(StatisticalTests, NormalityTests, TextFormatting, Help
         if self.verbose == True:
             print(self.summary)
 
-
-
     # public methods:
+
     def RunAuto(self):
         self.run_test(test='auto')
 

{autostatlib-0.2.5 → autostatlib-0.2.6}/src/AutoStatLib/_version.py

@@ -1,2 +1,2 @@
 # AutoStatLib package version:
-__version__ = "0.2.5"
+__version__ = "0.2.6"

{autostatlib-0.2.5 → autostatlib-0.2.6}/src/AutoStatLib/helpers.py

@@ -1,6 +1,7 @@
 import numpy as np
 import pandas as pd
 
+
 class Helpers():
 
     def matrix_to_dataframe(self, matrix):
@@ -61,9 +62,11 @@ class Helpers():
             'Groups_SE': [np.std(self.data[i]).item() / np.sqrt(len(self.data)).item() for i in range(len(self.data))],
             # actually returns list of lists of numpy dtypes of float64, next make it return regular floats:
             'Samples': self.data,
-            'Posthoc_Matrix': self.posthoc_matrix if self.posthoc_matrix else 'N/A',
-            'Posthoc_Matrix_printed': [[self.make_p_value_printed(element) for element in row] for row in self.posthoc_matrix] if self.posthoc_matrix else 'N/A',
-            'Posthoc_Matrix_stars': [[self.make_stars_printed(self.make_stars(element)) for element in row] for row in self.posthoc_matrix] if self.posthoc_matrix else 'N/A',
+            'Posthoc_Tests_Name': self.posthoc_name if self.posthoc_name is not None else '',
+            'Posthoc_Matrix': self.posthoc_matrix if self.posthoc_matrix else [],
+            'Posthoc_Matrix_bool': [[bool(element) for element in row] for row in self.posthoc_matrix] if self.posthoc_matrix else [],
+            'Posthoc_Matrix_printed': [[self.make_p_value_printed(element) for element in row] for row in self.posthoc_matrix] if self.posthoc_matrix else [],
+            'Posthoc_Matrix_stars': [[self.make_stars_printed(self.make_stars(element)) for element in row] for row in self.posthoc_matrix] if self.posthoc_matrix else [],
         }
 
     def log(self, *args, **kwargs):
@@ -74,4 +77,4 @@ class Helpers():
     def AddWarning(self, warning_id):
         message = self.warning_ids_all[warning_id]
         self.log(message)
-        self.warnings.append(message)
+        self.warnings.append(message)

{autostatlib-0.2.5 → autostatlib-0.2.6}/src/AutoStatLib/normality_tests.py

@@ -20,7 +20,7 @@ class NormalityTests():
 
         # Shapiro-Wilk test
         sw_stat, sw_p_value = shapiro(data)
-        if sw_p_value > 0.05:
+        if sw_p_value and sw_p_value > 0.05:
             sw = True
         else:
             sw = False
@@ -28,7 +28,7 @@ class NormalityTests():
         # Lilliefors test
         lf_stat, lf_p_value = lilliefors(
             data, dist='norm')
-        if lf_p_value > 0.05:
+        if lf_p_value and lf_p_value > 0.05:
             lf = True
         else:
             lf = False
@@ -37,7 +37,7 @@ class NormalityTests():
         if n >= 20:
             ad_stat, ad_p_value = self.anderson_get_p(
                 data, dist='norm')
-            if ad_p_value > 0.05:
+            if ad_p_value and ad_p_value > 0.05:
                 ad = True
             else:
                 ad = False
@@ -46,13 +46,11 @@ class NormalityTests():
         # test result is skewed if n<20
         if n >= 20:
             ap_stat, ap_p_value = normaltest(data)
-            if ap_p_value > 0.05:
+            if ap_p_value and ap_p_value > 0.05:
                 ap = True
             else:
                 ap = False
 
-        # print(ap_p_value, ad_p_value, sw_p_value, lf_p_value)
-
         return (sw, lf, ad, ap)
 
     def anderson_get_p(self, data, dist='norm'):
@@ -82,4 +80,4 @@ class NormalityTests():
         else:
             p = None
 
-        return ad, p
+        return ad, p

{autostatlib-0.2.5 → autostatlib-0.2.6}/src/AutoStatLib/statistical_tests.py

@@ -1,10 +1,10 @@
 import numpy as np
 import scikit_posthocs as sp
 from statsmodels.stats.anova import AnovaRM
+from statsmodels.stats.multicomp import pairwise_tukeyhsd
 from scipy.stats import ttest_rel, ttest_ind, ttest_1samp, wilcoxon, mannwhitneyu, f_oneway, kruskal, friedmanchisquare
 
 
-
 class StatisticalTests():
     '''
         Statistical tests mixin
@@ -50,7 +50,7 @@ class StatisticalTests():
         test_names_dict = {
             'anova_1w_ordinary': 'Ordinary One-Way ANOVA',
             'anova_1w_rm': 'Repeated Measures One-Way ANOVA',
-            'friedman': 'Friedman test', 
+            'friedman': 'Friedman test',
             'kruskal_wallis': 'Kruskal-Wallis test',
             'mann_whitney': 'Mann-Whitney U test',
             't_test_independent': 't-test for independent samples',
@@ -89,6 +89,15 @@ class StatisticalTests():
         #     p_value /= 2
         # if self.tails == 1:
         #     p_value /= 2
+
+        # if p_value < 0.05 and self.posthoc:
+        #     data_flat = np.concatenate(self.data)
+        #     self.posthoc_name = 'Tukey`s multiple comparisons'
+        #     group_labels = np.concatenate(
+        #         [[f"Group_{i+1}"] * len(group) for i, group in enumerate(self.data)])
+        #     # Tukey's multiple comparisons
+        #     tukey_result = pairwise_tukeyhsd(data_flat, group_labels)
+        #     print(tukey_result)
         return stat, p_value
 
     def anova_1w_rm(self):
@@ -117,7 +126,9 @@ class StatisticalTests():
 
         # Perform Dunn's multiple comparisons if Kruskal-Wallis is significant
         if p_value < 0.05 and self.posthoc:
-            self.posthoc_matrix = sp.posthoc_dunn(self.data, p_adjust='bonferroni').values.tolist()
+            self.posthoc_matrix = sp.posthoc_dunn(
+                self.data, p_adjust='bonferroni').values.tolist()
+            self.posthoc_name = 'Dunn`s multiple comparisons'
         return stat, p_value
 
     def mann_whitney(self):
@@ -161,7 +172,7 @@ class StatisticalTests():
         if self.tails == 1:
             p_value /= 2
         return stat, p_value
-        
+
     def wilcoxon_single_sample(self):
         if self.popmean == None:
             self.popmean = 0
@@ -170,4 +181,4 @@ class StatisticalTests():
         stat, p_value = wilcoxon(data)
         if self.tails == 1:
             p_value /= 2
-        return stat, p_value
+        return stat, p_value

{autostatlib-0.2.5 → autostatlib-0.2.6}/src/AutoStatLib/text_formatting.py

@@ -51,22 +51,26 @@ class TextFormatting():
                 break
             self.log(self.autospace(row_values, space))
 
-    def make_stars(self, p) -> int:
-        if p is not None:
-            if p < 0.0001:
-                return 4
-            if p < 0.001:
-                return 3
-            elif p < 0.01:
-                return 2
-            elif p < 0.05:
-                return 1
+    def print_results(self):
+        self.log('\n\nResults: \n')
+        for i in self.results:
+            shift = 27 - len(i)
+            if i == 'Warnings':
+                self.log(i, ':', ' ' * shift, len(self.results[i]))
+            elif i == 'Posthoc_Tests_Name':
+                self.log(i, ':', ' ' * shift,
+                         self.results[i]) if self.results[i] != '' else 'N/A'
+            elif i == 'Posthoc_Matrix':
+                self.log(i, ':', ' ' * shift, '{0}x{0} matrix'.format(
+                    len(self.results[i])) if self.results[i] else 'N/A')
+            elif (i == 'Samples'
+                  or i == 'Posthoc_Matrix_bool'
+                  or i == 'Posthoc_Matrix_printed'
+                  or i == 'Posthoc_Matrix_stars'
+                  ):
+                pass
             else:
-                return 0
-        return 0
-
-    def make_stars_printed(self, n) -> str:
-        return '*' * n if n else 'ns'
+                self.log(i, ':', ' ' * shift, self.results[i])
 
     def make_p_value_printed(self, p) -> str:
         if p is not None:
@@ -84,15 +88,19 @@ class TextFormatting():
                 return 'N/A'
         return 'N/A'
 
-    def print_results(self):
-        self.log('\n\nResults: \n')
-        for i in self.results:
-            shift = 27 - len(i)
-            if i == 'Warnings':
-                self.log(i, ':', ' ' * shift, len(self.results[i]))
-            if i == 'Posthoc_Matrix':
-                self.log(i, ':', ' ' * shift, '{0}x{0} matrix'.format(len(self.results[i])))
-            elif i == 'Samples' or i == 'Posthoc_Matrix_printed' or i == 'Posthoc_Matrix_stars':
-                pass
+    def make_stars(self, p) -> int:
+        if p is not None:
+            if p < 0.0001:
+                return 4
+            if p < 0.001:
+                return 3
+            elif p < 0.01:
+                return 2
+            elif p < 0.05:
+                return 1
             else:
-                self.log(i, ':', ' ' * shift, self.results[i])
+                return 0
+        return 0
+
+    def make_stars_printed(self, n) -> str:
+        return '*' * n if n else 'ns'

{autostatlib-0.2.5 → autostatlib-0.2.6/src/AutoStatLib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: AutoStatLib
-Version: 0.2.5
+Version: 0.2.6
 Summary: AutoStatLib - a simple statistical analysis tool
 Author: Stemonitis, SciWare LLC
 Author-email: konung-yaropolk <yaropolk1995@gmail.com>
@@ -509,15 +509,16 @@ License:                   GNU LESSER GENERAL PUBLIC LICENSE
         
         That's all there is to it!
         
-Project-URL: Homepage, https://github.com/konung-yaropolk/NPL
-Project-URL: Issues, https://github.com/konung-yaropolk/NPL/issues
+Project-URL: Homepage, https://github.com/konung-yaropolk/AutoStatLib
+Project-URL: Repository, https://github.com/konung-yaropolk/AutoStatLib.git
+Project-URL: Issues, https://github.com/konung-yaropolk/AutoStatLib/issues
 Keywords: Science,Statistics
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)
 Classifier: Operating System :: OS Independent
-Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
@@ -620,26 +621,30 @@ results = analysis.GetResult()
 The results dictionary keys with representing value types:
 ```
 {
-    'p-value':                     String
-    'Significance(p<0.05)':        Boolean
-    'Stars_Printed':               String
-    'Test_Name':                   String
-    'Groups_Compared':             Integer
-    'Population_Mean':             Float   (taken from the input)
-    'Data_Normaly_Distributed':    Boolean
-    'Parametric_Test_Applied':     Boolean
-    'Paired_Test_Applied':         Boolean
-    'Tails':                       Integer (taken from the input)
-    'p-value_exact':               Float
-    'Stars':                       Integer
-    'Warnings':                    String
-    'Groups_N':                    List of integers
-    'Groups_Median':               List of floats
-    'Groups_Mean':                 List of floats
-    'Groups_SD':                   List of floats
-    'Groups_SE':                   List of floats
-    'Samples':                     List of input values by groups
+    'p-value' :                    String
+    'Significance(p<0.05)' :       Boolean
+    'Stars_Printed' :              String
+    'Test_Name' :                  String
+    'Groups_Compared' :            Integer
+    'Population_Mean' :            Float   (taken from the input)
+    'Data_Normaly_Distributed' :   Boolean
+    'Parametric_Test_Applied' :    Boolean
+    'Paired_Test_Applied' :        Boolean
+    'Tails' :                      Integer (taken from the input)
+    'p-value_exact' :              Float
+    'Stars' :                      Integer
+    'Warnings' :                   String
+    'Groups_N' :                   List of integers
+    'Groups_Median' :              List of floats
+    'Groups_Mean' :                List of floats
+    'Groups_SD' :                  List of floats
+    'Groups_SE' :                  List of floats
+    'Samples' :                    List of input values by groups
                                            (taken from the input)
+    'Posthoc_Matrix' :             2D List of floats
+    'Posthoc_Matrix_bool' :        2D List of Boolean
+    'Posthoc_Matrix_printed':      2D List of String
+    'Posthoc_Matrix_stars':        2D List of String
 }
 ```
 If errors occured, *GetResult()* returns an empty dictionary