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

Timestamp:

07/03/20 00:32:23 (4 years ago)

Author:

Maciej Komosinski

Message:

• separate "0" and "0s" formats (for SHAPE_BALL_AND_STICK and SHAPE_SOLIDS, respectively)
• converting to format list (Geno::F0_FORMAT_LIST = "0,0s")
• (optional) declaring Model as SHAPE_BALL_AND_STICK or SHAPE_SOLIDS (or SHAPE_UNKNOWN)

File:

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

cpp/frams/_demos/genoconv_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -16 +16 @@
  */
 
-/// Sample Geno converter not using Model class.
-/// (This converter generates the same output for each input).
-/// Such a converter is responsible for doing valid f0 (or other format) output and storing temporary data.
+ /// Sample Geno converter not using Model class.
+ /// (This converter generates the same output for each input).
+ /// Such a converter is responsible for doing valid f0 (or other format) output and storing temporary data.
 class GenoConv_Test : public GenoConverter
 {
@@ -84 +84 @@
         for (t = src; *t; t++)
         {
-                if (insideneuron&&*t == ']') insideneuron = 0;
+                if (insideneuron && *t == ']') insideneuron = 0;
                 if (*t == '[') insideneuron = 1;
                 if ((!insideneuron) && isdigit(*t) && t[1])
@@ -93 +93 @@
                                 dst += *t;
                         if (map) // fill in the map only if requested
-                                map->add(t - src, t - src, dst.len() - n, dst.len() - 1);
+                                map->add(t - src, t - src, dst.length() - n, dst.length() - 1);
                         // meaning: source character (t-src) becomes (dst.len()-n ... dst.len()-1)
                 }
@@ -100 +100 @@
                         dst += *t;
                         if (map)
-                                map->add(t - src, t - src, dst.len() - 1, dst.len() - 1);
+                                map->add(t - src, t - src, dst.length() - 1, dst.length() - 1);
                         // meaning: map single to single character: (t-src) into (dst.len()-1)
                 }
@@ -113 +113 @@
 {
         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());
+                g.getGenes().c_str(), g.getFormat().c_str(), g.isValid() ? "yes" : "no", g.getComment().c_str());
 }
 
@@ -167 +167 @@
         if (using_checkpoints)
         { // using Model with checkpoints
-                Model m1(g2, false, true);//true=using_checkpoints
+                Model m1(g2, Model::SHAPE_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, false, true);//true=using_checkpoints
+                Model m2(g1, Model::SHAPE_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)
@@ -195 +195 @@
                 }
 
-                Model mod1(g1, 1);
+                Model mod1(g1, Model::SHAPE_UNKNOWN, 1);
                 printf("\nModel map for f%s genotype:\n", g1.getFormat().c_str());
                 ModelDisplayMap dm1(mod1);
@@ -202 +202 @@
                 mod1combined.addCombined(mod1.getMap(), dm1.getMap());
                 mod1combined.print();
-                Model mod2(g2, 1);
+                Model mod2(g2, Model::SHAPE_UNKNOWN, 1);
                 printf("\nModel map for f%s genotype:\n", g2.getFormat().c_str());
                 ModelDisplayMap dm2(mod2);