metacountregressor 0.1.123__tar.gz → 0.1.125__tar.gz

{metacountregressor-0.1.123 → metacountregressor-0.1.125}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.123
+Version: 0.1.125
 Summary: Extensions for a Python package for estimation of count models.
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern

{metacountregressor-0.1.123 → metacountregressor-0.1.125}/metacountregressor/helperprocess.py

@@ -311,14 +311,26 @@ def interactions(df, keep=None, drop_this_perc=0.6, interact = False):
         df = pd.concat([df, df_interactions], axis=1, sort=False)
 
     # second
-    corr_matrix = df.corr().abs()
+    # Remove `keep` columns from the correlation matrix
+    if keep is not None:
+        df_corr = df.drop(columns=keep, errors='ignore')  # Exclude `keep` columns
+    else:
+        df_corr = df
+
+    # Compute the absolute correlation matrix
+    corr_matrix = df_corr.corr().abs()
+
+    # Keep only the upper triangle of the correlation matrix
     upper = corr_matrix.where(np.triu(np.ones(corr_matrix.shape), k=1).astype(bool))
 
-    # Find features with correlation greater than 0.6
+    # Find features with correlation greater than the threshold
     to_drop = [column for column in upper.columns if any(upper[column] > drop_this_perc)]
+
+    # Ensure `keep` columns are not dropped
     if keep is not None:
         to_drop = [column for column in to_drop if column not in keep]
-    # Drop features
+
+    # Drop the identified features
     df.drop(to_drop, axis=1, inplace=True)
 
     return df

{metacountregressor-0.1.123 → metacountregressor-0.1.125}/metacountregressor/solution.py

@@ -2983,7 +2983,7 @@ class ObjectiveFunction(object):
         argument = prob.mean(axis=1)
         # if less than 0 penalise
         if np.min(argument) < 0:
-            print('what the fuck')
+            print('Error with args..')
         if np.min(argument) < limit:
             # add a penalty for too small argument of log
             log_lik += -np.sum(np.minimum(0.0, argument - limit)) / limit
@@ -3634,7 +3634,7 @@ class ObjectiveFunction(object):
             #print("Custom functieon time:", end_time - start_time)
 
         except Exception as e:
-            print(e)
+            print("Neg Binom error.")
         return gg_alt
 
     def lindley_pmf(self, x, r, theta, k=50):
@@ -3968,7 +3968,7 @@ class ObjectiveFunction(object):
 
 
         # proba_d = self.dnegbimonli(y, eVd, b_gam )
-        # print('fuck if this actually works')
+
 
         elif dispersion == 2:
 

{metacountregressor-0.1.123 → metacountregressor-0.1.125}/metacountregressor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.123
+Version: 0.1.125
 Summary: Extensions for a Python package for estimation of count models.
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern