metacountregressor 0.1.312__tar.gz → 0.1.314__tar.gz

{metacountregressor-0.1.312/metacountregressor.egg-info → metacountregressor-0.1.314}/PKG-INFO

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

{metacountregressor-0.1.312 → metacountregressor-0.1.314}/metacountregressor/solution.py

@@ -1035,9 +1035,9 @@ class ObjectiveFunction(object):
 
                 abct = []
                 hetro_long = hetro_long + hetro_std
-                for i in model_nature['transfrom_hetro']:
+                for i in model_nature['transform_hetro']:
                     abct = abct + i
-                for i in model_nature['transfrom_hetro']:
+                for i in model_nature['transform_hetro']:
                     abct = abct + ['']
             else:
                 big_hetro = []
@@ -5954,7 +5954,7 @@ class ObjectiveFunction(object):
     def hessian_loglik_function(self, params, *args):
         return self._loglik_gradient(params, *args)
 
-    def _run_optimization(self, XX, y, dispersion, initial_params, bounds, tol, mod):
+    def _run_optimization(self, XX, y, dispersion, initial_params, bounds, tol, mod, maxiter):
         """
         Run the optimization process with draws logic and update the Solution object.
 
@@ -5971,19 +5971,20 @@ class ObjectiveFunction(object):
             Solution object with updated objectives.
         """
         # Extract relevant data
-        X, Xr, XG = mod.get('X'), mod.get('Xr'), mod.get('XG')
+        X, Xr, XG, XH= mod.get('X'), mod.get('Xr'), mod.get('XG'), mod.get('XH')
         distribution = mod.get('dist_fit')
 
         # Prepare draws
         draws = self._prepare_draws(Xr, distribution)
         draws_grouped = self._prepare_grouped_draws(XG, mod) if XG is not None else None
-
+        mod = self._prepare_hetro(mod)
         # Optimization method and options
         method = self.method_ll if bounds is None else 'L-BFGS-B'
         
 
         #method = 'Nelder-Mead-BFGS'
-        options = {'gtol': tol['gtol'], 'ftol': tol['ftol'], 'maxiter': 20000}
+        
+        options = {'gtol': tol['gtol'], 'ftol': tol['ftol'], 'maxiter': maxiter}
         args=(
                 X, y, draws, X, Xr, self.batch_size, self.grad_yes, self.hess_yes, dispersion, 0, False, 0,
                 self.rdm_cor_fit, None, None, draws_grouped, XG, mod
@@ -6329,7 +6330,7 @@ class ObjectiveFunction(object):
 
         return initial_params
     
-    def fitRegression(self, mod, dispersion=0, maxiter=20000, batch_size=None, num_hess=False, **kwargs):
+    def fitRegression(self, mod, dispersion=0, maxiter=20, batch_size=None, num_hess=False, **kwargs):
         """
         Fits a Poisson regression, NB regression (dispersion=1), or GP regression (dispersion=2).
 
@@ -6367,7 +6368,7 @@ class ObjectiveFunction(object):
        
             # Run optimization
             optimization_result = self._run_optimization(
-                XX, y, dispersion, initial_params, bounds, tol, mod
+                XX, y, dispersion, initial_params, bounds, tol, mod, maxiter=maxiter
             )
             
             # Post-process results
@@ -6450,6 +6451,27 @@ class ObjectiveFunction(object):
         return self.prepare_halton(
             n_random_effects, n_samples, self.Ndraws, distribution, long=False, slice_this_way=self.group_halton
         )
+    
+    def _prepare_hetro(self, mod):
+        if 'XH' in mod and len(mod.get('hetro_hold')) > 0:
+
+            XH = mod.get('XH')
+
+            styd = list(mod.get('hetro_hold').keys())
+
+            nh, ph, ______ = XH.shape
+            kgh = len(mod.get('hetro_hold'))
+            draws_hetro = self.prepare_halton(kgh, nh, self.Ndraws, styd, slice_this_way=self.group_halton)
+            mod['draws_hetro'] = draws_hetro.copy()
+            if self.is_multi:
+                XHtest = mod.get('XH_test')
+                nht, pht, ______ = XHtest.shape
+                draws_hetro_test = self.prepare_halton(kgh, nht, self.Ndraws, styd,
+                                                    slice_this_way=self.group_halton_test)
+                mod['draws_hetro_test'] = draws_hetro_test.copy()
+        return mod
+
+
 
     def _prepare_grouped_draws(self, XG, mod):
         """
@@ -7290,7 +7312,7 @@ class ObjectiveFunction(object):
                 X_h_test = df_test[:, :, indices_hetro]
                 x_h_storage_test.append(X_h_test)
         model_nature['x_h_storage'] = x_h_storage
-        model_nature['transfrom_hetro'] = transform_hetro
+        model_nature['transform_hetro'] = transform_hetro
         model_nature['x_h_storage_test'] = x_h_storage_test
 
         if hasattr(self, 'group_dummies'):

{metacountregressor-0.1.312 → metacountregressor-0.1.314/metacountregressor.egg-info}/PKG-INFO

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

metacountregressor-0.1.314/version.txt

@@ -0,0 +1 @@
+0.1.314

metacountregressor-0.1.312/version.txt

@@ -1 +0,0 @@
-0.1.312