Changeset 955 for cpp/frams/_demos/genoconv_test.cpp

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)

File:

• cpp/frams/_demos/genoconv_test.cpp (modified) (7 diffs)

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()));