metacountregressor 0.1.89__py3-none-any.whl → 0.1.97__py3-none-any.whl

metacountregressor/helperprocess.py

@@ -271,7 +271,17 @@ def guess_low_medium_high(column_name, series):
     # Compute the tertiles (33rd and 66th percentiles)
     #print('did it make it...')
     #mode_value = st.mode(series)  # Get the most frequent value
-    #print('good')
+    #i dont think this works cayse its not a seriers any other way
+    is_binary = series.isin([0, 1]).all()
+    if is_binary:
+        return {
+            'type': 'binary',
+            'bins': [0,1],
+            'labels': ['Off', 'On'],
+            'prefix': f'{column_name}'
+
+        }
+
    # series = pd.to_numeric(series, errors='coerce').fillna(mode_value)
     low_threshold = np.quantile(series, 0.33)
     high_threshold = np.quantile(series,0.66)

metacountregressor/solution.py

@@ -256,10 +256,11 @@ class ObjectiveFunction(object):
                 self.is_multi = False
 
             if 'panels' in kwargs and not (kwargs.get('panels') == None):
-                self.group_names = np.asarray(x_data[kwargs['group']].astype('category').cat._parent.dtype.categories)
+                if kwargs.get('group') is not None:
+                    self.group_names = np.asarray(x_data[kwargs['group']].astype('category').cat._parent.dtype.categories)
 
-                x_data[kwargs['group']] = x_data[kwargs['group']].astype(
-                    'category').cat.codes
+                    x_data[kwargs['group']] = x_data[kwargs['group']].astype(
+                        'category').cat.codes
                 self.complexity_level = 6
                 # create test dataset
 
@@ -309,10 +310,13 @@ class ObjectiveFunction(object):
                 df_train[kwargs['panels']]) if kwargs['panels'] is not None else None
             self.ids_test = np.asarray(
                 df_test[kwargs['panels']]) if kwargs['panels'] is not None else None
-            groupll = np.asarray(df_train[kwargs['group']].astype(
-                'category').cat.codes)
-            group_test = np.asarray(df_test[kwargs['group']].astype(
-                'category').cat.codes)
+            if kwargs.get('group') is not None:
+                groupll = np.asarray(df_train[kwargs['group']].astype(
+                    'category').cat.codes)
+                group_test = np.asarray(df_test[kwargs['group']].astype(
+                    'category').cat.codes)
+            else:
+                groupll = None
             X, Y, panel, group = self._arrange_long_format(
                 df_train, y_train, self.ids, self.ids, groupll)
             self.group_halton = group.copy()
@@ -501,7 +505,7 @@ class ObjectiveFunction(object):
         self._max_hurdle = 4
 
         #Manually fit from analyst specification
-        manual_fit = kwargs.get('Manual_Fit')
+        manual_fit = kwargs.get('Manual_Fit', None)
         if manual_fit is not None:
             print('fitting manual')
             self.process_manual_fit(manual_fit)
@@ -538,7 +542,7 @@ class ObjectiveFunction(object):
                 if self.is_multi:
                     self._offsets_test = self._x_data_test[:, :, val_od]
                     self._x_data_test = self.remove_offset(self._x_data_test, val_od)
-                print(self._offsets)
+                #print(self._offsets)
             else:
                 self.initialize_empty_offsets()
 
@@ -2361,7 +2365,7 @@ class ObjectiveFunction(object):
             sorted(my_dict, key=lambda x: x[0]['pval_percentage'])
 
     def get_fitness(self, vector, multi=False, verbose=False, max_routine=3):
-        obj_1 = 10.0 ** 5
+        obj_1 = 10.0 ** 4
         obj_best = None
         sub_slns = list()
 
@@ -2453,7 +2457,7 @@ class ObjectiveFunction(object):
 
 
             if not self.is_quanitifiable_num(obj_1[self._obj_1]):
-                obj_1[self._obj_1] = 10 ** 9
+                obj_1[self._obj_1] = 10 ** 5
             else:
                 if obj_1[self._obj_1] <= 0:
                     obj_1[self._obj_1] = 10 ** 9
@@ -3561,8 +3565,10 @@ class ObjectiveFunction(object):
         # Compute: betas = mean + sd*draws
         if len(br_sd) != draws.shape[1]:
             #get the same size as the mean
-            betas_random = self.Br.copy()
-
+            #if hasattr(self.Br):
+            #    betas_random = self.Br.copy()
+            #else:
+            betas_random = br_mean[None, :, None] + draws * br_sd[None, :, None]
             '''
             c = self.get_num_params()[3:5]
             

{metacountregressor-0.1.89.dist-info → metacountregressor-0.1.97.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.89
+Version: 0.1.97
 Summary: Extensive Testing for Estimation of Data Count Models
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern

{metacountregressor-0.1.89.dist-info → metacountregressor-0.1.97.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=NmUT0COc9Snxaz9TCV_EQgD2duKuDq_-9673evzv8D4,21887
+metacountregressor/helperprocess.py,sha256=dfNLJzsl58YHWPa_--m1Wg6ttPubHc-m_DAxFI0rouA,22157
 metacountregressor/main.py,sha256=xfpKN2w0kePHp_Q2HOPjtG15PLEN1L3sEnDw1PHBquw,23668
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
 metacountregressor/metaheuristics.py,sha256=rIdBa28EroIYqoE8ZI1isuj_o-tOWHo6jKi1HQJ06lU,106292
@@ -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=iBFew32bS1YZfEBc0USNbd3i0XKRNCTxXxbltHuJVAM,279244
+metacountregressor/solution.py,sha256=PgGPqxIJhXV5kAOrhPrhY2HC3LtjW7qOkFByh9rpvUc,279566
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.89.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.89.dist-info/METADATA,sha256=YpFeRa-wo-cTtD2cs0zKH43w157RR5guLU_mJnZnrfw,23535
-metacountregressor-0.1.89.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-metacountregressor-0.1.89.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.89.dist-info/RECORD,,
+metacountregressor-0.1.97.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.97.dist-info/METADATA,sha256=yJTPnzZKd1Ncg8tV3yTqwiLjp2CgAnqkED5bMGhrQsE,23535
+metacountregressor-0.1.97.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+metacountregressor-0.1.97.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.97.dist-info/RECORD,,

{metacountregressor-0.1.89.dist-info → metacountregressor-0.1.97.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any