metacountregressor 0.1.234__tar.gz → 0.1.236__tar.gz

{metacountregressor-0.1.234/metacountregressor.egg-info → metacountregressor-0.1.236}/PKG-INFO

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

{metacountregressor-0.1.234 → metacountregressor-0.1.236}/metacountregressor/helperprocess.py

@@ -5,8 +5,8 @@ import csv
 import matplotlib.pyplot as plt
 from scipy import stats as st
 from sklearn.preprocessing import StandardScaler
-
-
+import os
+import shutil
 plt.style.use('https://github.com/dhaitz/matplotlib-stylesheets/raw/master/pitayasmoothie-dark.mplstyle')
 
 
@@ -22,6 +22,30 @@ def generate_param_combinations(param_grid):
     combinations = [dict(zip(keys, v)) for v in product(*values)]
     return combinations
 
+def delete_all_folders(directory_path):
+    try:
+        # Check if the directory exists
+        if not os.path.exists(directory_path):
+            print(f"The directory '{directory_path}' does not exist.")
+            return
+
+        # Iterate through items in the directory
+        for item in os.listdir(directory_path):
+            item_path = os.path.join(directory_path, item)
+            
+            # Check if the item is a folder
+            if os.path.isdir(item_path):
+                # Use shutil.rmtree to delete the folder and its contents
+                shutil.rmtree(item_path)
+                print(f"Deleted folder: {item_path}")
+            else:
+                print(f"Skipped non-folder item: {item_path}")
+                
+        print("All folders deleted successfully.")
+    except Exception as e:
+        print(f"An error occurred: {e}")
+
+
 
 ##Select the best Features Based on RF
 def select_features(X_train, y_train, n_f=16):

{metacountregressor-0.1.234 → metacountregressor-0.1.236}/metacountregressor/solution.py

@@ -215,11 +215,14 @@ class ObjectiveFunction(object):
             print('no name set, setting name as 0')
             self.instance_number = str(0)  # set an arbitrary instance number
 
-        if not os.path.exists(self.instance_number):
-            if kwargs.get('make_directory', True):
-                print('Making a Directory, if you want to stop from storing the files to this directory set argumet: make_directory:False')
-                os.makedirs(self.instance_number)
-
+        if kwargs.get('save_directory', True):
+            self.save_state = True
+            if not os.path.exists(self.instance_number):
+                if kwargs.get('make_directory', True):
+                    print('Making a Directory, if you want to stop from storing the files to this directory set argumet: make_directory:False')
+                    os.makedirs(self.instance_number)
+        else:
+            self.save_state = False
         if not hasattr(self, '_obj_1'):
             print('_obj_1 required, define as bic, aic, ll')
             raise Exception
@@ -481,7 +484,14 @@ class ObjectiveFunction(object):
 
             model_types = [[0, 1]]  # add 2 for Generalized Poisson
             #model_types = [[0]]
-            #TODO change back and fix NB
+        
+        if self:
+            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
@@ -1221,8 +1231,9 @@ class ObjectiveFunction(object):
 
                 if save_state:
                     # print(file_name)
-                    self.save_to_file(latextable.draw_latex(
-                        table, caption=caption, caption_above=True), file_name)
+                    if self.save_state:
+                        self.save_to_file(latextable.draw_latex(
+                            table, caption=caption, caption_above=True), file_name)
 
 
 
@@ -4624,7 +4635,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 +4648,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 +4884,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.234 → metacountregressor-0.1.236/metacountregressor.egg-info}/PKG-INFO

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

metacountregressor-0.1.236/version.txt

@@ -0,0 +1 @@
+0.1.236

metacountregressor-0.1.234/version.txt

@@ -1 +0,0 @@
-0.1.234