metacountregressor 0.1.204__tar.gz → 0.1.206__tar.gz

{metacountregressor-0.1.204 → metacountregressor-0.1.206}/PKG-INFO

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

{metacountregressor-0.1.204 → metacountregressor-0.1.206}/metacountregressor/helperprocess.py

@@ -415,7 +415,7 @@ def PCA_code(X, n_components=5):
     return principalComponents
 
 
-def interactions(df, keep=None, drop_this_perc=0.6, interact = False):
+def interactions(df, keep=None, drop_this_perc=0.5, interact = False):
     full_columns = df.columns
     if interact:
         interactions_list = []

{metacountregressor-0.1.204 → metacountregressor-0.1.206}/metacountregressor/metaheuristics.py

@@ -275,6 +275,13 @@ def harmony_search(objective_function, initial_harmonies=None, hyperparameters=N
     Returns:
         _type_: results for the harmony search algorithm in single or multi objective
     """
+    #set up objective function hyper
+    if kwargs.get('_hms') is not None:
+        objective_function._hms = kwargs.get('_hms')
+    if kwargs.get('_hmcr') is not None:
+        objective_function._hmcr = kwargs.get('_hmcr')
+
+
     man = None
     if 'Manual_Fit' in kwargs:
         if kwargs['Manual_Fit'] is not None:

{metacountregressor-0.1.204 → metacountregressor-0.1.206}/metacountregressor/solution.py

@@ -150,7 +150,7 @@ class ObjectiveFunction(object):
         self.rdm_fit = None
         self.rdm_cor_fit = None
         self.dist_fit = None
-
+        self.rounding_point = kwargs.get('decimals_in_coeff', 2)
         self.MAE = None
         self.best_obj_1 = 1000000.0
         self._obj_1 = kwargs.get('_obj_1', 'bic') 
@@ -160,18 +160,18 @@ class ObjectiveFunction(object):
         self.GP_parameter = 0
         self.is_multi = kwargs.get('is_multi', False)
         self.complexity_level = kwargs.get('complexity_level', 6)
-        self._max_iterations_improvement = 10000
+        self._max_iterations_improvement = kwargs.get("WIC",10000)
         self.generated_sln = set()
         self.ave_mae = 0
         # defalt paramaters for hs #TODO unpack into harmony search class
         self.algorithm = 'hs'  # 'sa' 'de' also avialable
         self._hms = 20
-        self._max_time = 60 * 60 * 24
-        self._hmcr = .5
+        self._max_time = kwargs.get('_max_time',.60 * 60 * 24)
+        self._hmcr = kwargs.get('_hmcr',.5)
         self._par = 0.3 #dont think this gets useted
         self._mpai = 1
         self._max_imp = 100000
-        self._WIC = 1000  # Number of Iterations without Multiobjective Improvement #tod chuck into solution
+        self._WIC =  kwargs.get("WIC",10000) # Number of Iterations without Multiobjective Improvement #tod chuck into solution
         self._panels = None
         self.is_multi = True
         self.method_ll = 'Nelder-Mead-BFGS'
@@ -1146,7 +1146,8 @@ class ObjectiveFunction(object):
                     print(np.exp(self.coeff_[-1]))
                     #self.coeff_[-1] = np.exp(self.coeff_[-1])  # min possible value for negbinom
 
-            self.coeff_ = [self.round_with_padding(x, 2) for x in self.coeff_]
+
+            self.coeff_ = [self.round_with_padding(x, self.rounding_point) for x in self.coeff_]
 
             self.stderr = [self.round_with_padding(x, 2) for x in self.stderr]
             self.zvalues = [self.round_with_padding(
@@ -1945,11 +1946,11 @@ class ObjectiveFunction(object):
 
         else:
             slice_this_amount = self.num_dispersion_params(dispersion)
-            slice_this_amount = 1 #TODO handle this
+            slice_this_amount = 0 #TODO handle this
             if pvalues[-1] > sig_value:
                 vio_counts += 1
             subpvalues = pvalues[:-slice_this_amount].copy()
-
+            
         if Kh > 1:
             if subpvalues[-1] < sig_value:
                 subpvalues[-Kh] = 0
@@ -6436,10 +6437,13 @@ class ObjectiveFunction(object):
                 if not is_delete and is_halton:
                     if obj_1[self._obj_1] <= self.best_obj_1:
                         self.pvalue_sig_value = .1
-
-                    st, self.pvalue_exceed = self.get_pvalue_info_alt(
-                        pvalues, self.coeff_names, self.pvalue_sig_value, dispersion, is_halton, 0, 1)
-
+                    try:
+                        st, self.pvalue_exceed = self.get_pvalue_info_alt(
+                            pvalues, self.coeff_names, self.pvalue_sig_value, dispersion, is_halton, 0, 1)
+                    except Exception as pval_exe:
+                        print(pval_exe)
+                        self.pvalue_exceed = sum(
+                        a > self.pvalue_sig_value for a in pvalues)
                 else:
                     self.pvalue_exceed = sum(
                         a > self.pvalue_sig_value for a in pvalues)

{metacountregressor-0.1.204 → metacountregressor-0.1.206}/metacountregressor.egg-info/PKG-INFO

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