Changeset 1291

Timestamp:

01/15/24 05:46:02 (10 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

framspy/evolalg

Files:

• base/experiment_islands_model_abc.py (modified) (1 diff)
• frams_base/experiment_frams.py (modified) (1 diff)
• tests/test_diferent_settings.py (modified) (11 diffs)

framspy/evolalg/base/experiment_islands_model_abc.py

@@ -28 +28 @@
         sorted_individuals = sorted(
             pool_of_all_individuals, key=lambda x: x.rawfitness)
-        print(f"Best indiviudal for new islands:")
+        print("Best individual for new islands:")
         for i in range(self.number_of_populations):
             shift = i*self.popsize

framspy/evolalg/frams_base/experiment_frams.py

@@ -7 +7 @@
 
 class ExperimentFrams(ExperimentABC):
-    def __init__(self, hof_size, popsize, frams_lib, optimization_criteria, genformat, save_only_best=True, constraints={}) -> None:
+    def __init__(self, hof_size, popsize, frams_lib, optimization_criteria, genformat, save_only_best, constraints={}) -> None:
         ExperimentABC.__init__(self, hof_size=hof_size, popsize=popsize, save_only_best=save_only_best)
         self.optimization_criteria = optimization_criteria

framspy/evolalg/tests/test_diferent_settings.py

@@ -1 +1 @@
 import argparse
 import sys
+import numpy as np
 
 from FramsticksLib import FramsticksLib
@@ -9 +10 @@
 from ..numerical_example.numerical_islands_example import ExperimentNumericalIslands
 
-
 from ..utils import ensureDir
 
+
+GENERATIONS = 10 
+
 SETTINGS_TO_TEST_NUMERIC = {
     'hof_size': [0, 10],
@@ -19 +22 @@
     'pxov': [0.2],
     'tournament': [5],
-    'initialgenotype':[[100, 100, 100, 100], [-100,-100]]
+    'initialgenotype':[np.array([100, 100, 100, 100]), [-100,-100]]
 }
 
@@ -31 +34 @@
     'migration_interval': [1,5],
     'number_of_populations':[1,5],
-    'initialgenotype':[[100, 100, 100, 100], [-100,-100]]
+    'initialgenotype':[np.array([100, 100, 100, 100]), [-100,-100]]
 }
 
@@ -81 +84 @@
 
     experiment.evolve(hof_savefile=None,
-                      generations=2,
+                      generations=GENERATIONS,
                       initialgenotype=params['initialgenotype'],
                       pmut=params['pmut'],
@@ -99 +102 @@
 
     experiment.evolve(hof_savefile=None,
-                      generations=2,
+                      generations=GENERATIONS,
                       initialgenotype=params['initialgenotype'],
                       pmut=params['pmut'],
@@ -117 +120 @@
                   }
 
-    print('Best individuals:')
     experiment = ExperimentFramsNiching(frams_lib=framsLib,
                                         optimization_criteria=opt_criteria,
@@ -128 +130 @@
                                         popsize=params['popsize'],
                                         archive_size=params['archive'],
-                                        save_only_best=True)
-
-    experiment.evolve(hof_savefile=None,
-                      generations=2,
+                                        save_only_best=True,
+                                        knn_niching=5,
+                                        knn_nslc=5)
+
+    experiment.evolve(hof_savefile=None,
+                      generations=GENERATIONS,
                       initialgenotype=params['initialgenotype'],
                       pmut=params['pmut'],
@@ -149 +153 @@
                   }
 
-    print('Best individuals:')
     experiment = ExperimentFramsIslands(frams_lib=framsLib,
                                         optimization_criteria=opt_criteria,
@@ -161 +164 @@
 
     experiment.evolve(hof_savefile=None,
-                      generations=2,
+                      generations=GENERATIONS,
                       initialgenotype=params['initialgenotype'],
                       pmut=params['pmut'],
@@ -201 +204 @@
         run_exp(params)
         return [1, None]
-    except Exception as e:
-        return [0, f"Experiment {run_exp.__name__} with params:{params} failied with the stack:{e}"]
+    except Exception as ex:
+        return [0, f"Experiment {run_exp.__name__} with params: {params} failed with the stack: {ex}"]