metacountregressor 0.1.350__py3-none-any.whl → 1.0.5__py3-none-any.whl

metacountregressor/solution.py

@@ -171,7 +171,7 @@ class ObjectiveFunction(object):
         # defalt paramaters for hs #TODO unpack into harmony search class
         self.algorithm = kwargs.get('algorithm', 'hs')  # 'sa' 'de' also avialable
         self._hms = 20
-        self._max_time = kwargs.get('_max_time', 0.8* 60 * 60 * 24)
+        self._max_time = self._max_time = kwargs.get('_max_time', kwargs.get('MAX_TIME', 0.8 * 60 * 60 * 24))
         self._hmcr = kwargs.get('_hmcr', .5)
         self._par = 0.3 #dont think this gets useted
         self._mpai = 1
@@ -459,14 +459,12 @@ class ObjectiveFunction(object):
 
         if self.G is not None:
             #TODO need to handle this for groups
-            print('group by groups off for now')
-            NAH_GROUP = 0
-            if NAH_GROUP:
-                self._distribution = ["trad| " + item for item in self._distribution
+            
+           
+            self._distribution = ["trad| " + item for item in self._distribution
                                   ] + ["grpd| " + item for item in self._distribution]
-            else:
-                self._distribution = ["trad| " + item for item in self._distribution
-                                  ]
+        
+                                  
 
         # output information
         self.convergence = None
@@ -7229,7 +7227,7 @@ class ObjectiveFunction(object):
             if len(self.none_handler(zi)) > 0:
                 the_name = the_name + '_zi'
             if model_nature is not None:
-                if 'XG' in model_nature:
+                if 'XG' in model_nature and model_nature.get('XG') is not None:
                     if model_nature.get('XG').shape[2] > 0:
                         the_name = the_name + 'grp'
 
@@ -7302,10 +7300,11 @@ class ObjectiveFunction(object):
         if grouped_rpm is None:
             a =len(self.rdm_cor_fit)+len(self.rdm_fit) != Xr.shape[2]
         else:
-            a = len(self.none_handler(self.rdm_cor_fit)) + len(self.none_handler(self.rdm_fit)) + len(self.none_handler(grouped_rpm)) != Xr.shape[2]
+            a = len(self.none_handler(self.rdm_cor_fit)) + len(self.none_handler(self.rdm_fit)) + len(self.none_handler(grouped_rpm))*self._Gnum != Xr.shape[2]
             
         if a:
             print('why')
+
             print('The number of random effects does not match the data')
             print(Xr.shape)
             print(self.rdm_cor_fit)
@@ -7385,16 +7384,19 @@ class ObjectiveFunction(object):
                                  self.group_dummies.shape[2]) if self.grouped_rpm != [] else []
             X_set = df_tf[:, :, indices4]
             XG = np.tile(self.group_dummies, len(self.grouped_rpm)) * X_set if X_set.shape[2] != 0 else None
+            if XG is not None:
+                model_nature['XG'] = XG
+            
         else:
             XG = None
         X = df_tf[:, :, indices]
         XH = df_tf[:, :, indices5]
 
-        if XG is not None:
+        if XG is not None and self.is_multi:
             indices4_test = np.repeat(self.get_named_indices(self.grouped_rpm),
                                       self.group_dummies_test.shape[2]) if self.grouped_rpm != [] else []
             XGtest = np.tile(self.group_dummies_test, len(self.grouped_rpm)) * df_test[:, :, indices4_test]
-            model_nature['XG'] = XG
+            #model_nature['XG'] = XG
             model_nature['XGtest'] = XGtest
 
         model_nature['X'] = X
@@ -7413,7 +7415,7 @@ class ObjectiveFunction(object):
         if np.isin(X, [np.inf, -np.inf, None, np.nan]).any():  # type ignore
             raise Exception('there is some kind of error in X')
 
-        # numpy data setup fpr estimation
+        # numpy data setup for estimation
         indices2 = self.get_named_indices(self.rdm_fit)
         Xr = df_tf[:, :, indices2]
         if self.rdm_cor_fit is not None:

metacountregressor/test_code.py

@@ -0,0 +1,43 @@
+from solution import ObjectiveFunction
+from metaheuristics import (harmony_search,differential_evolution,simulated_annealing)         
+#from . import helperprocess
+import pandas as pd
+
+df = pd.read_csv("https://raw.githubusercontent.com/zahern/data/refs/heads/main/rural_int.csv")
+y = df['crashes']  # Frequency of crashes
+
+df.drop(columns=[ 'year', 'orig_ID',
+                                    'jurisdiction', 'town', 'maint_region', 'weather_station', 'dummy_winter_2', 'month', 'inj.fat', 'PDO', 'zonal_ID', 'ln_AADT', 'ln_seg'], inplace=True)  # was dropped postcode
+
+           
+
+arguments_hs = {'_par': 0.3, '_hms': 20}
+arguments = {'test_percentage': 0.2, 'complexity_level': 5, 'reg_penalty':0} #Objective args
+# Step 2: Process Data
+model_terms = {
+    'Y': 'crashes',         # Dependent variable
+    'group': 'county',       # Grouping column (if any)
+    'panels': 'element_ID',      # Panel column (if any)
+    'Offset': None       # Offset column (if any)
+}
+
+
+X = df.drop(columns=['crashes']) # setup X based on data
+X.columns
+print(X.columns)
+
+manual_fit_spec = {
+'fixed_terms': ['const', 'DP10'],
+'rdm_terms':  [ 'DX32:normal'],
+'rdm_cor_terms': [],
+'group_rdm': ['DPO1:triangular'],
+'hetro_in_means': [],
+'transformations': ['no', 'no', 'no', 'no', 'no', 'no'],
+'dispersion': 0
+}
+arguments = {'test_percentage': 0.2, 'complexity_level': 6, 'reg_penalty':0, 'group':'county', 'panels':'element_ID'} #Objective args
+arguments['Manual_Fit'] = manual_fit_spec
+#initial_solution = None
+obj_fun = ObjectiveFunction(X, y, **arguments)
+initial_solution = None
+results_hs = harmony_search(obj_fun, initial_solution, **arguments_hs)

{metacountregressor-0.1.350.dist-info → metacountregressor-1.0.5.dist-info}/METADATA

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

{metacountregressor-0.1.350.dist-info → metacountregressor-1.0.5.dist-info}/RECORD

@@ -11,10 +11,11 @@ metacountregressor/pareto_file.py,sha256=whySaoPAUWYjyI8zo0hwAOa3rFk6SIUlHSpqZiL
 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=dq67shARNDgCrJIaZ09S7rQoR9_ExHUsXEP2ZR6erkk,323918
+metacountregressor/solution.py,sha256=ZyKFq39Mug5865vZQt4G2vv-oPgsnYuyrJJJVvwO1dA,323939
+metacountregressor/test_code.py,sha256=_7Emm2JbhK_NVhxoqMhshN2JeHZtihZuSDl3Jpe7Ajk,1641
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.350.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.350.dist-info/METADATA,sha256=i09XBXK2lPTjY1IM6TK2XCIGyiESzGF9mILC82UBqIw,23620
-metacountregressor-0.1.350.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-metacountregressor-0.1.350.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.350.dist-info/RECORD,,
+metacountregressor-1.0.5.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-1.0.5.dist-info/METADATA,sha256=utJe5zUXxsSoUvcaR3bzoUPhMeu8zfIstgn16eroHlo,23618
+metacountregressor-1.0.5.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+metacountregressor-1.0.5.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-1.0.5.dist-info/RECORD,,

{metacountregressor-0.1.350.dist-info → metacountregressor-1.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any