Changeset 1095

Timestamp:

03/03/21 04:47:10 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

framspy

Files:

• FramsticksEvolution.py (modified) (2 diffs)
• FramsticksLib.py (modified) (1 diff)

framspy/FramsticksEvolution.py

@@ -72 +72 @@
         parser = argparse.ArgumentParser(description='Run this program with "python -u %s" if you want to disable buffering of its output.' % sys.argv[0])
         parser.add_argument('-path', type=ensureDir, required=True, help='Path to Framsticks CLI without trailing slash.')
-        parser.add_argument('-exe', required=False, help='Executable name. If not given, "frams.exe" or "frams.linux" is assumed.')
+        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 B. If not given, f1 is assumed.')
@@ -91 +91 @@
         FramsticksLib.DETERMINISTIC = False  # must be set before FramsticksLib() constructor call
         parsed_args = parseArguments()
-        framsLib = FramsticksLib(parsed_args.path, parsed_args.exe, parsed_args.simsettings)
+        framsLib = FramsticksLib(parsed_args.path, parsed_args.lib, parsed_args.simsettings)
 
         toolbox = prepareToolbox(framsLib, '1' if parsed_args.genformat is None else parsed_args.genformat)

framspy/FramsticksLib.py

@@ -124 +124 @@
 
                 # if you want to override what EVALUATION_SETTINGS_FILE sets, you can do it below:
-                # frams.SimilMeasure.type = 1
+                # frams.SimilMeasure.simil_type = 1
                 # frams.SimilMeasureHungarian.simil_partgeom = 1
                 # frams.SimilMeasureHungarian.simil_weightedMDS = 1