Changeset 999 for cpp/frams/_demos

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

Location:

cpp/frams/_demos

Files:

• f0_variants_test.cpp (modified) (1 diff)
• full_props.cpp (modified) (1 diff)
• genoconv_test.cpp (modified) (3 diffs)
• genomanipulation.cpp (modified) (3 diffs)
• geometry/geometrytestutils.cpp (modified) (1 diff)
• multiline_f0_test.cpp (modified) (1 diff)
• neuro_layout_test.cpp (modified) (1 diff)
• neuro_test.cpp (modified) (1 diff)
• shapeconvert.cpp (modified) (2 diffs)

cpp/frams/_demos/f0_variants_test.cpp

@@ -98 +98 @@
                 g.getFormat().c_str(), g.getComment().c_str());
 
-        Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
+        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
 
         if (!m.isValid())

cpp/frams/_demos/full_props.cpp

@@ -75 +75 @@
                 loadSString(VirtFILE::Vstdin, gen);
         Geno g(gen);
-        Model m(g, Model::SHAPE_UNKNOWN);
+        Model m(g, Model::SHAPETYPE_UNKNOWN);
 
         if (!m.isValid())

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

cpp/frams/_demos/genomanipulation.cpp

@@ -196 +196 @@
                         printf(cl->getPreferredOutput() ? "and provides meaningful output signal (getPreferredOutput()==1).\n" : "and doesn't provide useful output signal (getPreferredOutput()==0).\n");
                         printf("Instances of '%s' can be used in models having ", cl->getName().c_str());
-                        if (cl->getSupportedShapeTypes() == NeuroClass::SUPPORTED_SHAPE_ALL)
+                        if (cl->getSupportedShapeTypes() == NeuroClass::SUPPORTED_SHAPETYPE_ALL)
                                 printf("any shape types.\n");
                         else
                         {
                                 printf("shape types:");
-                                for (int i = Model::SHAPE_FIRST; i <= Model::SHAPE_LAST; i++)
+                                for (int i = Model::SHAPETYPE_FIRST; i <= Model::SHAPETYPE_LAST; i++)
                                         if (cl->isShapeTypeSupported((Model::ShapeType)i))
                                                 printf(" '%s'", Model::getShapeTypeName((Model::ShapeType)i));
@@ -209 +209 @@
                         {
                                 printf("Instances of '%s' can be attached to Joints having ", cl->getName().c_str());
-                                if (cl->getSupportedJointShapes() == NeuroClass::SUPPORTED_JOINT_ALL)
+                                if (cl->getSupportedJointShapes() == NeuroClass::SUPPORTED_JOINTSHAPE_ALL)
                                         printf("any shapes");
                                 else
@@ -311 +311 @@
                 g.getFormat().c_str(), g.getComment().c_str());
 
-        Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
+        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
 
         if (!m.isValid())

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -63 +63 @@
                 if ((genoIndex == count) || (strcmp(genotype->name.c_str(), genoName) == 0))
                 {
-                        Model model(genotype->genotype, Model::SHAPE_UNKNOWN);
+                        Model model(genotype->genotype, Model::SHAPETYPE_UNKNOWN);
 
                         if (!model.isValid())

cpp/frams/_demos/multiline_f0_test.cpp

@@ -30 +30 @@
                 g.getFormat().c_str(), g.getComment().c_str());
 
-        Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
+        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
 
         if (!m.isValid())

cpp/frams/_demos/neuro_layout_test.cpp

@@ -104 +104 @@
         Geno g(gen);
         if (!g.isValid()) { puts("invalid genotype"); return 5; }
-        Model m(g, Model::SHAPE_UNKNOWN);
+        Model m(g, Model::SHAPETYPE_UNKNOWN);
         if (!m.getNeuroCount()) { puts("no neural network"); return 1; }
         printf("%d neurons,", m.getNeuroCount());

cpp/frams/_demos/neuro_test.cpp

@@ -77 +77 @@
         Geno g(gen);
         if (!g.isValid()) { puts("invalid genotype"); return 5; }
-        Model m(g, Model::SHAPE_UNKNOWN);
+        Model m(g, Model::SHAPETYPE_UNKNOWN);
         if (!m.getNeuroCount()) { puts("no neural network"); return 1; }
         printf("%d neurons,", m.getNeuroCount());

cpp/frams/_demos/shapeconvert.cpp

@@ -67 +67 @@
                 loadSString(VirtFILE::Vstdin, gen);
         Geno g(gen);
-        Model m(g, Model::SHAPE_UNKNOWN);
+        Model m(g, Model::SHAPETYPE_UNKNOWN);
 
         if (!m.isValid())
@@ -75 +75 @@
         }
 
-        if (m.getShapeType() != Model::SHAPE_BALL_AND_STICK)
+        if (m.getShapeType() != Model::SHAPETYPE_BALL_AND_STICK)
         {
                 logPrintf("", "shapeconvert", LOG_ERROR, "Only ball-and-stick models can be converted");