Changeset 1205

Timestamp:

02/23/23 23:18:38 (21 months ago)

Author:

Maciej Komosinski

Message:

Splitting (potentially) multiple .sim files is already done by FramsticksLib?.py

Location:

framspy

Files:

• FramsticksEvolution.py (modified) (1 diff)
• evolalg/run_frams_islands.py (modified) (1 diff)
• evolalg/run_frams_niching.py (modified) (1 diff)
• evolalg/tests/test_diferent_settings.py (modified) (2 diffs)
• evolalg_steps/examples/multicriteria.py (modified) (1 diff)
• evolalg_steps/examples/niching_novelty.py (modified) (1 diff)
• evolalg_steps/examples/standard.py (modified) (1 diff)

framspy/FramsticksEvolution.py

@@ -142 +142 @@
         print("Argument values:", ", ".join(['%s=%s' % (arg, getattr(parsed_args, arg)) for arg in vars(parsed_args)]))
         OPTIMIZATION_CRITERIA = parsed_args.opt.split(",")
-        framsLib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+        framsLib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
         toolbox = prepareToolbox(framsLib, OPTIMIZATION_CRITERIA, parsed_args.tournament, '1' if parsed_args.genformat is None else parsed_args.genformat, parsed_args.initialgenotype)
         pop = toolbox.population(n=parsed_args.popsize)

framspy/evolalg/run_frams_islands.py

@@ -14 +14 @@
     opt_criteria = parsed_args.opt.split(",")
     framsLib = FramsticksLib(
-        parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+        parsed_args.path, parsed_args.lib, parsed_args.sim)
     constrains = {"max_numparts": parsed_args.max_numparts,
                   "max_numjoints": parsed_args.max_numjoints,

framspy/evolalg/run_frams_niching.py

@@ -14 +14 @@
     opt_criteria = parsed_args.opt.split(",")
     framsLib = FramsticksLib(
-        parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+        parsed_args.path, parsed_args.lib, parsed_args.sim)
     constrains = {"max_numparts": parsed_args.max_numparts,
                   "max_numjoints": parsed_args.max_numjoints,

framspy/evolalg/tests/test_diferent_settings.py

@@ -109 +109 @@
     opt_criteria = params['opt'].split(",")
     framsLib = FramsticksLib(
-        parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+        parsed_args.path, parsed_args.lib, parsed_args.sim)
     constrains = {"max_numparts": params['max_numparts'],
                   "max_numjoints": params['max_numjoints'],
@@ -141 +141 @@
     opt_criteria = params['opt'].split(",")
     framsLib = FramsticksLib(
-        parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+        parsed_args.path, parsed_args.lib, parsed_args.sim)
     constrains = {"max_numparts": params['max_numparts'],
                   "max_numjoints": params['max_numjoints'],

framspy/evolalg_steps/examples/multicriteria.py

@@ -168 +168 @@
 def create_experiment():
     parsed_args = parseArguments()
-    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
 
     opt_dissim = []

framspy/evolalg_steps/examples/niching_novelty.py

@@ -179 +179 @@
 def create_experiment():
     parsed_args = parseArguments()
-    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib,
-                              parsed_args.sim.split(";"))
+    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
     # Steps for generating first population
     init_stages = [

framspy/evolalg_steps/examples/standard.py

@@ -66 +66 @@
 def main():
     parsed_args = parseArguments()
-    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim.split(";"))
+    frams_lib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.sim)
 
     hall_of_fame = HallOfFameStatistics(parsed_args.hof_size, "fitness")