metacountregressor 0.1.312__tar.gz → 0.1.313__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. {metacountregressor-0.1.312/metacountregressor.egg-info → metacountregressor-0.1.313}/PKG-INFO +1 -1
  2. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/solution.py +5 -4
  3. {metacountregressor-0.1.312 → metacountregressor-0.1.313/metacountregressor.egg-info}/PKG-INFO +1 -1
  4. metacountregressor-0.1.313/version.txt +1 -0
  5. metacountregressor-0.1.312/version.txt +0 -1
  6. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/LICENSE.txt +0 -0
  7. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/MANIFEST.in +0 -0
  8. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/README.md +0 -0
  9. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/README.rst +0 -0
  10. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/__init__.py +0 -0
  11. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/_device_cust.py +0 -0
  12. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/app_main.py +0 -0
  13. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/data_split_helper.py +0 -0
  14. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/halton.py +0 -0
  15. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/helperprocess.py +0 -0
  16. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/main.py +0 -0
  17. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/main_old.py +0 -0
  18. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/metaheuristics.py +0 -0
  19. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/pareto_file.py +0 -0
  20. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/pareto_logger__plot.py +0 -0
  21. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/setup.py +0 -0
  22. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/single_objective_finder.py +0 -0
  23. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor/test_generated_paper2.py +0 -0
  24. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor.egg-info/SOURCES.txt +0 -0
  25. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor.egg-info/dependency_links.txt +0 -0
  26. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor.egg-info/not-zip-safe +0 -0
  27. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor.egg-info/requires.txt +0 -0
  28. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/metacountregressor.egg-info/top_level.txt +0 -0
  29. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/setup.cfg +0 -0
  30. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/setup.py +0 -0
  31. {metacountregressor-0.1.312 → metacountregressor-0.1.313}/tests/test.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: metacountregressor
3
- Version: 0.1.312
3
+ Version: 0.1.313
4
4
  Summary: Extensive Testing for Estimation of Data Count Models
5
5
  Home-page: https://github.com/zahern/CountDataEstimation
6
6
  Author: Zeke Ahern
@@ -5954,7 +5954,7 @@ class ObjectiveFunction(object):
5954
5954
  def hessian_loglik_function(self, params, *args):
5955
5955
  return self._loglik_gradient(params, *args)
5956
5956
 
5957
- def _run_optimization(self, XX, y, dispersion, initial_params, bounds, tol, mod):
5957
+ def _run_optimization(self, XX, y, dispersion, initial_params, bounds, tol, mod, maxiter):
5958
5958
  """
5959
5959
  Run the optimization process with draws logic and update the Solution object.
5960
5960
 
@@ -5983,7 +5983,8 @@ class ObjectiveFunction(object):
5983
5983
 
5984
5984
 
5985
5985
  #method = 'Nelder-Mead-BFGS'
5986
- options = {'gtol': tol['gtol'], 'ftol': tol['ftol'], 'maxiter': 20000}
5986
+
5987
+ options = {'gtol': tol['gtol'], 'ftol': tol['ftol'], 'maxiter': maxiter}
5987
5988
  args=(
5988
5989
  X, y, draws, X, Xr, self.batch_size, self.grad_yes, self.hess_yes, dispersion, 0, False, 0,
5989
5990
  self.rdm_cor_fit, None, None, draws_grouped, XG, mod
@@ -6329,7 +6330,7 @@ class ObjectiveFunction(object):
6329
6330
 
6330
6331
  return initial_params
6331
6332
 
6332
- def fitRegression(self, mod, dispersion=0, maxiter=20000, batch_size=None, num_hess=False, **kwargs):
6333
+ def fitRegression(self, mod, dispersion=0, maxiter=20, batch_size=None, num_hess=False, **kwargs):
6333
6334
  """
6334
6335
  Fits a Poisson regression, NB regression (dispersion=1), or GP regression (dispersion=2).
6335
6336
 
@@ -6367,7 +6368,7 @@ class ObjectiveFunction(object):
6367
6368
 
6368
6369
  # Run optimization
6369
6370
  optimization_result = self._run_optimization(
6370
- XX, y, dispersion, initial_params, bounds, tol, mod
6371
+ XX, y, dispersion, initial_params, bounds, tol, mod, maxiter=maxiter
6371
6372
  )
6372
6373
 
6373
6374
  # Post-process results
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: metacountregressor
3
- Version: 0.1.312
3
+ Version: 0.1.313
4
4
  Summary: Extensive Testing for Estimation of Data Count Models
5
5
  Home-page: https://github.com/zahern/CountDataEstimation
6
6
  Author: Zeke Ahern
@@ -0,0 +1 @@
1
+ 0.1.313
@@ -1 +0,0 @@
1
- 0.1.312