metacountregressor 0.1.142__py3-none-any.whl → 0.1.146__py3-none-any.whl

metacountregressor/helperprocess.py

@@ -418,6 +418,11 @@ def interactions(df, keep=None, drop_this_perc=0.6, interact = False):
     # second
     # Remove `keep` columns from the correlation matrix
     if keep is not None:
+        missing_columns = [col for col in keep if col not in df.columns]
+        
+        if missing_columns:
+            print(f"The following columns are not in the DataFrame and will be ignored: {missing_columns}")
+            keep = [col for col in keep if col not in df.columns]
         df_corr = df.drop(columns=keep, errors='ignore')  # Exclude `keep` columns
     else:
         df_corr = df

metacountregressor/metaheuristics.py

@@ -1248,7 +1248,7 @@ class HarmonySearch(object):
 
 
         # for printing basics metrics
-        self.print_verbose = True
+        self.print_verbose = kwargs.get('verbose', False)
         # harmony_memory stores the best hms harmonies
         self._harmony_memory = list()
         # harmony_history stores all hms harmonies every nth improvisations (i.e., one 'generation')

metacountregressor/solution.py

@@ -136,10 +136,10 @@ class ObjectiveFunction(object):
         self.constant_value = 0
         self.negative_binomial_value = 1
 
-        self.verbose_safe = True
+        self.verbose_safe = kwargs.get('verbose', 0)
         self.please_print = kwargs.get('please_print', 0)
         self.group_halton = None
-        self.grad_yes = True
+        self.grad_yes = kwargs.get('grad_est', False)
         self.hess_yes = False
         self.group_halton_test = None
         self.panels = None
@@ -177,13 +177,14 @@ class ObjectiveFunction(object):
         self.method_ll = 'Nelder-Mead-BFGS'
 
         self.method_ll = 'L-BFGS-B'  # alternatives 'BFGS_2', 'BFGS
-        self.method_ll = 'BFGS_2'
+        self.method_ll = kwargs.get('method', 'BFGS_2')
+        
         #self.method_ll = 'Nelder-Mead-BFGS'
         self.Keep_Fit = 2
         self.MP = 0
         # Nelder-Mead-BFGS
 
-        self._max_characteristics = 26
+        self._max_characteristics = kwargs.get('_max_vars', 26)
 
         self.beta_dict = dict
 
@@ -4858,7 +4859,7 @@ class ObjectiveFunction(object):
             proba.append(dev.to_cpu(proba_))
 
             lik = np.stack(proba).sum(axis=0) / R  # (N, )
-            lik = np.clip(lik, min_comp_val, 1000)
+            lik = np.clip(lik, min_comp_val, max_comp_val)
             # lik = np.nan_to_num(lik, )
             loglik = np.log(lik)
             llf_main = loglik
@@ -5188,7 +5189,7 @@ class ObjectiveFunction(object):
                 H = self.numerical_hessian(lambda x: self._loglik_gradient(x, *argbs), result.x, eps=1e-7 * self.n_obs)
                 result['Hessian'] = H
                 result['hess_inv'] = np.linalg.pinv(H)
-                print('to do, only if hessian is fhfhfhf')
+                
                 standard_errors = np.sqrt(np.diag(np.linalg.pinv(H)))
                 return result
                 # return minimize(loglik_fn, x, args=args, jac=args[6], hess=args[7], method='BFGS', options= {'gtol':1e-7*self.N}*self.Ndraws)

{metacountregressor-0.1.142.dist-info → metacountregressor-0.1.146.dist-info}/METADATA

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

{metacountregressor-0.1.142.dist-info → metacountregressor-0.1.146.dist-info}/RECORD

@@ -3,18 +3,18 @@ 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=05698FXkXiAZi2JvVxCtaBwSf9LbW1lY8q_eFmEF5Nc,20739
+metacountregressor/helperprocess.py,sha256=MTu1dXAejrN-kLcTg2EP0ISOVlPGUkxQs25Q9cqxcPs,21023
 metacountregressor/main.py,sha256=2Rx_mGIGzl4lhwkMb7DHvsBaawqEakKiVR1Yr2uG9Yo,22819
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
-metacountregressor/metaheuristics.py,sha256=SiVpq7CTXWe1_YNhdoUfFJdIc85WOoIwWUtfbYIw4og,106265
+metacountregressor/metaheuristics.py,sha256=1Tm_BS8HxumEo9fteIwTTkfiJXbfH6wlfSmY0tSt77A,106289
 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=j8pWlmMmEkjBC798Fnh1fu0w7F6jrVtW43H2OSXv8Ts,278258
+metacountregressor/solution.py,sha256=Se3-NMxuRFacPN9f3qfGzkKeIccs8cbe4ebkV0UsGlA,278325
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.142.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.142.dist-info/METADATA,sha256=nXopMa3sjI_vDNwd3KZrzSjp4-Yw9fPP9rZhmCPo7ug,23434
-metacountregressor-0.1.142.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-metacountregressor-0.1.142.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.142.dist-info/RECORD,,
+metacountregressor-0.1.146.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.146.dist-info/METADATA,sha256=AuRoXoD9mbx43mFObuM90pB7l7lGfEBkiCVQcEvgBec,23434
+metacountregressor-0.1.146.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+metacountregressor-0.1.146.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.146.dist-info/RECORD,,