Changeset 1091

Timestamp:

02/24/21 13:41:24 (4 years ago)

Author:

Maciej Komosinski

Message:

Allowed to override settings of the simulation using a file with the file name provided as an argument

File:

• framspy/FramsticksLib.py (modified) (6 diffs)

framspy/FramsticksLib.py

@@ -24 +24 @@
 
         GENOTYPE_INVALID = "/*invalid*/"  # this is how genotype invalidity is represented in Framsticks
-        EVALUATION_SETTINGS_FILE = "eval-allcriteria.sim"  # MUST be compatible with standard-eval expdef
+        EVALUATION_SETTINGS_FILE = "eval-allcriteria.sim"  # MUST be compatible with the standard-eval expdef
 
 
-        def __init__(self, frams_path, frams_lib_name):
+        def __init__(self, frams_path, frams_lib_name, simsettings):
                 if frams_lib_name is None:
                         frams.init(frams_path)  # could add support for setting alternative directories using -D and -d
@@ -46 +46 @@
                         frams.Math.randomize();
                 frams.Simulator.expdef = "standard-eval"  # this expdef must be used by EVALUATION_SETTINGS_FILE
+                if simsettings is not None:
+                        self.EVALUATION_SETTINGS_FILE = simsettings
 
 
@@ -66 +68 @@
                 frams.GenePools[0].clear()
                 frams.Simulator.ximport(self.EVALUATION_SETTINGS_FILE, 2 + 4 + 8 + 16)
+
                 for g in genotype_list:
                         frams.GenePools[0].add(g)
@@ -120 +123 @@
                 assert isinstance(genotype_list, list)  # because in python str has similar capabilities as list and here it would pretend to work too, so to avoid any ambiguity
 
-                frams.SimilMeasure.type = 1  # adjust to your needs. Set here because loading EVALUATION_SETTINGS_FILE during evaluation may overwrite these parameters
-                frams.SimilMeasureHungarian.simil_weightedMDS = 1
-                frams.SimilMeasureHungarian.simil_partgeom = 1
+                # if you want to override what EVALUATION_SETTINGS_FILE sets, you can do it below:
+                # frams.SimilMeasure.type = 1
+                # frams.SimilMeasureHungarian.simil_partgeom = 1
+                # frams.SimilMeasureHungarian.simil_weightedMDS = 1
 
                 n = len(genotype_list)
@@ -152 +156 @@
         parser.add_argument('-path', type=ensureDir, required=True, help='Path to the Framsticks library (.dll or .so) without trailing slash.')
         parser.add_argument('-lib', required=False, help='Library name. If not given, "frams-objects.dll" or "frams-objects.so" is assumed depending on the platform.')
+        parser.add_argument('-simsettings', required=False, help='The name of the .sim file with settings for evaluation, mutation, crossover, and similarity estimation. If not given, "eval-allcriteria.sim" is assumed by default. Must be compatible with the "standard-eval" expdef.')
         parser.add_argument('-genformat', required=False, help='Genetic format for the demo run, for example 4, 9, or S. If not given, f1 is assumed.')
         return parser.parse_args()
@@ -171 +176 @@
 
         parsed_args = parseArguments()
-        framsDLL = FramsticksLib(parsed_args.path, parsed_args.lib)
+        framsDLL = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.simsettings)
 
         print("Sending a direct command to Framsticks CLI that calculates \"4\"+2 yields", frams.Simulator.eval("return \"4\"+2;"))