metacountregressor 0.1.304__tar.gz → 0.1.306__tar.gz

{metacountregressor-0.1.304/metacountregressor.egg-info → metacountregressor-0.1.306}/PKG-INFO

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

{metacountregressor-0.1.304 → metacountregressor-0.1.306}/metacountregressor/solution.py

@@ -611,11 +611,12 @@ class ObjectiveFunction(object):
         Function to for proceccing testing, and finding a suitable initial coefficient (linear intercept)
         """
         if hard_code:
+            # Grouped Terns TODO
             manual_fit_spec = {
                 'fixed_terms': ['Constant', 'US', 'RSMS', 'MCV'],
                 'rdm_terms': ['RSHS:normal', 'AADT:normal', 'Curve50:normal'],
                 'rdm_cor_terms': [],
-                'grouped_terms': [],
+                'group_rdm': [],
                 'hetro_in_means': [],
                 'transformations': ['no', 'log', 'log', 'no', 'no', 'no', 'no'],
                 'dispersion': 1
@@ -637,7 +638,7 @@ class ObjectiveFunction(object):
                         'fixed_terms': ['const'],
                         'rdm_terms': [],
                         'rdm_cor_terms': [],
-                        'grouped_terms': [],
+                        'group_rdm': [],
                         'hetro_in_means': [],
                         'transformations': ['no'],
                         'dispersion': 1
@@ -6225,7 +6226,7 @@ class ObjectiveFunction(object):
         # Dispersion adds one additional parameter if enabled
         dispersion_param = 1 if dispersion > 0 else 0
         return sum(self.get_num_params()) + dispersion_param
-        #return k + kr + kg + kh + dispersion_param
+       
     def _build_initial_params(self, num_coefficients, dispersion):
         """
         Build the initial parameter array for optimization.
@@ -6238,11 +6239,11 @@ class ObjectiveFunction(object):
             Initial parameter array.
         """
         # Generate random initial coefficients
-        initial_params = np.random.uniform(-.1, 0.1, size=num_coefficients)
+        initial_params = np.random.uniform(0.0000, 0.01, size=num_coefficients)
         parma_sum = sum(self.get_num_params()[:2])
        
                        
-        initial_params[parma_sum:-dispersion] =0.5
+        initial_params[parma_sum:-dispersion] =0.0001
 
         # Add dispersion parameter if applicable
         if dispersion > 0:
@@ -6251,7 +6252,7 @@ class ObjectiveFunction(object):
 
         return initial_params
     
-    def fitRegression(self, mod, dispersion=0, maxiter=4000, batch_size=None, num_hess=False, **kwargs):
+    def fitRegression(self, mod, dispersion=0, maxiter=20000, batch_size=None, num_hess=False, **kwargs):
         """
         Fits a Poisson regression, NB regression (dispersion=1), or GP regression (dispersion=2).
 
@@ -6296,7 +6297,7 @@ class ObjectiveFunction(object):
             log_lik, aic, bic, stderr, zvalues, pvalues, in_sample_mae, out_sample_mae = self._postprocess_results(
                 optimization_result, XX, XX_test, y, mod.get('y_test'), dispersion, mod
             )
-           
+        
             # Extract other outputs
             betas = optimization_result['x'] if optimization_result is not None else None
             is_halton = Xr is not None and Xr.size > 0  # Halton draws used if `Xr` is not empty
@@ -7345,7 +7346,7 @@ class ObjectiveFunction(object):
                 obj_1[self._obj_1] = 10 ** 100
 
         else:
-            print('The model did not converge')
+            print('Did not converge')
             obj_1[self._obj_1] = 10 ** 100
 
             self.significant = 3

{metacountregressor-0.1.304 → metacountregressor-0.1.306/metacountregressor.egg-info}/PKG-INFO

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

metacountregressor-0.1.306/version.txt

@@ -0,0 +1 @@
+0.1.306

metacountregressor-0.1.304/version.txt

@@ -1 +0,0 @@
-0.1.304