metacountregressor 0.1.206__py3-none-any.whl → 0.1.207__py3-none-any.whl

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/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/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(

{metacountregressor-0.1.206.dist-info → metacountregressor-0.1.207.dist-info}/METADATA

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

{metacountregressor-0.1.206.dist-info → metacountregressor-0.1.207.dist-info}/RECORD

@@ -3,18 +3,18 @@ metacountregressor/_device_cust.py,sha256=759fnKmTYccJm4Lpi9_1reurh6OB9d6q9soPR0
 metacountregressor/app_main.py,sha256=vY3GczTbGbBRalbzMkl_9jVW7RMgEOc6z2Dr1IZJv9c,10014
 metacountregressor/data_split_helper.py,sha256=M2fIMdIO8znUaYhx5wlacRyNWdQjNYu1z1wkE-kFUYU,3373
 metacountregressor/halton.py,sha256=jhovA45UBoZYU9g-hl6Lb2sBIx_ZBTNdPrpgkzR9fng,9463
-metacountregressor/helperprocess.py,sha256=dfNLJzsl58YHWPa_--m1Wg6ttPubHc-m_DAxFI0rouA,22157
+metacountregressor/helperprocess.py,sha256=_g5j-p5cC5ajqdG0Ab1cSLR-CkzLBCcreIGPCZK1G9s,22157
 metacountregressor/main.py,sha256=xfpKN2w0kePHp_Q2HOPjtG15PLEN1L3sEnDw1PHBquw,23668
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
-metacountregressor/metaheuristics.py,sha256=rIdBa28EroIYqoE8ZI1isuj_o-tOWHo6jKi1HQJ06lU,106292
+metacountregressor/metaheuristics.py,sha256=N8RwP7Y7aNkSOxCusLwtcCx357RlDkVz84haxaQGwXc,106518
 metacountregressor/pareto_file.py,sha256=whySaoPAUWYjyI8zo0hwAOa3rFk6SIUlHSpqZiLur0k,23096
 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=B_0mwg4wofCsfVbRS7zs40D4XVRxOENEj3b4mrwFG10,283216
+metacountregressor/solution.py,sha256=51_7HM-wKMsHPrp-TyMFqvA5MQJfN63gE58R1QNbVUk,283381
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.206.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.206.dist-info/METADATA,sha256=keP2CNJst6HvIpNDElkQu7LaLlcgTqiVjhsPJpf61WM,23536
-metacountregressor-0.1.206.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-metacountregressor-0.1.206.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.206.dist-info/RECORD,,
+metacountregressor-0.1.207.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.207.dist-info/METADATA,sha256=7PVaRp9kVHTlyax6tuLps9hwpBbgQKWbVCSmyv817u4,23536
+metacountregressor-0.1.207.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+metacountregressor-0.1.207.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.207.dist-info/RECORD,,