Changeset 1149 for framspy/FramsticksLib.py

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• framspy/FramsticksLib.py (modified) (3 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 the standard-eval expdef
+        EVALUATION_SETTINGS_FILE = [  # all files MUST be compatible with the standard-eval expdef. The order they are loaded in is important!
+                "eval-allcriteria.sim",  # a good trade-off in performance sampling period ("perfperiod") for vertpos and velocity
+                # "deterministic.sim",  # turns off random noise (added for robustness) so that each evaluation yields identical performance values (causes "overfitting")
+                # "sample-period-2.sim", # short performance sampling period so performance (e.g. vertical position) is sampled more often
+                # "sample-period-longest.sim",  # increased performance sampling period so distance and velocity are measured rectilinearly
+        ]
 
 
@@ -35 +40 @@
         #       return frams
 
-        def __init__(self, frams_path, frams_lib_name, simsettings):
+        def __init__(self, frams_path, frams_lib_name, sim_settings_files):
                 if frams_lib_name is None:
                         frams.init(frams_path)  # could add support for setting alternative directories using -D and -d
@@ -54 +59 @@
                         frams.Math.randomize();
                 frams.Simulator.expdef = "standard-eval"  # this expdef (or fully compatible) must be used by EVALUATION_SETTINGS_FILE
-                if simsettings is not None:
-                        self.EVALUATION_SETTINGS_FILE = simsettings
-                frams.Simulator.ximport(self.EVALUATION_SETTINGS_FILE, 4 + 8 + 16)
+                if sim_settings_files is not None:
+                        self.EVALUATION_SETTINGS_FILE = sim_settings_files
+                print('Using settings:', self.EVALUATION_SETTINGS_FILE)
+                assert isinstance(self.EVALUATION_SETTINGS_FILE, list)  # ensure settings file(s) are provided as a list
+                for simfile in self.EVALUATION_SETTINGS_FILE:
+                        frams.Simulator.ximport(simfile, 4 + 8 + 16)