metacountregressor 0.1.33__py3-none-any.whl → 0.1.34__py3-none-any.whl

metacountregressor/solution.py

@@ -276,7 +276,7 @@ class ObjectiveFunction(object):
             
         self._characteristics_names = list(self._x_data.columns)
         #self._characteristics_names = [x for x in self._characteristics_names if not 'ID' in x]
-        print('to do, drop the id and panels')
+        
         
         self._max_group_all_means = 1
         
@@ -907,6 +907,10 @@ class ObjectiveFunction(object):
     def round_with_padding(self, value, round_digits):
         return(format(np.round(value, round_digits), "."+str(round_digits)+"f"))
 
+    def round_with_scientific(self, value, round_digits):
+        return(format(np.round(value, round_digits), "."+str(round_digits)+"f"))
+        
+    
     def get_dispersion_name(self, dispersion=0):
         if dispersion == 0:
             return []
@@ -960,15 +964,20 @@ class ObjectiveFunction(object):
                 big_hetro = [item for sublist in hetro_names_for for item in sublist]
                 name_hetro = list(model_nature['hetro_hold'].keys())
                 hetro_long= []
+                hetro_std = []
                 
-                for i in name_hetro:
-                    hetro = [f"{j}: hetro" for j in  model_nature['hetro_hold'][i]]
-                    hetro.append(f"{hetro[0]}:{i}:sd  hetro")
+                for n, i in enumerate(name_hetro):
+                    hetro = [f"{j}: hetro group {n}" for j in  model_nature['hetro_hold'][i]]
+                    hetro = [f"main: {j}: hetro group {n}" if idx == 0 else f"{j}: hetro group {n}" for idx, j in enumerate(model_nature['hetro_hold'][i])]
+                    hetro_std.append(f"{hetro[0]}:{i}:sd  hetro group {n}")
                     hetro_long = hetro_long +hetro
                     
                 abct = []
+                hetro_long = hetro_long + hetro_std
+                for i in model_nature['transfrom_hetro']:
+                    abct = abct + i 
                 for i in model_nature['transfrom_hetro']:
-                    abct = abct + i + ['']
+                    abct = abct + ['']
             else:
                 big_hetro = []
                 hetro_long = []  
@@ -1065,19 +1074,26 @@ class ObjectiveFunction(object):
         if not isinstance(self.pvalues, np.ndarray):
             raise Exception
 
+        
+        self.pvalues= [self.round_with_padding(x, 2) for x in self.pvalues]
+        #self.pvalues= [self.round_with_scientific(x, 2) for x in self.pvalues]
+        
         for i in range(len(self.coeff_)):
             signif = ""
-           
+        
             if self.pvalues[i] < 0.01:
                 signif = "***"
             elif self.pvalues[i] < 0.05:
                 signif = "**"
             elif self.pvalues[i] < 0.1:
                 signif = "*"
+                
+            ''' 
             print(fmt.format(self.coeff_names[i][:coeff_name_str_length], self.print_transform[i], self.coeff_[i],
-                             self.stderr[i], self.zvalues[i], self.pvalues[i],
-                             signif
-                             ))
+                            self.stderr[i], self.zvalues[i], self.pvalues[i],
+                            signif
+                            ))
+                            '''
 
         if not self.convergence:
             print("-" * 50)
@@ -1156,7 +1172,7 @@ class ObjectiveFunction(object):
                     caption_parts.append(f"MSPE: {self.round_with_padding(self.MAE, 2)}")
 
                 caption = " ".join(caption_parts)
-                print(latextable.draw_latex(table, caption=caption, caption_above = True))
+                #print(latextable.draw_latex(table, caption=caption, caption_above = True))
                 if solution is None:
                     file_name = self.instance_number + "/sln" + \
                         "_with_BIC_"+str(self.bic)+".tex"
@@ -1165,7 +1181,7 @@ class ObjectiveFunction(object):
                         str(solution['sol_num']) + \
                         "_with_BIC_"+str(self.bic)+".tex"
                 self.save_to_file(latextable.draw_latex(
-                    table, caption=caption), file_name)
+                    table, caption=caption, caption_above = True), file_name)
                 
                 
                 #print('change this')
@@ -5770,12 +5786,20 @@ class ObjectiveFunction(object):
                                 bounds = bounds + [(i-5, i+5)]            
                         '''           
                         Kf_a, Kr_a, Kr_c, Kr_b_a, Kchol_a, Kh, zi_terms_a = self.get_num_params()
-
+                        if Kh > 0:
+                            Kh_e = mod.get('XH').shape[-1]
+                            Kh_range = Kh-Kh_e
+                        else:
+                            Kh_e = 0
+                            Kh_rannge = 0
                         sum1 = Kf_a + Kr_a + Kr_c
-                        sum2 = sum1 + Kr_b_a
+                        sumk = sum1 +Kh_e
+                        sum2 = sumk + Kr_b_a
                         sum3 = sum2 + Kchol_a
+                        sum4 = sum3 +Kh
 
                         bounds = []
+                        bounds_k = []
                         bob = b[0:sum2]
                         bob2 = b[sum2:sum3]
                         if dispersion ==1 or dispersion ==2:
@@ -5786,6 +5810,9 @@ class ObjectiveFunction(object):
                         for j, i in enumerate(bob):
                             if j < sum1:
                                 bounds.append((i-15, i+15))
+                            elif j < sumk:
+                                bounds_k.append(i)
+                                
                             elif j < sum2:
                                 bounds.append((0.1, i+7))
                         
@@ -5811,6 +5838,12 @@ class ObjectiveFunction(object):
                             count = 0
                             bounds.append((0.1,bob2[count]+5))
                             
+                        if Kh > 0:
+                            for bbb in bounds_k:
+                                bounds.append((bbb-15, bbb+15))
+                            for bbb in range(Kh_range):
+                                bounds.append((.1, 5))    
+                            
                                             
                                 
                                 
@@ -5908,7 +5941,7 @@ class ObjectiveFunction(object):
                     if dispersion ==1:
                         mod['dispersion_penalty'] = abs(b[-1])
                     
-                    betas_est = self._minimize(self._loglik_gradient, b,  args=(X, y, draws, X, Xr, self.batch_size, False, False, dispersion, 0, False, 0, self.rdm_cor_fit, self.zi_fit, exog_infl, draws_grouped, XG, mod),
+                    betas_est = self._minimize(self._loglik_gradient, b,  args=(X, y, draws, X, Xr, self.batch_size, True, True, dispersion, 0, False, 0, self.rdm_cor_fit, self.zi_fit, exog_infl, draws_grouped, XG, mod),
                                                method=method2, tol=tol['ftol'],
                                                options={'gtol': tol['gtol']}, bounds = bounds)
                    # betas_est = self._minimize(self._loglik_gradient, b,  args=(X, y, draws, X, Xr, self.batch_size, True, True, dispersion, 0, False, 0, self.rdm_cor_fit, self.zi_fit, exog_infl,  draws_grouped, XG, mod),
@@ -6572,11 +6605,11 @@ class ObjectiveFunction(object):
        
         
         alpha_cor_rdm = np.isin(select_data, [item.split(':')[0] for item in data.get('rdm_cor_terms', [])]).astype(int).tolist()
-        print(alpha_cor_rdm)
+       
         alpha_group_rdm = np.isin(select_data, data.get('group_rdm', [])).astype(int).tolist()
         alpha_hetro = np.isin(select_data, [item.split(':')[0] for item in data.get('hetro_in_means', [])]).astype(int).tolist()
         for i in range(len(alpha_rdm)):
-            print(alpha_cor_rdm)
+            
             if alpha[i]:
                 fixed_transforms.append(data['transformations'][jc+ja+jb+j])
                 fixed_terms_subset.append('normal')

{metacountregressor-0.1.33.dist-info → metacountregressor-0.1.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: metacountregressor
-Version: 0.1.33
+Version: 0.1.34
 Summary: A python package for count regression of rare events assisted by metaheuristics
 Author: zahern
 Author-email: zeke.ahern@hdr.qut.edu.au

{metacountregressor-0.1.33.dist-info → metacountregressor-0.1.34.dist-info}/RECORD

@@ -38,7 +38,7 @@ metacountregressor/set_data.csv,sha256=2LEtfJXHK9Jh3YZ_MpBt6TUGWWk-zsXIyI9PnH_Ye
 metacountregressor/set_data_s.csv,sha256=hELwnv6RjpmXcMheFafwrYbLbyYE21hFKyqJhA8L05o,11111
 metacountregressor/setup.py,sha256=CpbdBScFhvStc6WByFiAlP7T5wGdWetsLI8X5JRRpP4,268
 metacountregressor/single_objective_finder.py,sha256=QYXUpxJp7-ul5ZiIKGgYGaH_yFFGUbI7X3yKu5asogE,1960
-metacountregressor/solution.py,sha256=ULUjgXLKUn-unMsseCDreIwvv4_tTTeM2MkH6RlLjjo,290351
+metacountregressor/solution.py,sha256=tUd2f36cN60D6FOjIVZJfaWLi7yFhAVGLgFRPcBycZo,291869
 metacountregressor/Stage5A_1848_All_Initial_Columns.csv,sha256=uwsadEyupgIH1w5f8vnlwlo13ryww3VCGYlOnN0dEL0,188769
 metacountregressor/Stage5A_1848_All_Initial_Columns.xlsx,sha256=5U5Ab1jjGi5qoKp06Bw2tpdPjGaDGoyt5976AAFdEbs,699231
 metacountregressor/synth_dataset_generator.ipynb,sha256=caBMQJOaeINPZJw5aTsSOXhmenSqrpS7GycINAzUUxs,27153
@@ -48,6 +48,6 @@ metacountregressor/testML.R,sha256=UbTsLFUhoJG9bJnU2rbUKlfcprAkROnhREK41qKzbvQ,2
 metacountregressor/TestSetFake.csv,sha256=JPYAWYLAw7rgQHdGTz0rltMfapX8QYt3BVSyK_D-Lzg,1640
 metacountregressor/ThaiAccident.csv,sha256=NIi_uPyo5u-B6Hj0Ln9xuJ8fnvGbWK9GLdTWdpG5uug,418202
 metacountregressor/tk_app.py,sha256=0UM76hpQ-ha96ma_Z5ryxYQUSdF4PJBCsLuI1EGu6_E,59490
-metacountregressor-0.1.33.dist-info/METADATA,sha256=yAVqCOFeUdZhARSH5jb6XwGXgWDXZTNWJxbqYZCAyVc,3391
-metacountregressor-0.1.33.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-metacountregressor-0.1.33.dist-info/RECORD,,
+metacountregressor-0.1.34.dist-info/METADATA,sha256=KVCPwaZPaSW7ETzwDlOhAR419gwNidItaPth5Ai_dWE,3391
+metacountregressor-0.1.34.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+metacountregressor-0.1.34.dist-info/RECORD,,