metacountregressor 0.1.151__py3-none-any.whl → 0.1.155__py3-none-any.whl

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/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.151.dist-info → metacountregressor-0.1.155.dist-info}/METADATA

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

{metacountregressor-0.1.151.dist-info → metacountregressor-0.1.155.dist-info}/RECORD

@@ -3,7 +3,7 @@ metacountregressor/_device_cust.py,sha256=759fnKmTYccJm4Lpi9_1reurh6OB9d6q9soPR0
 metacountregressor/app_main.py,sha256=vY3GczTbGbBRalbzMkl_9jVW7RMgEOc6z2Dr1IZJv9c,10014
 metacountregressor/data_split_helper.py,sha256=M2fIMdIO8znUaYhx5wlacRyNWdQjNYu1z1wkE-kFUYU,3373
 metacountregressor/halton.py,sha256=jhovA45UBoZYU9g-hl6Lb2sBIx_ZBTNdPrpgkzR9fng,9463
-metacountregressor/helperprocess.py,sha256=0cA9_kRRyDGR_aGuClzHyHPsn3iwriH6PD8l7T2jCAo,21653
+metacountregressor/helperprocess.py,sha256=5HrHrtKpRRT4USy9GffPd4Zvqe-IDX76ZBbGCa20mFs,21868
 metacountregressor/main.py,sha256=2Rx_mGIGzl4lhwkMb7DHvsBaawqEakKiVR1Yr2uG9Yo,22819
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
 metacountregressor/metaheuristics.py,sha256=1Tm_BS8HxumEo9fteIwTTkfiJXbfH6wlfSmY0tSt77A,106289
@@ -11,10 +11,10 @@ metacountregressor/pareto_file.py,sha256=whySaoPAUWYjyI8zo0hwAOa3rFk6SIUlHSpqZiL
 metacountregressor/pareto_logger__plot.py,sha256=mEU2QN4wmsM7t39GJ_XhJ_jjsdl09JOmG0U2jICrAkI,30037
 metacountregressor/setup.py,sha256=5UcQCCLR8Fm5odA3MX78WwahavxFq4mVD6oq0IuQvAY,936
 metacountregressor/single_objective_finder.py,sha256=jVG7GJBqzSP4_riYr-kMMKy_LE3SlGmKMunNhHYxgRg,8011
-metacountregressor/solution.py,sha256=Se3-NMxuRFacPN9f3qfGzkKeIccs8cbe4ebkV0UsGlA,278325
+metacountregressor/solution.py,sha256=BdP43jX-46tJtih0Ctq62jstR2DSX20AyGJkvRbTYPY,278596
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.151.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.151.dist-info/METADATA,sha256=UnAwgc0WSRSryWmpvJhJrIOC0YkUfq6xrgtdqRBPw_M,23434
-metacountregressor-0.1.151.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-metacountregressor-0.1.151.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.151.dist-info/RECORD,,
+metacountregressor-0.1.155.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.155.dist-info/METADATA,sha256=m4q8qj9oRFg-c-3h185y1lbJZTBjEW0XLOe6SmfavGI,23434
+metacountregressor-0.1.155.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+metacountregressor-0.1.155.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.155.dist-info/RECORD,,