Changeset 999 for cpp/frams/_demos


Ignore:
Timestamp:
07/13/20 13:51:43 (4 years ago)
Author:
Maciej Komosinski
Message:

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

Location:
cpp/frams/_demos
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/_demos/f0_variants_test.cpp

    r986 r999  
    9898                g.getFormat().c_str(), g.getComment().c_str());
    9999
    100         Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
     100        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
    101101
    102102        if (!m.isValid())
  • cpp/frams/_demos/full_props.cpp

    r972 r999  
    7575                loadSString(VirtFILE::Vstdin, gen);
    7676        Geno g(gen);
    77         Model m(g, Model::SHAPE_UNKNOWN);
     77        Model m(g, Model::SHAPETYPE_UNKNOWN);
    7878
    7979        if (!m.isValid())
  • cpp/frams/_demos/genoconv_test.cpp

    r994 r999  
    212212        if (using_checkpoints)
    213213        { // using Model with checkpoints
    214                 Model m1(g2, Model::SHAPE_UNKNOWN, false, true);//true=using_checkpoints
     214                Model m1(g2, Model::SHAPETYPE_UNKNOWN, false, true);//true=using_checkpoints
    215215                printf("\nModel built from the converted f%s genotype has %d checkpoints\n", g2.getFormat().c_str(), m1.getCheckpointCount());
    216                 Model m2(g1, Model::SHAPE_UNKNOWN, false, true);//true=using_checkpoints
     216                Model m2(g1, Model::SHAPETYPE_UNKNOWN, false, true);//true=using_checkpoints
    217217                printf("Model built from the source f%s genotype has %d checkpoints\n", g1.getFormat().c_str(), m2.getCheckpointCount());
    218218                // accessing individual checkpoint models (if available)
     
    240240                }
    241241
    242                 Model mod1(g1, Model::SHAPE_UNKNOWN, 1);
     242                Model mod1(g1, Model::SHAPETYPE_UNKNOWN, 1);
    243243                printf("\nModel map for f%s genotype:\n", g1.getFormat().c_str());
    244244                ModelDisplayMap dm1(mod1);
     
    247247                mod1combined.addCombined(mod1.getMap(), dm1.getMap());
    248248                mod1combined.print();
    249                 Model mod2(g2, Model::SHAPE_UNKNOWN, 1);
     249                Model mod2(g2, Model::SHAPETYPE_UNKNOWN, 1);
    250250                printf("\nModel map for f%s genotype:\n", g2.getFormat().c_str());
    251251                ModelDisplayMap dm2(mod2);
  • cpp/frams/_demos/genomanipulation.cpp

    r990 r999  
    196196                        printf(cl->getPreferredOutput() ? "and provides meaningful output signal (getPreferredOutput()==1).\n" : "and doesn't provide useful output signal (getPreferredOutput()==0).\n");
    197197                        printf("Instances of '%s' can be used in models having ", cl->getName().c_str());
    198                         if (cl->getSupportedShapeTypes() == NeuroClass::SUPPORTED_SHAPE_ALL)
     198                        if (cl->getSupportedShapeTypes() == NeuroClass::SUPPORTED_SHAPETYPE_ALL)
    199199                                printf("any shape types.\n");
    200200                        else
    201201                        {
    202202                                printf("shape types:");
    203                                 for (int i = Model::SHAPE_FIRST; i <= Model::SHAPE_LAST; i++)
     203                                for (int i = Model::SHAPETYPE_FIRST; i <= Model::SHAPETYPE_LAST; i++)
    204204                                        if (cl->isShapeTypeSupported((Model::ShapeType)i))
    205205                                                printf(" '%s'", Model::getShapeTypeName((Model::ShapeType)i));
     
    209209                        {
    210210                                printf("Instances of '%s' can be attached to Joints having ", cl->getName().c_str());
    211                                 if (cl->getSupportedJointShapes() == NeuroClass::SUPPORTED_JOINT_ALL)
     211                                if (cl->getSupportedJointShapes() == NeuroClass::SUPPORTED_JOINTSHAPE_ALL)
    212212                                        printf("any shapes");
    213213                                else
     
    311311                g.getFormat().c_str(), g.getComment().c_str());
    312312
    313         Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
     313        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
    314314
    315315        if (!m.isValid())
  • cpp/frams/_demos/geometry/geometrytestutils.cpp

    r972 r999  
    6363                if ((genoIndex == count) || (strcmp(genotype->name.c_str(), genoName) == 0))
    6464                {
    65                         Model model(genotype->genotype, Model::SHAPE_UNKNOWN);
     65                        Model model(genotype->genotype, Model::SHAPETYPE_UNKNOWN);
    6666
    6767                        if (!model.isValid())
  • cpp/frams/_demos/multiline_f0_test.cpp

    r986 r999  
    3030                g.getFormat().c_str(), g.getComment().c_str());
    3131
    32         Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
     32        Model m(g, Model::SHAPETYPE_UNKNOWN);//.getConverted('0'));
    3333
    3434        if (!m.isValid())
  • cpp/frams/_demos/neuro_layout_test.cpp

    r972 r999  
    104104        Geno g(gen);
    105105        if (!g.isValid()) { puts("invalid genotype"); return 5; }
    106         Model m(g, Model::SHAPE_UNKNOWN);
     106        Model m(g, Model::SHAPETYPE_UNKNOWN);
    107107        if (!m.getNeuroCount()) { puts("no neural network"); return 1; }
    108108        printf("%d neurons,", m.getNeuroCount());
  • cpp/frams/_demos/neuro_test.cpp

    r972 r999  
    7777        Geno g(gen);
    7878        if (!g.isValid()) { puts("invalid genotype"); return 5; }
    79         Model m(g, Model::SHAPE_UNKNOWN);
     79        Model m(g, Model::SHAPETYPE_UNKNOWN);
    8080        if (!m.getNeuroCount()) { puts("no neural network"); return 1; }
    8181        printf("%d neurons,", m.getNeuroCount());
  • cpp/frams/_demos/shapeconvert.cpp

    r972 r999  
    6767                loadSString(VirtFILE::Vstdin, gen);
    6868        Geno g(gen);
    69         Model m(g, Model::SHAPE_UNKNOWN);
     69        Model m(g, Model::SHAPETYPE_UNKNOWN);
    7070
    7171        if (!m.isValid())
     
    7575        }
    7676
    77         if (m.getShapeType() != Model::SHAPE_BALL_AND_STICK)
     77        if (m.getShapeType() != Model::SHAPETYPE_BALL_AND_STICK)
    7878        {
    7979                logPrintf("", "shapeconvert", LOG_ERROR, "Only ball-and-stick models can be converted");
Note: See TracChangeset for help on using the changeset viewer.