metacountregressor 0.1.316__tar.gz → 0.1.318__tar.gz

{metacountregressor-0.1.316/metacountregressor.egg-info → metacountregressor-0.1.318}/PKG-INFO

@@ -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 → metacountregressor-0.1.318}/metacountregressor/solution.py

@@ -611,6 +611,7 @@ class ObjectiveFunction(object):
 
         modified_fit = self.modify_initial_fit(manual_fit)  # Modify the initial fit based on manual_fit
         self.significant = 1
+        #self.define_selfs_fixed_rdm_cor(modified_fit)
         self.makeRegression(modified_fit)  # Perform regression with the modified fit
 
 
@@ -4703,6 +4704,27 @@ class ObjectiveFunction(object):
 
         return log_likelihood_value
 
+    def _no_draws(self, draws, grouped_draws, model_nature):
+        # Check if 'draws_hetro' exists and has the required attributes
+        if 'draws_hetro' in model_nature:
+            draws_hetro = model_nature.get('draws_hetro')
+            try:
+                # Check if the condition is met
+                if draws_hetro.shape[1] == 0:
+                    return False
+                else: return True
+            except AttributeError:
+                pass
+        else:
+            # If 'draws_hetro' does not exist, return False
+            if draws is None and grouped_draws is None:
+                return False
+            else: return True
+            
+        # Return True if none of the conditions for False are met
+        return True
+        
+
     def _loglik_gradient(self, betas, Xd, y, draws=None, Xf=None, Xr=None, batch_size=None, return_gradient=False,
                          return_gradient_n=False, dispersion=0, test_set=0, return_EV=False, verbose=0, corr_list=None,
                          zi_list=None, exog_infl=None, draws_grouped=None, Xgroup=None, model_nature=None, kwarg=None,
@@ -4732,8 +4754,7 @@ class ObjectiveFunction(object):
             penalty = self._penalty_betas(
                 betas, dispersion, penalty, float(len(y) / 10.0))
             self.n_obs = len(y)  # feeds into gradient
-            if draws is None and draws_grouped is None and (model_nature is None or
-                    'draws_hetro' not in model_nature or model_nature.get('draws_hetro').shape[1] == 0):
+            if not self._no_draws(draws, draws_grouped, model_nature):
                 #TODO do i shuffle the draws
                 if type(Xd) == dict:
                     N, Kf, P = 0, 0, 0
@@ -5933,7 +5954,11 @@ class ObjectiveFunction(object):
         """
         X, Xr, XG, XH = mod.get('X'), mod.get('Xr'), mod.get('XG'), mod.get('XH')
         if XG is not None:
-            return np.concatenate((X, XG, Xr, XH), axis=2)
+            if XH is not None:
+                return np.concatenate((X, XG, Xr, XH), axis=2)
+            else:
+                return np.concatenate((X, XG, Xr), axis=2)
+           # return np.concatenate((X, XG, Xr, XH), axis=2)
         elif XH is not None:
             return np.concatenate((X, Xr, XH), axis=2)
         else:
@@ -6287,11 +6312,14 @@ class ObjectiveFunction(object):
         X_test, Xr_test, XG_test, XH_test = (
             mod.get('X_test'), mod.get('Xr_test'), mod.get('XG_test'), mod.get('XH_test')
         )
-        if X_test is None or Xr_test is None:
+        if X_test is None and Xr_test is None:
             return None
 
         if XH_test is not None:
-            return np.concatenate((X_test, Xr_test, XH_test), axis=2)
+            if XG_test is not None:
+                return np.concatenate((X_test, XG_test, Xr_test, XH_test), axis=2)
+            else:
+                return np.concatenate((X_test, Xr_test, XH_test), axis=2)
         elif XG_test is not None:
             return np.concatenate((X_test, XG_test, Xr_test), axis=2)
         else:
@@ -7638,6 +7666,8 @@ class ObjectiveFunction(object):
         alpha_group_rdm = np.isin(select_data, data.get('group_rdm', [])).astype(int).tolist()
         alpha_hetro = np.isin(select_data, [item.split(':')[0] for item in data.get('hetro_in_means', [])]).astype(
             int).tolist()
+        matching_names = [name for name in select_data if name in [item.split(':')[0] for item in data.get('hetro_in_means', [])]]
+        self.hetro_fit = matching_names
         for i in range(len(alpha_rdm)):
 
             if alpha[i]:
@@ -7678,14 +7708,14 @@ class ObjectiveFunction(object):
         # select_data = self._x_data.columns
 
         select_data = self._characteristics_names
-        alpha = np.in1d(select_data, fix) * 1
-        alpha_rdm = np.in1d(select_data, rdm) * 1
+        alpha = np.isin(select_data, fix) * 1
+        alpha_rdm = np.isin(select_data, rdm) * 1
         alpha = alpha.tolist()
         alpha_rdm = alpha_rdm.tolist()
 
-        alpha_cor_rdm = np.in1d(select_data, cor_rdm) * 1
+        alpha_cor_rdm = np.isin(select_data, cor_rdm) * 1
         alpha_cor_rdm = alpha_cor_rdm.tolist()
-        alpha_group_rdm = np.in1d(select_data, group_rdm) * 1
+        alpha_group_rdm = np.isin(select_data, group_rdm) * 1
         alpha_group_rdm = alpha_group_rdm.tolist() #todo will this ever trigger
         return alpha, alpha_rdm, alpha_cor_rdm
 

{metacountregressor-0.1.316 → metacountregressor-0.1.318/metacountregressor.egg-info}/PKG-INFO

@@ -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.318/version.txt

@@ -0,0 +1 @@
+0.1.318

metacountregressor-0.1.316/version.txt

@@ -1 +0,0 @@
-0.1.316