metacountregressor 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

metacountregressor/metaheuristics.py

@@ -265,6 +265,10 @@ def simulated_annealing(objective_function, initial_slns=None, **kwargs):
     # else:
     #   TEMP_ALPHA, MAX_STEPS, INTL_ACCEPT, STEPS, SWAP_PERC, NUM_INTL_SLNS, IS_MULTI= hyperparameters
     man = None
+    try:
+        objective_function.instance_number = str(0)
+    except:
+        pass
     if 'Manual_Fit' in kwargs:
         if kwargs['Manual_Fit'] is not None:
             man = kwargs['Manual_Fit']
@@ -292,7 +296,10 @@ def harmony_search(objective_function, initial_harmonies=None, hyperparameters=N
         objective_function._hms = kwargs.get('_hms')
     if kwargs.get('_hmcr') is not None:
         objective_function._hmcr = kwargs.get('_hmcr')
-
+    try:
+        objective_function.instance_number = str(0)
+    except:
+        pass
 
     man = None
     if 'Manual_Fit' in kwargs:
@@ -416,6 +423,10 @@ class DifferentialEvolution(object):
 
     def __init__(self, objective_function, **kwargs):
         objective_function.algorithm = 'de'
+        try:
+            objective_function.instance_number = str(0)
+        except:
+            pass
         self._obj_fun = objective_function
         if self._obj_fun._obj_1 is None:
             print('no objective found, automatically selecting BIC')

metacountregressor/solution.py

@@ -257,7 +257,7 @@ class ObjectiveFunction(object):
             self.test_percentage = float(kwargs.get('test_percentage', 0))
             self.val_percentage = float(kwargs.get('val_percentage', 0))
             if self.test_percentage == 0:
-                print('test percentage is 0, please enter arg test_percentage as decimal, eg 0.8')
+                print('test percentage is 0, please enter arg test_percentage as decimal if intended for multi objective optimisation, eg 0.8')
                 print('continuing single objective')
                 time.sleep(2)
                 self.is_multi = False
@@ -296,6 +296,7 @@ class ObjectiveFunction(object):
                 ids = np.random.choice(N, training_size, replace=False)
                 id_unique = np.array([i for i in range(N)])
                 ids = id_unique[ids]
+                #todo make sure its split so counts are split
                 train_idx = [ii for ii in range(len(id_unique)) if id_unique[ii] in ids]
                 test_idx = [ii for ii in range(len(id_unique)) if id_unique[ii] not in ids]
                 df_train = x_data.loc[train_idx, :]
@@ -429,7 +430,7 @@ class ObjectiveFunction(object):
 
 
 
-        self.Ndraws = kwargs.get('Ndraws', 100)
+        self.Ndraws = kwargs.get('Ndraws', 200)
         self.draws1 = None
         self.initial_sig = 1  # pass the test of a single model
         self.pvalue_sig_value = .1
@@ -484,12 +485,24 @@ class ObjectiveFunction(object):
         self._discrete_values = self._discrete_values + \
                                 self.define_distributions_analyst(extra=kwargs.get('decisions', None))
 
-        if 'model_types' in kwargs:
-            model_types = kwargs['model_types']
+        if 'model_types' in kwargs or 'Model' in kwargs:
+            model_type_mapping = {
+                    'POS': 0,
+                    'NB': 1
+                }
+            model_types = kwargs.get('model_types', kwargs.get('Model', [[0,1]]))
+            converted_model_types = [
+                                        [model_type_mapping.get(item, item) for item in sublist]
+                                        for sublist in model_types
+                                    ]
+            model_types = converted_model_types
+            #this should be a list of list like [[0, 1]]
+            # also if it is [['POS', 'NB']] then it will be converted to [0, 1]
         else:
 
 
             model_types = [[0, 1]]  # add 2 for Generalized Poisson
+            
             #model_types = [[0]]
         
         if self.linear_regression:

{metacountregressor-1.0.6.dist-info → metacountregressor-1.0.7.dist-info}/METADATA

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

{metacountregressor-1.0.6.dist-info → metacountregressor-1.0.7.dist-info}/RECORD

@@ -6,16 +6,16 @@ metacountregressor/halton.py,sha256=jhovA45UBoZYU9g-hl6Lb2sBIx_ZBTNdPrpgkzR9fng,
 metacountregressor/helperprocess.py,sha256=wW45-i31zy6rwaXt5PZt0GyR83PzF30jc9Wl4SQtnUI,26372
 metacountregressor/main.py,sha256=tGOm8DdbdyDf316qIxDAre6l6GzfJIWYNYIBaSeIemI,23685
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
-metacountregressor/metaheuristics.py,sha256=O6JYd5ezuC67uSqIKQfZNFWDkLbvPW0ujcm0TdHe5I8,107608
+metacountregressor/metaheuristics.py,sha256=lAtDmQslzAC4Xg2Ozx4bnycz235le7-qEStlJFPa5xA,107881
 metacountregressor/pareto_file.py,sha256=whySaoPAUWYjyI8zo0hwAOa3rFk6SIUlHSpqZiLur0k,23096
 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=fIFmOVnbI8gFv_lQEZ8UKEmjvhJCoLI_OlV8z4bRBuc,323937
+metacountregressor/solution.py,sha256=nY9L3X3mBUqbIopriHIzp9zXQOdhSt8dWj4Nx5Gu40Y,324648
 metacountregressor/test_code.py,sha256=_7Emm2JbhK_NVhxoqMhshN2JeHZtihZuSDl3Jpe7Ajk,1641
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-1.0.6.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-1.0.6.dist-info/METADATA,sha256=Yg16pEdqZr3dK5Xi8yMPUMm0rEL3HDISb1k8hCWzRHM,23618
-metacountregressor-1.0.6.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-metacountregressor-1.0.6.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-1.0.6.dist-info/RECORD,,
+metacountregressor-1.0.7.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-1.0.7.dist-info/METADATA,sha256=3-FuTS2ap0lEcxzmCiGjO6825DoAAqNuEuaEeaWVbnY,23618
+metacountregressor-1.0.7.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+metacountregressor-1.0.7.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-1.0.7.dist-info/RECORD,,

{metacountregressor-1.0.6.dist-info → metacountregressor-1.0.7.dist-info}/WHEEL

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