metacountregressor 0.1.304__py3-none-any.whl → 0.1.306__py3-none-any.whl

metacountregressor/metaheuristics.py

@@ -405,6 +405,7 @@ class DifferentialEvolution(object):
     """
 
     def __init__(self, objective_function, **kwargs):
+        objective_function.algorithm = 'de'
         self._obj_fun = objective_function
         if self._obj_fun._obj_1 is None:
             print('no objective found, automatically selecting BIC')
@@ -780,7 +781,7 @@ class SimulatedAnnealing(object):
         """
 
     def __init__(self, objective_function, **kwargs):
-
+        objective_function.algorithm = 'sa'
         self._STEPS_PER_TEMP = int(kwargs.get('STEPS_PER_TEMP', 2)) or int(kwargs.get('_ts', 2))
         self._INITAL_ACCEPT_RATE = float(kwargs.get('INTL_ACPT', 0.5))
         self._NUM_INITIAL_SLNS = int(kwargs.get('_num_intl_slns', 20))
@@ -1247,6 +1248,7 @@ class HarmonySearch(object):
         """
             Initialize HS with the specified objective function. Note that this objective function must implement ObjectiveFunctionInterface.
         """
+        objective_function.algorithm = 'hs'
         self._obj_fun = objective_function
         ## NEW CODE, TRYING TO EXCTACT OUT THE PARAMATERS
         self._hms = kwargs.get('_hms', 20)

metacountregressor/solution.py

@@ -125,7 +125,7 @@ class ObjectiveFunction(object):
         self.gbl_best = 1000000.0
         self.run_bootstrap =  kwargs.get('run_bootstrap', False)
         self.linear_regression = kwargs.get('linear_model', False)
-        self.reg_penalty = 1
+        self.reg_penalty = kwargs.get('reg_penalty',1)
         self.power_up_ll = False
         self.nb_parma = 1
         self.bic = None
@@ -176,7 +176,6 @@ class ObjectiveFunction(object):
         self._max_imp = kwargs.get('_max_imp', 90000000)
         self._WIC =  kwargs.get("WIC",10000) # Number of Iterations without Multiobjective Improvement #tod chuck into solution
         self._panels = None
-        self.is_multi = True
         self.method_ll = 'Nelder-Mead-BFGS'
 
         self.method_ll = 'L-BFGS-B'  # alternatives 'BFGS_2', 'BFGS
@@ -1157,16 +1156,16 @@ class ObjectiveFunction(object):
                 x, 2) for x in self.pvalues]
             signif_list = self.pvalue_asterix_add(self.pvalues)
             if model == 1:
-
-                #self.coeff_[-1] = 1/np.exp(self.coeff_[-1])
+                # raise to the exponential
+                self.coeff_[-1] = np.maximum([np.exp(self.coeff_[-1]),2])
                 if self.no_extra_param:
                     self.coeff_ = np.append(self.coeff_, self.nb_parma)
                     self.stderr = np.append(self.stderr, 0.00001)
                     self.zvalues = np.append(self.zvalues, 50)
 
-                elif self.coeff_[-1] < 0.25:
+                #elif self.coeff_[-1] < 0.25:
                     #print(self.coeff_[-1], 'Warning Check Dispersion')
-                    print(f'dispession is para,aters {np.exp(self.coeff_[-1])}')
+                    #print(f'dispession is para,aters {np.exp(self.coeff_[-1])}')
                     #self.coeff_[-1] = np.exp(self.coeff_[-1])  # min possible value for negbinom
             
 
@@ -1226,6 +1225,7 @@ class ObjectiveFunction(object):
             if model is not None:
                 caption_parts = []
                 if self.algorithm is not None:
+                    
                     caption_parts.append(
                         f"{self._model_type_codes[model]} model found through the {self.algorithm} algorithm.")
 
@@ -1236,7 +1236,8 @@ class ObjectiveFunction(object):
                     caption_parts.append(f"Log-Likelihood: {self.round_with_padding(self.log_lik, 2)}")
 
                 if solution is not None:
-                    caption_parts.append(f"{self._obj_2}: {self.round_with_padding(solution[self._obj_2], 2)}")
+                    if self.is_multi:
+                        caption_parts.append(f"{self._obj_2}: {self.round_with_padding(solution[self._obj_2], 2)}")
 
                 caption = " ".join(caption_parts)
                 # print(latextable.draw_latex(table, caption=caption, caption_above = True))
@@ -5936,7 +5937,7 @@ class ObjectiveFunction(object):
 
         # Optimization method and options
         method = self.method_ll if bounds is None else 'L-BFGS-B'
-        print('updataing methods')
+        
 
         #method = 'Nelder-Mead-BFGS'
         options = {'gtol': tol['gtol'], 'ftol': tol['ftol'], 'maxiter': 4000}

{metacountregressor-0.1.304.dist-info → metacountregressor-0.1.306.dist-info}/METADATA

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

{metacountregressor-0.1.304.dist-info → metacountregressor-0.1.306.dist-info}/RECORD

@@ -6,15 +6,15 @@ metacountregressor/halton.py,sha256=jhovA45UBoZYU9g-hl6Lb2sBIx_ZBTNdPrpgkzR9fng,
 metacountregressor/helperprocess.py,sha256=ufdB6BcCIYN6btWdxyFlRCReuYEbVh6es1sdLsd8RTg,25917
 metacountregressor/main.py,sha256=xfpKN2w0kePHp_Q2HOPjtG15PLEN1L3sEnDw1PHBquw,23668
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
-metacountregressor/metaheuristics.py,sha256=bDyK5K4SFboWjaUIDlBR0H04a64XabXO_74SX0q_nsk,106813
+metacountregressor/metaheuristics.py,sha256=eVlP9FO8StVxj7D6m8n6ekRR45sOtjZuoakr5tzb-H4,106944
 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=j1jzIKn74LNvxjGyVJn9CUrUpvugM6I2duGRXTCOA3A,317500
+metacountregressor/solution.py,sha256=OfhD7J28SSJ-dNLL0DTJ5T5vlqxhsclkDVtJMIIoJJM,317591
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.304.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.304.dist-info/METADATA,sha256=-Yn7gguicyi13SlwYXvUjrcC0gJPBw320AtbAjtk27M,23581
-metacountregressor-0.1.304.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-metacountregressor-0.1.304.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.304.dist-info/RECORD,,
+metacountregressor-0.1.306.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.306.dist-info/METADATA,sha256=ij4GJpcGRVnvBXdLVhj1tdh7T1SFnsOEdg6S0pHQCcs,23581
+metacountregressor-0.1.306.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+metacountregressor-0.1.306.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.306.dist-info/RECORD,,