Changeset 1149 for framspy/evolalg

Timestamp:

09/25/21 01:02:06 (3 years ago)

Author:

Maciej Komosinski

Message:

Added support for loading multiple .sim files where each can overwrite selected settings

Location:

framspy/evolalg/examples

Files:

• multicriteria.py (modified) (3 diffs)
• niching_novelty.py (modified) (3 diffs)
• standard.py (modified) (2 diffs)

framspy/evolalg/examples/multicriteria.py

@@ -66 +66 @@
                         help='Genetic format for the demo run, for example 4, 9, or B. If not given, f1 is assumed.')
     parser.add_argument('-sim', required=False, default="eval-allcriteria.sim",
-                        help="Name of the .sim file with all parameter values")
+                        help="Name of the .sim file with all parameter values. If you want to provide more files, separate them with a semicolon ';'.")
     parser.add_argument('-dissim', required=False, type=Dissim, default=Dissim.frams,
                         help='Dissimilarity measure, default: frams', choices=list(Dissim))
@@ -168 +168 @@
 def create_experiment():
     parsed_args = parseArguments()
-    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
+    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
 
     opt_dissim = []
@@ -311 +311 @@
     if parsed_args.checkpoint_path is not None and os.path.exists(parsed_args.checkpoint_path):
         experiment = load_experiment(parsed_args.checkpoint_path)
-        FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
     else:
         experiment = create_experiment()

framspy/evolalg/examples/niching_novelty.py

@@ -63 +63 @@
     parser.add_argument('-genformat', required=False, default="1",
                         help='Genetic format for the demo run, for example 4, 9, or B. If not given, f1 is assumed.')
-    parser.add_argument('-sim', required=False, default="eval-allcriteria.sim", help="Name of the .sim file with all parameter values")
+    parser.add_argument('-sim', required=False, default="eval-allcriteria.sim", help="Name of the .sim file with all parameter values. If you want to provide more files, separate them with a semicolon ';'.")
     parser.add_argument('-fit', required=False, default=Fitness.raw, type=Fitness,
                         help=' Fitness criteria, default: raw', choices=list(Fitness))
@@ -166 +166 @@
     parsed_args = parseArguments()
     frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib,
-                          parsed_args.sim)
+                          parsed_args.sim.split(";"))
     # Steps for generating first population
     init_stages = [
@@ -332 +332 @@
     if parsed_args.checkpoint_path is not None and os.path.exists(parsed_args.checkpoint_path):
         experiment = load_experiment(parsed_args.checkpoint_path)
-        FramsticksLib(parsed_args.path, parsed_args.lib,
-                      parsed_args.sim)
     else:
         experiment = create_experiment()
         experiment.init()  # init is mandatory
-
 
     experiment.run(parsed_args.generations)

framspy/evolalg/examples/standard.py

@@ -46 +46 @@
     parser.add_argument('-genformat', required=False, default="1",
                         help='Genetic format for the demo run, for example 4, 9, or B. If not given, f1 is assumed.')
-    parser.add_argument('-sim', required=False, default="eval-allcriteria.sim", help="Name of the .sim file with all parameter values")
+    parser.add_argument('-sim', required=False, default="eval-allcriteria.sim", help="Name of the .sim file with all parameter values. If you want to provide more files, separate them with a semicolon ';'.")
     parser.add_argument("-popsize", type=int, default=50, help="Population size, default 50.")
     parser.add_argument('-generations', type=int, default=5, help="Number of generations, default 5.")
@@ -66 +66 @@
 def main():
     parsed_args = parseArguments()
-    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
+    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
 
     hall_of_fame = HallOfFameStatistics(parsed_args.hof_size, "fitness")