Changeset 955 for cpp/frams/_demos

Timestamp:

06/25/20 00:34:29 (4 years ago)

Author:

Maciej Komosinski

Message:

Genetic format ID becomes a string (no longer limited to a single character)

Location:

cpp/frams/_demos

Files:

• f0_variants_test.cpp (modified) (1 diff)
• genoconv_test.cpp (modified) (7 diffs)
• genomanipulation.cpp (modified) (2 diffs)
• genooper_test.cpp (modified) (3 diffs)
• multiline_f0_test.cpp (modified) (1 diff)

cpp/frams/_demos/f0_variants_test.cpp

@@ -95 +95 @@
 Geno g(gen);
 printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
-printf("                  ( format %c %s)\n",
-       g.getFormat(), g.getComment().c_str());
+printf("                  ( format %s %s)\n",
+       g.getFormat().c_str(), g.getComment().c_str());
 
 Model m(g);//.getConverted('0'));

cpp/frams/_demos/genoconv_test.cpp

@@ -66 +66 @@
         {
                 name = "Test Converter #3";
-                in_format = 'z';
+                in_format = "multiply";
                 out_format = '1';
                 mapsupport = 1;
@@ -112 +112 @@
 void printGen(Geno &g)
 {
-        printf("Genotype:\n%s\nFormat: %c\nValid: %s\nComment: %s\n",
-                g.getGenes().c_str(), g.getFormat(), g.isValid() ? "yes" : "no", g.getComment().c_str());
-}
-
-static int goodWidthForFormat(int genotype_format)
-{
-        return genotype_format == '0' ? 45 : 15; // more space for long f0 lines
+        printf("Genotype:\n%s\nFormat: %s\nValid: %s\nComment: %s\n",
+               g.getGenes().c_str(), g.getFormat().c_str(), g.isValid() ? "yes" : "no", g.getComment().c_str());
+}
+
+static int goodWidthForFormat(const SString& genotype_format)
+{
+        return genotype_format == "0" ? 45 : 15; // more space for long f0 lines
 }
 
@@ -154 +154 @@
         else
                 src = "X";
-        char dst = (argc > 2) ? *argv[2] : '0';
+        SString dst = (argc > 2) ? *argv[2] : '0';
         bool using_checkpoints = (argc > 3) ? (strcmp(argv[3], "checkpoints") == 0) : false;
 
@@ -162 +162 @@
         MultiMap m;
         Geno g2 = g1.getConverted(dst, &m, using_checkpoints);
-        printf("*** Converted to f%c:\n", dst);
+        printf("*** Converted to f%s:\n", dst.c_str());
         printGen(g2);
 
@@ -168 +168 @@
         { // using Model with checkpoints
                 Model m1(g2, false, true);//true=using_checkpoints
-                printf("\nModel built from the converted f%c genotype has %d checkpoints\n", g2.getFormat(), m1.getCheckpointCount());
+                printf("\nModel built from the converted f%s genotype has %d checkpoints\n", g2.getFormat().c_str(), m1.getCheckpointCount());
                 Model m2(g1, false, true);//true=using_checkpoints
-                printf("Model built from the source f%c genotype has %d checkpoints\n", g1.getFormat(), m2.getCheckpointCount());
+                printf("Model built from the source f%s genotype has %d checkpoints\n", g1.getFormat().c_str(), m2.getCheckpointCount());
                 // accessing individual checkpoint models (if available)
                 if (m1.getCheckpointCount() > 0)
@@ -196 +196 @@
 
                 Model mod1(g1, 1);
-                printf("\nModel map for f%c genotype:\n", g1.getFormat());
+                printf("\nModel map for f%s genotype:\n", g1.getFormat().c_str());
                 ModelDisplayMap dm1(mod1);
                 dm1.print(goodWidthForFormat(g1.getFormat()));
@@ -203 +203 @@
                 mod1combined.print();
                 Model mod2(g2, 1);
-                printf("\nModel map for f%c genotype:\n", g2.getFormat());
+                printf("\nModel map for f%s genotype:\n", g2.getFormat().c_str());
                 ModelDisplayMap dm2(mod2);
                 dm2.print(goodWidthForFormat(g2.getFormat()));

cpp/frams/_demos/genomanipulation.cpp

@@ -258 +258 @@
         if (gc) printf("found converter accepting f1: \"%s\"\n", gc->name);
         SListTempl<GenoConverter*> found;
-        Geno::getConverters()->findConverters(&found, -1, '0');
+        Geno::getConverters()->findConverters(&found, Geno::UNKNOWN_FORMAT, '0');
         printf("found %d converter(s) producing f0\n", found.size());
 }
@@ -281 +281 @@
         Geno g(gen);
         printf("\nSource genotype: '%s'\n", g.getGenes().c_str());
-        printf("                  ( format %c %s)\n",
-                g.getFormat(), g.getComment().c_str());
+        printf("                  ( format %s %s)\n",
+                g.getFormat().c_str(), g.getComment().c_str());
 
         Model m(g);//.getConverted('0'));

cpp/frams/_demos/genooper_test.cpp

@@ -8 +8 @@
 void printGen(Geno &g)
 {
-        printf("Genotype: %s\nFormat: %c\nValid: %s\nComment: %s\n",
-                g.getGenes().c_str(), g.getFormat(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
+        printf("Genotype: %s\nFormat: %s\nValid: %s\nComment: %s\n",
+                g.getGenes().c_str(), g.getFormat().c_str(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
 }
 
@@ -30 +30 @@
         Geno gsrc(src, -1, "First");
         printGenAndTitle(gsrc, "source genotype (gsrc)");
-        char format = gsrc.getFormat();
+        SString format = gsrc.getFormat();
 
         Geno gmut = genetics.genman.mutate(gsrc);
@@ -41 +41 @@
         printGenAndTitle(gsimplest, "simplest");
 
-        Geno ginvalid("IT'S REALLY WRONG", format);
+        Geno ginvalid("IT'S REALLY WRONG", format.c_str());
         printGenAndTitle(ginvalid, "invalid");
 

cpp/frams/_demos/multiline_f0_test.cpp

@@ -27 +27 @@
 Geno g(gen);
 printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
-printf("                  ( format %c %s)\n",
-       g.getFormat(), g.getComment().c_str());
+printf("                  ( format %s %s)\n",
+       g.getFormat().c_str(), g.getComment().c_str());
 
 Model m(g);//.getConverted('0'));