metacountregressor 0.1.148__tar.gz → 0.1.150__tar.gz

{metacountregressor-0.1.148 → metacountregressor-0.1.150}/PKG-INFO

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

{metacountregressor-0.1.148 → metacountregressor-0.1.150}/metacountregressor/helperprocess.py

@@ -302,11 +302,22 @@ def transform_dataframe(df, config):
     for column, settings in config.items():
         if settings['type'] == 'bin':
             # Apply binning
+            # Get unique bins (remove duplicates)
+            unique_bins = sorted(set(settings['bins']))
+
+            # Adjust labels if necessary
+            if len(unique_bins) - 1 != len(settings['labels']):
+                print(f"Adjusting labels to match bins: {len(unique_bins) - 1} bins detected.")
+                labels = [f'Bin {i+1}' for i in range(len(unique_bins) - 1)]
+            else:
+                labels = settings['labels']
+
+            # Perform the binning
             binned_d = pd.cut(
                 df[column],
-                bins=sorted(set(settings['bins'])),  # Remove duplicate bins
-                labels=settings['labels'],
-                right=False  # Adjust based on your requirements
+                bins=unique_bins,  # Deduplicated bins
+                labels=labels,     # Adjusted or original labels
+                right=False        # Adjust based on whether to include the right edge
             )
             # One-hot encode the binned column
             binned_dummies = pd.get_dummies(binned_d, prefix=settings['prefix'])

{metacountregressor-0.1.148 → metacountregressor-0.1.150}/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.148 → metacountregressor-0.1.150}/metacountregressor.egg-info/PKG-INFO

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