metacountregressor 0.1.165__tar.gz → 0.1.168__tar.gz

{metacountregressor-0.1.165 → metacountregressor-0.1.168}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.165
-Summary: Extensions for a Python package for estimation of count models.
+Version: 0.1.168
+Summary: Extensive Testing for Estimation of Data Count Models
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern
 Author-email: z.ahern@qut.edu.au
-License: QUT
+License: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -13,6 +13,10 @@ Requires-Dist: numpy>=1.13.1
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: requests
 Requires-Dist: latextable
+Requires-Dist: pandas
+Requires-Dist: scikit_learn>=1.4.1.post1
+Requires-Dist: statsmodels
+Requires-Dist: psustil
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{metacountregressor-0.1.165 → metacountregressor-0.1.168}/metacountregressor/helperprocess.py

@@ -345,8 +345,11 @@ def transform_dataframe(df, config):
 
         elif settings['type'] == 'none':
             # Leave the column unchanged
-            output_df = pd.concat([output_df, df[[column]]], axis=1)
+            if column in df.columns:
 
+                output_df = pd.concat([output_df, df[[column]]], axis=1)
+            else: 
+                print(f'config variable {column} is not in the data. Ignoring ...')
     return output_df
 
 # Helper function to guess column type and update `config`

{metacountregressor-0.1.165 → metacountregressor-0.1.168}/metacountregressor/metaheuristics.py

@@ -402,6 +402,7 @@ class DifferentialEvolution(object):
             self._obj_fun._obj_1 = 'bic'
 
         self._pop_size = kwargs.get('_pop_size', 20)
+        print('Population size is', self._pop_size)
         if not isinstance(self._pop_size, int):
             raise ValueError("_pop_size must be an integer")
         elif self._pop_size <= 3:
@@ -618,7 +619,7 @@ class DifferentialEvolution(object):
                                                                                      1)
 
                     if len(self._pareto_population) == 1:
-                        print('the size of the population is only 1')
+                        print('Pareto Population Size is only 1')
                     if self.pf.check_dominance([obj_trial[self.pf.obj_key_1], obj_trial[self.pf.obj_key_2]],
                                                [self._population[j][self.pf.obj_key_1], self._population[j][
                                                    self.pf.obj_key_2]]):  # if solution dominates existing #FIXME some error here true but not entering
@@ -1004,7 +1005,7 @@ class SimulatedAnnealing(object):
                     elif num_of_changeablePARMs == 0:
                         rdm_i = random.choice(range(len(prmVect)))
                         if self._obj_fun.get_num_discrete_values(rdm_i) <= 1:
-                            print('hold gimct')
+                            print('retry')
 
                     while self._obj_fun.get_num_discrete_values(rdm_i) <= 1:
                         rdm_i = random.randint(0, self._obj_fun.get_num_parameters() - 1)
@@ -1046,7 +1047,7 @@ class SimulatedAnnealing(object):
                             get_rdm_j = random.randint(0, self._obj_fun.get_num_discrete_values(rdm_i) - 1)
                             if (self._obj_fun.get_num_discrete_values(
                                     rdm_i) - 1) < 1:  # TODO: remove this is just a test
-                                print('fucking fix this sln algorithm')
+                               
                                 break
                             new_nbr_i = self._obj_fun.get_value(rdm_i, get_rdm_j)
                             neighbour[rdm_i] = new_nbr_i

{metacountregressor-0.1.165 → metacountregressor-0.1.168}/metacountregressor/solution.py

@@ -1075,13 +1075,15 @@ class ObjectiveFunction(object):
                                    [''] * (len(names) - len(self.transform_id_names))
             self.coeff_names = names
 
+        '''
         if betas is not None:
             try:
                 if len(betas) != len(names):
-                    print('no draws is', no_draws)
+                    print('standard_model', no_draws)
 
             except Exception as e:
                 print(e)
+        '''
 
 
 

{metacountregressor-0.1.165 → metacountregressor-0.1.168}/metacountregressor.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.2
 Name: metacountregressor
-Version: 0.1.165
-Summary: Extensions for a Python package for estimation of count models.
+Version: 0.1.168
+Summary: Extensive Testing for Estimation of Data Count Models
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern
 Author-email: z.ahern@qut.edu.au
-License: QUT
+License: MIT
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
@@ -13,6 +13,10 @@ Requires-Dist: numpy>=1.13.1
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: requests
 Requires-Dist: latextable
+Requires-Dist: pandas
+Requires-Dist: scikit_learn>=1.4.1.post1
+Requires-Dist: statsmodels
+Requires-Dist: psustil
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

metacountregressor-0.1.168/metacountregressor.egg-info/requires.txt

@@ -0,0 +1,8 @@
+numpy>=1.13.1
+scipy>=1.0.0
+requests
+latextable
+pandas
+scikit_learn>=1.4.1.post1
+statsmodels
+psustil

{metacountregressor-0.1.165 → metacountregressor-0.1.168}/setup.py

@@ -48,13 +48,13 @@ with open('version.txt', 'w') as f:
 setuptools.setup(
     name='metacountregressor',
     version=new_version,
-    description='Extensions for a Python package for estimation of count models.',
+    description='Extensive Testing for Estimation of Data Count Models',
     long_description=long_description,
     long_description_content_type='text/markdown',  # Specify the content type as Markdown
     url='https://github.com/zahern/CountDataEstimation',
     author='Zeke Ahern',
     author_email='z.ahern@qut.edu.au',
-    license='QUT',
+    license='MIT',
     packages=['metacountregressor'],
     zip_safe=False,
     python_requires='>=3.10',
@@ -62,6 +62,10 @@ setuptools.setup(
         'numpy>=1.13.1',
         'scipy>=1.0.0',
         'requests',
-        'latextable'
+        'latextable',
+        'pandas',
+        'scikit_learn>=1.4.1.post1',
+        'statsmodels',
+        'psustil'
     ]
 )

metacountregressor-0.1.165/metacountregressor.egg-info/requires.txt

@@ -1,4 +0,0 @@
-numpy>=1.13.1
-scipy>=1.0.0
-requests
-latextable