metacountregressor 0.1.317__tar.gz → 0.1.320__tar.gz

{metacountregressor-0.1.317/metacountregressor.egg-info → metacountregressor-0.1.320}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metacountregressor
-Version: 0.1.317
+Version: 0.1.320
 Summary: Extensive Testing for Estimation of Data Count Models
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern
@@ -9,7 +9,7 @@ License: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: numpy>=2.2.2
+Requires-Dist: numpy>=2.2.4
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: requests
 Requires-Dist: latextable

{metacountregressor-0.1.317 → metacountregressor-0.1.320}/metacountregressor/solution.py

@@ -3570,7 +3570,7 @@ 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')
+        #print(self.rdm_grouped_fit, 'i think this causes the errror')
         
         varnames = self.none_handler(self.grouped_rpm)+ self.none_handler(
                 self.rdm_fit) + self.none_handler(self.rdm_cor_fit)
@@ -4704,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,
@@ -4733,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
@@ -4962,6 +4982,8 @@ class ObjectiveFunction(object):
                          np.matmul(chol_mat[:len(br), :len(br)], draws_)
                     self.Br = Br.copy()
             else:
+                if 'draws_hetro' in model_nature:
+                    self.naming_for_printing(betas, dispersion=dispersion, model_nature=model_nature)
                 Br = br.reshape((N, 0, self.Ndraws))
                 draws_ = np.zeros((N, 0, self.Ndraws))
 

{metacountregressor-0.1.317 → metacountregressor-0.1.320/metacountregressor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metacountregressor
-Version: 0.1.317
+Version: 0.1.320
 Summary: Extensive Testing for Estimation of Data Count Models
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern
@@ -9,7 +9,7 @@ License: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: numpy>=2.2.2
+Requires-Dist: numpy>=2.2.4
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: requests
 Requires-Dist: latextable

{metacountregressor-0.1.317 → metacountregressor-0.1.320}/metacountregressor.egg-info/requires.txt

@@ -1,4 +1,4 @@
-numpy>=2.2.2
+numpy>=2.2.4
 scipy>=1.0.0
 requests
 latextable

{metacountregressor-0.1.317 → metacountregressor-0.1.320}/setup.py

@@ -44,7 +44,7 @@ setuptools.setup(
     zip_safe=False,
     python_requires='>=3.10',
     install_requires=[
-        'numpy>=2.2.2',
+        'numpy>=2.2.4',
         'scipy>=1.0.0',
         'requests',
         'latextable',

metacountregressor-0.1.320/version.txt

@@ -0,0 +1 @@
+0.1.320

metacountregressor-0.1.317/version.txt

@@ -1 +0,0 @@
-0.1.317