metacountregressor 0.1.157__py3-none-any.whl → 0.1.159__py3-none-any.whl

metacountregressor/helperprocess.py

@@ -252,11 +252,10 @@ def set_up_analyst_constraints(data_characteristic, model_terms,  variable_decis
                 row[f'Level {level}'] = level in details['levels']
 
         # Add distributions and transformations directly
-        #row['distributions'] = details['distributions']
-        #row['transformations'] = details['transformations']
+
         # Add distributions and transformations as comma-separated strings
-        row['distributions'] = str(details['distributions'])
-        row['transformations'] = str(details['transformations'])
+        row['Distributions'] = str(details['Distributions'])
+        row['Transformations'] = str(details['Transformations'])
 
         rows.append(row)
 

metacountregressor/main.py

@@ -174,16 +174,25 @@ def main(args, **kwargs):
         X = df
         y = df['FREQ']  # Frequency of crashes
         X['Offset'] = np.log(df['AADT'])  # Explicitley define how to offset the data, no offset otherwise
+        df['Offset'] = np.log(df['AADT'])
         # Drop Y, selected offset term and  ID as there are no panels
         X = df.drop(columns=['FREQ', 'ID', 'AADT'])
-
+        # Step 0: Process Data
+        model_terms = {
+            'Y': 'FREQ',  # Replace 'FREQ' with the name of your dependent variable
+            'group': None,  # Replace 'group_column' with the name of your grouping column (or None if not used)
+            'panels': None,  # Replace 'panel_column' with the name of your panel column (or None if not used)
+            'Offset': 'Offset'  # Replace None with the name of your offset column if using one
+        }
+        a_des, df = helperprocess.set_up_analyst_constraints(df, model_terms)
         # some example argument, these are defualt so the following line is just for claritity
         args = {'algorithm': 'hs', 'test_percentage': 0.15, 'test_complexity': 6, 'instance_number': 1,
-                'val_percentage': 0.15, 'obj_1': 'bic', '_obj_2': 'RMSE_TEST', "MAX_TIME": 6}
+                'val_percentage': 0.15, 'obj_1': 'bic', '_obj_2': 'RMSE_TEST', "MAX_TIME": 6, 'desicions':a_des}
         # Fit the model with metacountregressor
         # Step 5: Transform the dataset based on the configuration
-        data_new = helperprocess.transform_dataframe(dataset, config)
-        
+        #data_new = helperprocess.transform_dataframe(dataset, config)
+        y = df[['Y']]
+        X = df.drop(columns=['Y'])
         obj_fun = ObjectiveFunction(X, y, **args)
         # replace with other metaheuristics if desired
         results = harmony_search(obj_fun)
@@ -507,7 +516,7 @@ if __name__ == '__main__':
                                      formatter_class=argparse.RawDescriptionHelpFormatter, conflict_handler='resolve')
     
     
-    BATCH_JOB = True
+    BATCH_JOB = False
 
     if BATCH_JOB:
         parser.add_argument('-dataset_file', default='data/Ex-16-3.csv', help='supply the path to the dataset')

metacountregressor/solution.py

@@ -463,7 +463,7 @@ class ObjectiveFunction(object):
 
 
             model_types = [[0, 1]]  # add 2 for Generalized Poisson
-            model_types = [[0]]
+            #model_types = [[0]]
             #TODO change back and fix NB
         model_t_dict = {'Poisson':0,
                         "NB":1}

{metacountregressor-0.1.157.dist-info → metacountregressor-0.1.159.dist-info}/METADATA

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

{metacountregressor-0.1.157.dist-info → metacountregressor-0.1.159.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=tVMWinnxIeyy2hxeoIiMjFFoSNBPwBfR6TNDjWstRDc,21856
-metacountregressor/main.py,sha256=cK9Wy2udDJg9FZWZ-mbNLtEYq3uS1DLlwcWYa0XZSc8,23011
+metacountregressor/helperprocess.py,sha256=i2PkglSxBVZS-FhytCFOnIr50CdiMNe32DiIirxHMDo,21739
+metacountregressor/main.py,sha256=xfpKN2w0kePHp_Q2HOPjtG15PLEN1L3sEnDw1PHBquw,23668
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
 metacountregressor/metaheuristics.py,sha256=1Tm_BS8HxumEo9fteIwTTkfiJXbfH6wlfSmY0tSt77A,106289
 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=BdP43jX-46tJtih0Ctq62jstR2DSX20AyGJkvRbTYPY,278596
+metacountregressor/solution.py,sha256=dP5m2i1wfcu4zGYPIfPzjfXbdnYSDhf05wlJCzvUmPw,278597
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.157.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.157.dist-info/METADATA,sha256=2toe7_WLYuztHu5oSHGtx1-OdZxEJBsqOylCVmr7UoE,23434
-metacountregressor-0.1.157.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-metacountregressor-0.1.157.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.157.dist-info/RECORD,,
+metacountregressor-0.1.159.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.159.dist-info/METADATA,sha256=-Gt8oA5p_mqRSFF8DP_u_wtSoyaUIgzPpqQYdAje_mA,23434
+metacountregressor-0.1.159.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+metacountregressor-0.1.159.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.159.dist-info/RECORD,,