metacountregressor 0.1.236__py3-none-any.whl → 0.1.237__py3-none-any.whl

metacountregressor/solution.py

@@ -481,7 +481,14 @@ class ObjectiveFunction(object):
 
             model_types = [[0, 1]]  # add 2 for Generalized Poisson
             #model_types = [[0]]
-            #TODO change back and fix NB
+        
+        if kwargs.get('linear_model', None) is not None:
+            model_types = [[0]]
+            self.grad_yes = False
+            
+            print(f'Linear Model Selected: turning off gradient calculation')
+
+
         model_t_dict = {'Poisson':0,
                         "NB":1}
         # Retrieve the keys (model names) corresponding to the values in model_types
@@ -4624,7 +4631,7 @@ class ObjectiveFunction(object):
                     betas, dispersion) 
                 
 
-                eVd = self.eXB_calc(Bf, Xd, offset, main_disper, kwargs.get('linear_model'))
+                eVd = self.eXB_calc(Bf, Xd, offset, main_disper, self.linear_regression)
 
                 if return_EV is True:
                     return eVd
@@ -4637,7 +4644,7 @@ class ObjectiveFunction(object):
 
                     betas[-1] = main_disper
 
-                if kwargs.get('linear_model'):
+                if self.linear_regression:
                     # LINEAR MODEL PROCESS
                     mse = np.mean((y - eVd) ** 2)
                     return mse
@@ -4873,10 +4880,10 @@ class ObjectiveFunction(object):
                 betas_hetro_sd = None
 
             Vdr = dev.cust_einsum("njk,nkr -> njr", Xdr, Br)  # (N,P,R)
-            if kwargs.get('linear_model'):
+            if self:
                 ### LINEAR MODEL WAY #######
                 eVd = np.clip(
-                Vdf[:, :, None] + Vdr + Vdh + dev.np.array(offset), None, EXP_UPPER_LIMIT)
+                Vdf[:, :, None] + Vdr + Vdh + dev.np.array(offset), None, None)
                 mse = np.mean((y - eVd) ** 2)
                 return mse
 

{metacountregressor-0.1.236.dist-info → metacountregressor-0.1.237.dist-info}/METADATA

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

{metacountregressor-0.1.236.dist-info → metacountregressor-0.1.237.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=8zrVViDUEYWPjzVABupLWWASbluPAGcV9wTc34yCndM,282805
+metacountregressor/solution.py,sha256=4TCa87mLfBtCY2APrfZYsOkw5MDf_rsjErWPW_NgJgc,282948
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.236.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.236.dist-info/METADATA,sha256=UeYMGxvHWJyvX8RrLCHLOlBNNENMZ0j5dufwyqEvbYo,23529
-metacountregressor-0.1.236.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-metacountregressor-0.1.236.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.236.dist-info/RECORD,,
+metacountregressor-0.1.237.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.237.dist-info/METADATA,sha256=o8WsXzCVVEte5uzaR1_-XjOZ4rDdKMGf9KI3w9TJTX8,23529
+metacountregressor-0.1.237.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+metacountregressor-0.1.237.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.237.dist-info/RECORD,,