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

Timestamp:

07/13/20 13:51:43 (4 years ago)

Author:

Maciej Komosinski

Message:

More consistent usage of "shapetype" (vs. "shape")

File:

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

cpp/frams/_demos/genoconv_test.cpp

@@ -212 +212 @@
         if (using_checkpoints)
         { // using Model with checkpoints
-                Model m1(g2, Model::SHAPE_UNKNOWN, false, true);//true=using_checkpoints
+                Model m1(g2, Model::SHAPETYPE_UNKNOWN, false, true);//true=using_checkpoints
                 printf("\nModel built from the converted f%s genotype has %d checkpoints\n", g2.getFormat().c_str(), m1.getCheckpointCount());
-                Model m2(g1, Model::SHAPE_UNKNOWN, false, true);//true=using_checkpoints
+                Model m2(g1, Model::SHAPETYPE_UNKNOWN, false, true);//true=using_checkpoints
                 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)
@@ -240 +240 @@
                 }
 
-                Model mod1(g1, Model::SHAPE_UNKNOWN, 1);
+                Model mod1(g1, Model::SHAPETYPE_UNKNOWN, 1);
                 printf("\nModel map for f%s genotype:\n", g1.getFormat().c_str());
                 ModelDisplayMap dm1(mod1);
@@ -247 +247 @@
                 mod1combined.addCombined(mod1.getMap(), dm1.getMap());
                 mod1combined.print();
-                Model mod2(g2, Model::SHAPE_UNKNOWN, 1);
+                Model mod2(g2, Model::SHAPETYPE_UNKNOWN, 1);
                 printf("\nModel map for f%s genotype:\n", g2.getFormat().c_str());
                 ModelDisplayMap dm2(mod2);