metacountregressor 0.1.149__tar.gz → 0.1.153__tar.gz

{metacountregressor-0.1.149 → metacountregressor-0.1.153}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.149
+Version: 0.1.153
 Summary: Extensions for a Python package for estimation of count models.
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern

{metacountregressor-0.1.149 → metacountregressor-0.1.153}/metacountregressor/helperprocess.py

@@ -212,7 +212,7 @@ def set_up_analyst_constraints(data_characteristic, model_terms,  variable_decis
     # how to make name_data_characteristics - non_none_terms
 
     result = [item for item in name_data_characteristics if item not in non_none_terms]
-    distu = ['Normal', 'Uniform', 'Triangular']
+    distu = ['normal', 'uniform', 'triangular']
     tra = ['no', 'sqrt', 'arcsinh']
     if model_terms.get('grouped') is None:
         print('cant have grouped rpm, removing level 4 from every item')
@@ -252,8 +252,11 @@ def set_up_analyst_constraints(data_characteristic, model_terms,  variable_decis
                 row[f'Level {level}'] = level in details['levels']
 
         # Add distributions and transformations directly
-        row['distributions'] = details['distributions']
-        row['transformations'] = details['transformations']
+        #row['distributions'] = details['distributions']
+        #row['transformations'] = details['transformations']
+        # Add distributions and transformations as comma-separated strings
+        row['distributions'] = ", ".join(details['distributions'])
+        row['transformations'] = ", ".join(details['transformations'])
 
         rows.append(row)
 

{metacountregressor-0.1.149 → metacountregressor-0.1.153}/metacountregressor/solution.py

@@ -829,15 +829,18 @@ class ObjectiveFunction(object):
     def rename_distro(self, distro):
         # Mapping dictionary
         mapping = {
-            'Normal': 'normal',
-            'Triangular': 'triangular',
-            'Uniform': 'uniform',
-            'Log-Normal': 'ln_normal',
-            'Trunc-Normal': 'tn_normal'
+            'normal': ['normal', 'n', 'Normal'],
+            'triangular': ['triangular', 't', 'Triangular'],
+            'uniform': ['uniform', 'u', 'Uniform'],
+            'ln_normal': ['ln_normal', 'ln_n', 'Ln_Normal'],
+            'tn_normal': ['tn_normal', 'tn_n', 'trunc_normal']
         }
 
         # Use list comprehension with the mapping
-        new_distro = [mapping.get(i, i) for i in distro]
+        reversed_mapping = {value: key for key, values in mapping.items() for value in values}
+
+        # Use the reversed mapping to find the corresponding key
+        new_distro = [reversed_mapping.get(i, i) for i in distro]
         return  new_distro
 
     def define_distributions_analyst(self, extra = None):

{metacountregressor-0.1.149 → metacountregressor-0.1.153}/metacountregressor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.149
+Version: 0.1.153
 Summary: Extensions for a Python package for estimation of count models.
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern