metacountregressor 0.1.313__py3-none-any.whl → 0.1.315__py3-none-any.whl

metacountregressor/solution.py

@@ -4893,7 +4893,7 @@ class ObjectiveFunction(object):
                 Bf = betas[0:Kf]  # Fixed betas
             TEST_ME = False
             if not TEST_ME:
-                Bf, br, br_std, Br_rema = self.extract_parameters(betas, Kf, Kr, Kchol_a, Kr_b_a)
+                Bf, br, brstd, 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)
@@ -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.
 
@@ -5983,7 +5983,8 @@ class ObjectiveFunction(object):
         
 
         #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

{metacountregressor-0.1.313.dist-info → metacountregressor-0.1.315.dist-info}/METADATA

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

{metacountregressor-0.1.313.dist-info → metacountregressor-0.1.315.dist-info}/RECORD

@@ -11,10 +11,10 @@ metacountregressor/pareto_file.py,sha256=whySaoPAUWYjyI8zo0hwAOa3rFk6SIUlHSpqZiL
 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=biAgfV5X4EXhzw1vGkNec53C-6ph02WpUWPtCQJfHKc,320016
+metacountregressor/solution.py,sha256=r9BSb6Uh0JPenn675MYHexXvol6JQy_IguAN9WnQCCo,320049
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.313.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.313.dist-info/METADATA,sha256=kUz8SzD7wzpQxrwHbBSqlIqA7ZRnkJClAMvxYlZVrns,23581
-metacountregressor-0.1.313.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-metacountregressor-0.1.313.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.313.dist-info/RECORD,,
+metacountregressor-0.1.315.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.315.dist-info/METADATA,sha256=6CFlRUuRRFPIEld3n5paplu2wszAgYGl3_Mn-FAXLZ0,23581
+metacountregressor-0.1.315.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+metacountregressor-0.1.315.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.315.dist-info/RECORD,,