Changeset 1009 for cpp/frams

Timestamp:

07/15/20 00:19:52 (4 years ago)

Author:

Maciej Komosinski

Message:

Added tests for most SDK demo programs

Location:

cpp/frams/_demos

Files:

• evol_test.cpp (modified) (3 diffs)
• full_props.cpp (modified) (3 diffs)
• genomanipulation.cpp (modified) (1 diff)

cpp/frams/_demos/evol_test.cpp

@@ -127 +127 @@
                 //TODO add b - bounding box volume (from Model), s - surface area (from geometry), v - volume (from geometry), h,w,d - three consecutive dimensions (from geometry)
 
-                printf("\nThe output contains 7 columns separated by the TAB character.\n");
+                printf("\nThe output consists of 7 columns separated by the TAB character.\n");
                 printf("The first column is the number of mutated or crossed over and evaluated genotypes.\n");
                 printf("The remaining columns are triplets of min,avg,max (in the population) of fitness, Parts, Joints, Neurons, Connections, genotype characters.\n");
@@ -192 +192 @@
                 if (i % population.size() == 0 || i == nr_evals - 1)
                 {
-                        printf("Evaluation %d\t", i);
+                        printf("Evaluation %d", i);
                         for (char c : string("!PJNCL"))
                         {
+                                printf("\t");
                                 print_stats(population, c);
-                                printf("\t");
                         }
                         printf("\n");
@@ -204 +204 @@
         {
                 printf("%.1f\t", ind.fitness);
-                printf("%s\n", ind.geno.getGenes().c_str());
+                printf("%s\n", ind.geno.getGenesAndFormat().c_str());
         }
 

cpp/frams/_demos/full_props.cpp

@@ -63 +63 @@
                         {
                         case 'r': reverse = true; break;
-                        case 'h': puts("usage: full_props [-r[everse]] [genotype_or_stdin]\n"); break;
+                        case 'h': puts("Usage: full_props [-r[everse]] [genotype_or_stdin]\n"); break;
                         }
                 else
@@ -79 +79 @@
         if (!m.isValid())
         {
-                logPrintf("", "full_props", LOG_ERROR, "Cannot build Model from the supplied genotype\n");
+                logPrintf("full_props", "main", LOG_ERROR, "Cannot build Model from the supplied genotype.\n");
                 return 2;
         }
@@ -88 +88 @@
                 Neuro *n = m.getNeuro(i);
                 SyntParam p = n->classProperties(reverse);
-                p.update();// ...so everyone reading the source can recognize that p was created to update the neuro d field
-                // but actually, calling update() here is not necessary, because ~SyntParam() would do it anyway
+                p.update();// ...so everyone reading the source can recognize that p was created to update the neuro d field;
+                // but actually, calling update() here is not necessary, because the ~SyntParam() destructor would do it anyway.
         }
         m.close();
 
-        // normal f0 (omitting default values) would be retrieved using m.getF0Geno()
-        // the following form allows for more control:
+        // Normal f0 (omitting default values) would be retrieved using m.getF0Geno().
+        // The following form allows for more control:
         Geno f0_g;
-        m.makeGeno(f0_g, NULL, reverse);//third arg is "handle_defaults" == whether f0 should omit default property values
+        m.makeGeno(f0_g, NULL, reverse);//The third argument is "handle_defaults" == whether f0 should omit default property values
         puts(f0_g.getGenesAndFormat().c_str());
 
         return 0;
 }
-

cpp/frams/_demos/genomanipulation.cpp

@@ -378 +378 @@
                 "     need to uncomment srand(time(0)) in genomanipulation.cpp.\n"
                 "  3. This application will use custom genotype passed as\n"
-                "     a commandline parameter: genomanipulation XX\n"
+                "     a commandline parameter: genomanipulation \"/*9*/FULU\"\n"
                 "\n");
         return 0;