Changeset 994

Timestamp:

07/09/20 13:51:28 (4 years ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Files:

• cpp/frams/_demos/genoconv_test.cpp (modified) (1 diff)
• cpp/frams/_demos/genooper_test.cpp (modified) (1 diff)
• cpp/frams/_demos/loader_test_param.cpp (modified) (1 diff)
• cpp/frams/genetics/fF/fF_conv.cpp (modified) (1 diff)
• tester/comparison.py (modified) (1 diff)
• tester/tester.py (modified) (1 diff)

cpp/frams/_demos/genoconv_test.cpp

@@ -166 +166 @@
 
 // arguments:
-//     genotype (or - meaning "read from stdin") [default: X]
+//     genotype (or - meaning "read from stdin") [default: X, but try "/*shapes*/ball,cube,cylinder,cube"]
 //     target format [default: 0]
 //     "checkpoints" (just write this exact word) [default: not using checkpoints]

cpp/frams/_demos/genooper_test.cpp

@@ -18 +18 @@
 }
 
-/* Demonstrates various genetic operators applied to a sample genotype. See also oper_fx.cpp. */
+/* Demonstrates various genetic operators applied to a sample genotype. See also genooperators.cpp/h. */
 int main(int argc, char *argv[])
 {

cpp/frams/_demos/loader_test_param.cpp

@@ -112 +112 @@
 
                 case MultiParamLoader::OnError:
-                        fprintf(stderr, "Error: %s", loader.getError().c_str());
+                        fprintf(stderr, "Error: %s\n", loader.getError().c_str());
                 }
         }

cpp/frams/genetics/fF/fF_conv.cpp

@@ -11 +11 @@
 {
         name = "10-parameter Foraminifera encoding";
-        in_format = 'F';
+        in_format = "F";
         out_format = "0s";
         mapsupport = 0;

tester/comparison.py

@@ -25 +25 @@
                 try:
                         fin = open(os.path.join(globals.THISDIR, name))  # first we look for the file with the specialized name (platform-dependent)...
-                except IOError:
-                        fin = open(os.path.join(globals.THISDIR, file_name + ".goal"))  # ...if there is no such file, we try to find the default file
+                except IOError as e1:
+                        try:
+                                fin = open(os.path.join(globals.THISDIR, file_name + ".goal"))  # ...if there is no such file, we try to find the default file
+                        except IOError as e2:
+                                print()
+                                print(e1)
+                                print(e2)
+                                print('Proceeding as if the missing file were empty.')
+                                return []
                 list_of_lines = []
                 for line in fin:

tester/tester.py

@@ -94 +94 @@
                         failed_result_filename = '_test'
                 f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-output'), 'w')  # files are easier to compare than stdout
-                print('\n'.join(jest), end="", file=f)
+                print('\n'.join(jest)+'\n', end="", file=f) # not sure why one last empty line is always lost (or one too much is expected?), adding here...
                 f = open(os.path.join(globals.THISDIR, failed_result_filename + '.Failed-goal'), 'w')  # files are easier to compare than stdout
                 print('\n'.join(goal), end="", file=f)