metacountregressor 0.1.309__tar.gz → 0.1.311__tar.gz

{metacountregressor-0.1.309/metacountregressor.egg-info → metacountregressor-0.1.311}/PKG-INFO

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

{metacountregressor-0.1.309 → metacountregressor-0.1.311}/metacountregressor/metaheuristics.py

@@ -615,10 +615,16 @@ class DifferentialEvolution(object):
                     obj_trial = self._obj_fun.get_fitness(trial, self.pf.get_objective_is_multi())
                     if not self.pf.get_objective_is_multi():
                         average_iteration += obj_trial[self._obj_fun._obj_1]
-                        logger(i, obj_trial, None, True, self.get_instance_name(), 1)
-                    else:
-                        logger(i, obj_trial, None, True, self.get_instance_name(), self.pf.get_objective_is_multi())
+                        try:
 
+                            logger(i, obj_trial, None, True, self.get_instance_name(), 1)
+                        except:
+                            pass
+                    else:
+                        try:
+                            logger(i, obj_trial, None, True, self.get_instance_name(), self.pf.get_objective_is_multi())
+                        except:    
+                            pass
                 except Exception as e:
                     print('why is there an exception')
                     print(e)
@@ -637,7 +643,7 @@ class DifferentialEvolution(object):
 
                         iterations_without_improvement = 0
                         self._population[j] = obj_trial
-
+                        
                         logger(self.it_process, obj_trial, self._population, True,
                                self.instance_number + '/population_logger_strict_non_pareto.csv', 1)
                         logger(self.it_process, obj_trial, self._pareto_population, True,

{metacountregressor-0.1.309 → metacountregressor-0.1.311}/metacountregressor/solution.py

@@ -3549,37 +3549,30 @@ class ObjectiveFunction(object):
 
         return inv_hess
 
+    def _correlated_pos(self, correlation, varnames):
+        if (isinstance(correlation, list)):
+            correlationpos = [varnames.tolist().index(x) for x in
+                              varnames if x in correlation]
+            uncorrelatedpos = [varnames.tolist().index(x) for x in
+                               varnames if x not in correlation]
+            return
+
+    
+
+
     def _chol_mat(self, correlationLength, br, Br_w, correlation):
         # if correlation = True correlation pos is randpos, if list get correct pos
-        dont_run = 0
-        if dont_run:
-            correlationpos = []
-            varnames = ['a', 'b', 'c', 'd', 'e', 'f']
-            varnames = np.asarray(varnames)
-            randvars = ['c', 'd', 'e', 'f']
-            correlation = ['e', 'f']
-            if randvars:
-                # Position of correlated variables within randvars
-                correlationpos = [varnames.tolist().index(x)
-                                  for x in varnames if x in randvars]
-            if (isinstance(correlation, list)):
-                self.correlationpos = [varnames.tolist().index(x) for x in
-                                       varnames if x in correlation]
-                self.uncorrelatedpos = [varnames.tolist().index(x) for x in
-                                        varnames if x not in correlation]
-            # if correlation = True correlation pos is randpos, if list get correct pos
-            correlationpos = []
-        else:
-            varnames = self.none_handler(
+        
+        
+        
+        varnames = self.none_handler(
                 self.rdm_fit) + self.none_handler(self.rdm_cor_fit)
 
-        if (isinstance(correlation, list)):
+        
             # Kchol, permutations of specified params in correlation list
-            Kchol = int((len(correlation) *
+        Kchol = int((len(correlation) *
                          (len(correlation) + 1)) / 2)
-        else:
-            # i.e. correlation = True, Kchol permutations of random paramaters
-            Kchol = int((len(br) * (len(br) + 1)) / 2)
+        
 
         # creating cholesky matrix for the variance-covariance matrix
         # all random variables not included in correlation will only
@@ -3608,7 +3601,18 @@ class ObjectiveFunction(object):
                 is_correlated = True
             else:
                 is_correlated = False
-            rv_val = chol[chol_count] if is_correlated else br_w[rv_count]
+            try:
+                rv_val = chol[chol_count] if is_correlated else br_w[rv_count]
+            except:
+                print('exception here start') 
+                print(self.rdm_cor_fit, 'rdm_cor_fit')
+                print(self.rdm_fit, 'rdm_fit')
+                print('varnames', varnames)
+                print('br', br, 'br')
+                print(Br_w, 'Br_w')
+                print(chol, 'chol')
+                print(br_w, 'br_w')
+                print('exception here end')
             chol_mat_temp[rv_count_all, rv_count_all] = rv_val
             rv_count_all += 1
             if is_correlated:
@@ -4870,10 +4874,10 @@ 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('hold qhy')
+                    print('this should not hh qhy')
 
-                if Kr_b != Kr_b_a:
-                    print('hold qhy')
+                if Kr_b != Kr_a:
+                    print('hold qhy this should never happen')
 
 
 
@@ -4887,13 +4891,14 @@ class ObjectiveFunction(object):
 
                     )
                 Bf = betas[0:Kf]  # Fixed betas
-
-
-           # Bf_new, Br_new, Br_std_new, Br_rema = self.extract_parameters(betas, Kf, Kr, Kchol_a, Kr_b_a)
+            TEST_ME = False
+            if not TEST_ME:
+                Bf, br, br_std, Br_rema = self.extract_parameters(betas, Kf, Kr, Kchol_a, Kr_b_a)
 
 
             Vdf = dev.np.einsum('njk,k -> nj', Xdf, Bf, dtype=np.float64)  # (N, P)
-            br = betas[Kf:Kf + Kr]
+            if TEST_ME:
+                br = betas[Kf:Kf + Kr]
 
 
 
@@ -4911,9 +4916,9 @@ class ObjectiveFunction(object):
             # Kchol_a + Krb_a
             #its grabbing from the
 
+            if TEST_ME:
 
-
-            brstd = betas[Kf + Kr:Kf + Kr + Kr_b + Kchol]
+                brstd = betas[Kf + Kr:Kf + Kr + Kr_b + Kchol]
 
             # initialises size matrix
             proba = []  # Temp batching storage
@@ -7210,6 +7215,20 @@ 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]
+        if a:
+            print('why')
+            print('The number of random effects does not match the data')
+            print(Xr.shape)
+            print(self.rdm_cor_fit)
+            print(self.rdm_fit)
+            
+            #raise Exception('The number of random effects does not match the data')
+        else:
+            return True
+    
+    
     """
     This function is named 'makeRegression'. It takes several parameters; 'self', 'model_nature', 'layout', '*args', and '**kwargs'.
     The purpose of this function is to execute a regression based on the training and testing datasets.
@@ -7316,7 +7335,7 @@ class ObjectiveFunction(object):
             Xr_cor = df_tf[:, :, indices3]
             # FIXME not sure if this is the right way orientatied
             Xr = np.concatenate((Xr, Xr_cor), axis=2)
-
+            self.sanity_check(Xr)
         model_nature['Xr'] = Xr
         if self.is_multi:
             Xr_test = df_test[:, :, indices2]

{metacountregressor-0.1.309 → metacountregressor-0.1.311/metacountregressor.egg-info}/PKG-INFO

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

metacountregressor-0.1.311/version.txt

@@ -0,0 +1 @@
+0.1.311

metacountregressor-0.1.309/version.txt

@@ -1 +0,0 @@
-0.1.309