Changeset 1024

Timestamp:

08/07/20 22:26:57 (4 years ago)

Author:

Maciej Komosinski

Message:

evaluate() now handles a list of genotypes, not just a single genotype

File:

• framspy/FramsticksCLI.py (modified) (4 diffs)

framspy/FramsticksCLI.py

@@ -192 +192 @@
 
         def getSimplest(self, genetic_format) -> str:
-                assert len(genetic_format) == 1, "Genetic format should be a single character"
                 files = self.__runCommand(self.GETSIMPLEST_CMD + " " + genetic_format + " ", [], self.GETSIMPLEST_FILE, self.GENO_SAVE_FILE_FORMAT["RAWGENO"])
                 with open(files[-1]) as f:
@@ -200 +199 @@
 
 
-        def evaluate(self, genotype: str):
-                """
-                Returns:
-                        Dictionary -- genotype evaluated with self.EVALUATE_COMMAND. Note that for whatever reason (e.g. incorrect genotype),
-                        the dictionary you will get may be empty or partially empty and may not have the fields you expected, so handle such cases properly.
-                """
-                files = self.__runCommand(self.EVALUATE_CMD, [genotype], self.EVALUATE_FILE, self.GENO_SAVE_FILE_FORMAT["NATIVEFRAMS"])
+        def evaluate(self, genotype_list: List[str]):
+                """
+                Returns:
+                        List of dictionaries containing the performance of genotypes evaluated with self.EVALUATE_COMMAND.
+                        Note that for whatever reason (e.g. incorrect genotype), the dictionaries you will get may be empty or
+                        partially empty and may not have the fields you expected, so handle such cases properly.
+                """
+                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
+                files = self.__runCommand(self.EVALUATE_CMD, genotype_list, self.EVALUATE_FILE, self.GENO_SAVE_FILE_FORMAT["NATIVEFRAMS"])
                 with open(files[-1]) as f:
                         data = json.load(f)
@@ -278 +279 @@
         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('-exe', required=False, help='Executable name. If not given, "frams.exe" or "frams.linux" is assumed depending on the platform.')
         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.')
         parser.add_argument('-pid', required=False, help='Unique ID of this process. Only relevant when you run multiple instances of this class simultaneously but as separate processes, and they use the same Framsticks CLI executable. This value will be appended to the names of created files to avoid conflicts.')
@@ -320 +321 @@
         print("\tCrossover (Offspring):", offspring)
         print('\tDissimilarity of Parent1 and Offspring:', framsCLI.dissimilarity([parent1, offspring])[0, 1])
-        print('\tPerformance of Offspring:', framsCLI.evaluate(offspring))
+        print('\tPerformance of Offspring:', framsCLI.evaluate([offspring]))
         print('\tValidity of Parent1, Parent 2, and Offspring:', framsCLI.isValid([parent1, parent2, offspring]))