metacountregressor 0.1.243__py3-none-any.whl → 0.1.304__py3-none-any.whl

metacountregressor/helperprocess.py

@@ -539,6 +539,37 @@ def check_list_type(lst, check_type):
             raise TypeError(f"All elements in the list must be of type {check_type}")
 
 
+def plot_fitness_progress(iterations, iteration_fitnesses, best_fitnesses, average_fitness):
+    """
+    Plots the fitness values over iterations.
+
+    Args:
+        iterations (list): List of iteration numbers.
+        iteration_fitnesses (list): List of fitness values for each iteration.
+        best_fitnesses (list): List of best fitness values across iterations.
+        average_fitness (list): List of average fitness values across iterations.
+    """
+    plt.figure(figsize=(10, 6))
+
+    # Plot iteration fitnesses
+    plt.plot(iterations, iteration_fitnesses, label='Iteration Fitnesses', marker='o', color='blue')
+    # Plot best fitnesses
+    plt.plot(iterations, best_fitnesses, label='Best Fitnesses', marker='s', color='green')
+    # Plot average fitness
+    plt.plot(iterations, average_fitness, label='Average Fitness', marker='d', color='orange')
+
+    # Add labels and title
+    plt.xlabel('Iteration')
+    plt.ylabel('Fitness')
+    plt.title('Fitness Progression Over Iterations')
+    plt.legend()
+    plt.grid(True)
+
+    # Show the plot
+    plt.show()
+
+
+
 def results_printer(results, algorithm='hs', is_multi=1, obj_1='bic', obj_2='MSE'):
     if algorithm == 'hs':
         plt.scatter([x['bic'] for x in results.harmony_memories], [x['MAE'] for x in results.harmony_memories])
@@ -565,6 +596,12 @@ def results_printer(results, algorithm='hs', is_multi=1, obj_1='bic', obj_2='MSE
                     results.iteration, results.iter_solution, results.best_solutions, results.best_fitness,
                     # type: ignore
                     results.best_struct, results.average_best))  # type: ignore
+            plot_fitness_progress(
+                iterations=results.iteration,  # Replace with actual iteration numbers
+                iteration_fitnesses=results.iter_solution,  # Replace with actual iteration fitnesses
+                best_fitnesses=results.best_solutions,  # Replace with the best fitnesses
+                average_fitness=results.average_best  # Replace with average fitnesses
+            )
     elif algorithm == 'sa':
         print(
             'Elapsed time: {}\nIterations: {}'.format(

metacountregressor/metaheuristics.py

@@ -240,7 +240,9 @@ def differential_evolution(objective_function, initial_slns=None, **kwargs):
             initial_slns=initial_slns, mod_init=man)
         AVERAGE_BEST = st.mean(best_solutions)
         end = datetime.now()
+    
         elapsed_time = end - start
+        print(f'elapsed time{elapsed_time}')
         return DifferentialEvolutionResults(elapsed_time=elapsed_time, iteration=iterations,
                                             iter_solution=solutions, best_solutions=best_solutions,
                                             best_fitness=best_fitness,

metacountregressor/solution.py

@@ -3988,7 +3988,7 @@ class ObjectiveFunction(object):
 
 
         if linear:
-            eta = eta.astype('float') +epsilon.astype('float')
+            eta = eta.astype('float')
             return eta
 
 
@@ -4747,9 +4747,16 @@ class ObjectiveFunction(object):
                 if self.is_dispersion(dispersion):
                     penalty, main_disper = self._penalty_dispersion(dispersion, main_disper, eVd, y, penalty,
                                                                     model_nature)
+                    b_pen = self.custom_betas_to_penalise(betas, dispersion)
+                    penalty =  self.regularise_l2(betas) + self.regularise_l1(betas)
+                    penalty = self.custom_penalty(betas, penalty)
 
                     betas[-1] = main_disper
 
+                b_pen = self.custom_betas_to_penalise(betas, dispersion)
+                penalty =  self.regularise_l2(betas) + self.regularise_l1(betas)
+                penalty = self.custom_penalty(betas, penalty)
+
                 if self.linear_regression:
                     # LINEAR MODEL PROCESS
                     mse = self._linear_logliklihood(y, eVd, main_disper)

{metacountregressor-0.1.243.dist-info → metacountregressor-0.1.304.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: metacountregressor
-Version: 0.1.243
+Version: 0.1.304
 Summary: Extensive Testing for Estimation of Data Count Models
 Home-page: https://github.com/zahern/CountDataEstimation
 Author: Zeke Ahern
@@ -17,12 +17,14 @@ Requires-Dist: pandas
 Requires-Dist: scikit-learn>=1.3.1
 Requires-Dist: statsmodels
 Requires-Dist: psutil
+Requires-Dist: pybind11>=2.12
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{metacountregressor-0.1.243.dist-info → metacountregressor-0.1.304.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=zBpMI2AI7aZ19IZlEnZrvy2VAtJICIcwpq60JL_OIjQ,24428
+metacountregressor/helperprocess.py,sha256=ufdB6BcCIYN6btWdxyFlRCReuYEbVh6es1sdLsd8RTg,25917
 metacountregressor/main.py,sha256=xfpKN2w0kePHp_Q2HOPjtG15PLEN1L3sEnDw1PHBquw,23668
 metacountregressor/main_old.py,sha256=eTS4ygq27MnU-dZ_j983Ucb-D5XfbVF8OJQK2hVVLZc,24123
-metacountregressor/metaheuristics.py,sha256=PyxFBlNqqwq787cDHl36xLaricMA3HTCtDweOe_UM-M,106763
+metacountregressor/metaheuristics.py,sha256=bDyK5K4SFboWjaUIDlBR0H04a64XabXO_74SX0q_nsk,106813
 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=l0-rGiIefV17OW60wxttjVD467Ym4WFyw94ZgkR0YhU,317080
+metacountregressor/solution.py,sha256=j1jzIKn74LNvxjGyVJn9CUrUpvugM6I2duGRXTCOA3A,317500
 metacountregressor/test_generated_paper2.py,sha256=pwOoRzl1jJIIOUAAvbkT6HmmTQ81mwpsshn9SLdKOg8,3927
-metacountregressor-0.1.243.dist-info/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-metacountregressor-0.1.243.dist-info/METADATA,sha256=r8zca46iTmRdh7pq-kT-vIOERixSrcd_34C_acwu8qw,23529
-metacountregressor-0.1.243.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-metacountregressor-0.1.243.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
-metacountregressor-0.1.243.dist-info/RECORD,,
+metacountregressor-0.1.304.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+metacountregressor-0.1.304.dist-info/METADATA,sha256=-Yn7gguicyi13SlwYXvUjrcC0gJPBw320AtbAjtk27M,23581
+metacountregressor-0.1.304.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+metacountregressor-0.1.304.dist-info/top_level.txt,sha256=zGG7UC5WIpr76gsFUpwJ4En2aCcoNTONBaS3OewwjR0,19
+metacountregressor-0.1.304.dist-info/RECORD,,

{metacountregressor-0.1.243.dist-info → metacountregressor-0.1.304.dist-info}/WHEEL

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