metacountregressor 0.1.316__py3-none-any.whl → 0.1.318__py3-none-any.whl

metacountregressor/metaheuristics.py

@@ -65,7 +65,7 @@ def _plot(x, y, z, xlabel=None, ylabel=None, zlabel=None, filename=None):
 def dict_mean(dict_list,
               ignore=None):
     if ignore is None:
-        ignore = ['AIC', 'layout', 'fixed_fit', 'rdm_fit', 'rdm_cor_fit', 'zi_fit', 'simple', 'pvalues']
+        ignore = ['AIC', 'layout', 'fixed_fit', 'rdm_fit', 'rdm_cor_fit', 'zi_fit', 'simple', 'pvalues', "CAIC"]
     mean_dict = {}
     if ignore is None:
         for key in dict_list[0].keys():
@@ -76,7 +76,13 @@ def dict_mean(dict_list,
         for key in dict_list[0].keys():
             if key in ignore:
                 continue
-            mean_dict[key] = sum(d[key] for d in dict_list) / len(dict_list)
+            # Filter out dictionaries that don't have the key
+            filtered_values = [d[key] for d in dict_list if key in d]
+            
+            if filtered_values:  # Ensure there are values to compute the mean
+                mean_dict[key] = sum(filtered_values) / len(filtered_values)
+            else:
+                mean_dict[key] = None  # Or handle missing data differently if needed
         return mean_dict
 
 
@@ -1198,7 +1204,7 @@ class SimulatedAnnealing(object):
             Temp3 = (Temp1 + Temp2) / (w_1 * Temp2 + w_2 * Temp1)
 
             self.best_energy = slns[0]
-            low_best = 10000000
+            low_best = 1e5
             for i, val in enumerate(fitness_list):
                 low = w_1 * fitness_list[i] + w_2 * fitness_list_2[i]
                 if low < low_best:
@@ -2359,7 +2365,7 @@ class Mutlithreaded_Meta(DifferentialEvolution, SimulatedAnnealing, HarmonySearc
             Temp3 = (Temp1 + Temp2) / (w_1 * Temp2 + w_2 * Temp1)
 
             self.best_energy = slns[0]
-            low_best = 10000000
+            low_best = 1e5
             for i, val in enumerate(fitness_list):
                 low = w_1 * fitness_list[i] + w_2 * fitness_list_2[i]
                 if low < low_best:

metacountregressor/solution.py

@@ -123,7 +123,7 @@ class ObjectiveFunction(object):
     """
 
     def __init__(self, x_data, y_data, **kwargs):
-        self.gbl_best = 1000000.0
+        self.gbl_best = 1e5
         self.run_numerical_hessian = kwargs.get('r_nu_hess', False)
         self.run_bootstrap =  kwargs.get('run_bootstrap', False)
         self.linear_regression = kwargs.get('linear_model', False)
@@ -459,8 +459,14 @@ class ObjectiveFunction(object):
 
         if self.G is not None:
             #TODO need to handle this for groups
-            self._distribution = ["trad| " + item for item in self._distribution
+            print('group by groups off for now')
+            NAH_GROUP = 0
+            if NAH_GROUP:
+                self._distribution = ["trad| " + item for item in self._distribution
                                   ] + ["grpd| " + item for item in self._distribution]
+            else:
+                self._distribution = ["trad| " + item for item in self._distribution
+                                  ]
 
         # output information
         self.convergence = None
@@ -1565,9 +1571,9 @@ class ObjectiveFunction(object):
             eVy = eVy.ravel()
 
        
-        eVy = np.nan_to_num(eVy, nan=100000, posinf=100000)
-        eVy = np.clip(eVy, None, 1000)
-        mae = np.nan_to_num(MAE(np.squeeze(y), np.squeeze(eVy)), nan=100000, posinf=100000)
+        eVy = np.nan_to_num(eVy, nan=1E5, posinf=1E5)
+        eVy = np.clip(eVy, None, 1E5)
+        mae = np.nan_to_num(MAE(np.squeeze(y), np.squeeze(eVy)), nan=1e5, posinf=1e5)
 
         mspe = np.nan_to_num(MSPE(np.squeeze(y), np.squeeze(eVy)), nan=100000, posinf=100000)
         RMSE = np.sqrt(mspe)
@@ -3563,9 +3569,9 @@ class ObjectiveFunction(object):
     def _chol_mat(self, correlationLength, br, Br_w, correlation):
         # if correlation = True correlation pos is randpos, if list get correct pos
         
+        print(self.rdm_grouped_fit, 'i think this causes the errror')
         
-        
-        varnames = self.none_handler(
+        varnames = self.none_handler(self.grouped_rpm)+ self.none_handler(
                 self.rdm_fit) + self.none_handler(self.rdm_cor_fit)
 
         
@@ -4791,7 +4797,7 @@ class ObjectiveFunction(object):
                 penalty = self.custom_penalty(betas, penalty)
 
                 if not np.isreal(loglik):
-                    loglik = - 10000000.0
+                    loglik = - 1e5
 
                 output = (-loglik + penalty,)
                 if return_gradient:
@@ -4874,11 +4880,17 @@ class ObjectiveFunction(object):
                 n_coeff = self.get_param_num(dispersion)
                 Kf_a, Kr_a, Kr_c, Kr_b_a, Kchol_a, Kh = self.get_num_params()
                 if Kchol_a != Kchol:
-                    print('this should not hh qhy')
+                    print('this should not happeb but why', Kr_b, 'kr)b is')
 
                 if Kr_b != Kr_a:
-                    print('hold qhy this should never happen')
+                    print('self.rdm_cor_fit', self.rdm_cor_fit)
+                    print('grouped_fit', self.rdm_grouped_fit)
+                    print('self.rdm_fit', self.rdm_fit) 
+                    print('odd, check this this should never happen')
+                
+
 
+                self.sanity_check(Xr, self.grouped_rpm)
 
 
 
@@ -4971,7 +4983,8 @@ class ObjectiveFunction(object):
                     betas_hetro = betas[Kf + Kr + Kr_b + Kchol:Kf + Kr + Kr_b + Kchol + KFH]
                     # betas_hetro = betas[:Xdh.shape[2]+1]
                     betas_hetro_sd = betas[Kf + Kr + Kr_b + Kchol + KFH:Kf + Kr + Kr_b + Kchol + KFH + KFHs]
-                    if KFHs > 1:
+
+                    if KFHs >= 1:
                         # print('now what how do i split')
                         x_i_h = model_nature.get('x_h_storage_test') if test_set else model_nature.get('x_h_storage')
                         if test_set == 2:
@@ -4992,6 +5005,7 @@ class ObjectiveFunction(object):
                             Vdh += dev.cust_einsum("njk,nkr -> njr", i, Bh)
 
                     else:
+                        print('this will not work cause i cant trul the right drawse')
                         Bh = self._transform_rand_betas(betas_hetro, betas_hetro_sd, draws_hetro)
 
                         Vdh = dev.cust_einsum("njk,nkr -> njr", Xdh, Bh)
@@ -7237,8 +7251,12 @@ class ObjectiveFunction(object):
         indices = [i for i, name in enumerate(self._characteristics_names) if name in names and isinstance(name, str)]
         return indices
 
-    def sanity_check(self, Xr):
-        a =len(self.rdm_cor_fit)+len(self.rdm_fit) != Xr.shape[2]
+    def sanity_check(self, Xr, grouped_rpm = None):
+        if grouped_rpm is None:
+            a =len(self.rdm_cor_fit)+len(self.rdm_fit) != Xr.shape[2]
+        else:
+            a = len(self.none_handler(self.rdm_cor_fit)) + len(self.none_handler(self.rdm_fit)) + len(self.none_handler(grouped_rpm)) != Xr.shape[2]
+            
         if a:
             print('why')
             print('The number of random effects does not match the data')

{metacountregressor-0.1.316.dist-info → metacountregressor-0.1.318.dist-info}/METADATA

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

{metacountregressor-0.1.316.dist-info → metacountregressor-0.1.318.dist-info}/RECORD

@@ -6,15 +6,15 @@ metacountregressor/halton.py,sha256=jhovA45UBoZYU9g-hl6Lb2sBIx_ZBTNdPrpgkzR9fng,
 metacountregressor/helperprocess.py,sha256=komn_EjCShFg-_8INh1Q06GdWWN4nxhHOgJ3V1X6aJI,26309
 metacountregressor/main.py,sha256=tGOm8DdbdyDf316qIxDAre6l6GzfJIWYNYIBaSeIemI,23685
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
-metacountregressor/metaheuristics.py,sha256=Qhu06AdF8HwEpyN-Q-6deG4b4kr7BKslgL8i2T7t1aI,107234
+metacountregressor/metaheuristics.py,sha256=A76VAPSbpkWTr07yiVYtFQP2dYGPzMXNDhrLWTpFvUY,107560
 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=HYvf6gjH2nlrWsp0hB6lFARRzI63yt0ZsS4ATPpugUs,320919
+metacountregressor/solution.py,sha256=rh_UcMSfIghkkdycDjKzmYzDyNS5wi6YmykywcC1y2Y,321846
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.316.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.316.dist-info/METADATA,sha256=yyNAZ3awOyzNk1MQFdiicSV2sjA3X4vykUdM8wBFnWE,23581
-metacountregressor-0.1.316.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-metacountregressor-0.1.316.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.316.dist-info/RECORD,,
+metacountregressor-0.1.318.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.318.dist-info/METADATA,sha256=BMMooW21TLhFEHU9BOYxIa4FOvrsggrVFtfM34iWjiU,23581
+metacountregressor-0.1.318.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+metacountregressor-0.1.318.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.318.dist-info/RECORD,,