Changeset 534 for cpp/frams/_demos

Timestamp:

07/20/16 01:17:14 (8 years ago)

Author:

Maciej Komosinski

Message:

Renamed: get/setGene -> get/setGenes, setGeneOnly -> setGenesAssumingSameFormat

Location:

cpp/frams/_demos

Files:

• f0_variants_test.cpp (modified) (2 diffs)
• full_props.cpp (modified) (2 diffs)
• genoconv_test.cpp (modified) (3 diffs)
• genomanipulation.cpp (modified) (9 diffs)
• genooper_test.cpp (modified) (2 diffs)
• geometry/apices_test.cpp (modified) (2 diffs)
• geometry/info_test.cpp (modified) (2 diffs)
• geometry/surface_test.cpp (modified) (2 diffs)
• geometry/volume_test.cpp (modified) (2 diffs)
• multiline_f0_test.cpp (modified) (2 diffs)
• part_shapes.cpp (modified) (2 diffs)
• shapeconvert.cpp (modified) (2 diffs)

cpp/frams/_demos/f0_variants_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -94 +94 @@
         }
 Geno g(gen);
-printf("\nSource genotype: '%s'\n",g.getGene().c_str());
+printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
 printf("                  ( format %c %s)\n",
        g.getFormat(), g.getComment().c_str());

cpp/frams/_demos/full_props.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -97 +97 @@
 Geno f0_g;
 m.makeGeno(f0_g,NULL,reverse);//third arg is "handle_defaults" == whether f0 should omit default property values
-puts(f0_g.getGeneAndFormat().c_str());
+puts(f0_g.getGenesAndFormat().c_str());
 
 return 0;

cpp/frams/_demos/genoconv_test.cpp

@@ -51 +51 @@
 mod.getPart(1)->p=Pt3D(0,0.2,-1);
 mod.close();
-return mod.getGeno().getGene();
+return mod.getGeno().getGenes();
 }
 ~GenoConv_Test2() {}
@@ -112 +112 @@
 {
 printf("Genotype:\n%s\nFormat: %c\nValid: %s\nComment: %s\n",
-        g.getGene().c_str(),g.getFormat(),g.isValid()?"yes":"no",g.getComment().c_str());
+        g.getGenes().c_str(),g.getFormat(),g.isValid()?"yes":"no",g.getComment().c_str());
 }
 
@@ -159 +159 @@
         printf("conversion map:\n");
         m.print();
-        printConvMap(g1.getGene(),g2.getGene(),m);
+        printConvMap(g1.getGenes(),g2.getGenes(),m);
         printf("reverse conversion map:\n");
         MultiMap rm;
         rm.addReversed(m);
         rm.print();
-        printConvMap(g2.getGene(),g1.getGene(),rm);
+        printConvMap(g2.getGenes(),g1.getGenes(),rm);
         }
 
 Model mod1(g1,1);
 printf("\nmodel map for f%c genotype:\n",g1.getFormat());
-printModelMap(g1.getGene(),mod1.getMap());
+printModelMap(g1.getGenes(),mod1.getMap());
 mod1.getMap().print();
 Model mod2(g2,1);
 printf("\nmodel map for f%c genotype:\n",g2.getFormat());
-printModelMap(g2.getGene(),mod2.getMap());
+printModelMap(g2.getGenes(),mod2.getMap());
 mod2.getMap().print();
 return 0;

cpp/frams/_demos/genomanipulation.cpp

@@ -79 +79 @@
 CHANGE_ONE_PROPERTY(p->extraProperties());
 p->getModel().close();
-printf("\nLet's see f0... (check out part #%d !)\n\n%s\n", p->refno, p->getModel().getF0Geno().getGene().c_str());
+printf("\nLet's see f0... (check out part #%d !)\n\n%s\n", p->refno, p->getModel().getF0Geno().getGenes().c_str());
 }
 
@@ -91 +91 @@
 j->getModel().close();
 printf("The Part's position is changed, but everything else stays intact:\n\n%s\n",
-       j->getModel().getF0Geno().getGene().c_str());
+       j->getModel().getF0Geno().getGenes().c_str());
 }
 
@@ -104 +104 @@
 j->getModel().close();
 printf("Position of the second Part referenced by this joint (part #%d) is now changed:\n\n%s\n",
-       j->part2->refno, j->getModel().getF0Geno().getGene().c_str());
+       j->part2->refno, j->getModel().getF0Geno().getGenes().c_str());
 printf("If no delta fields are defined, they will be computed automatically.\n"
        "You can always delete existing delta values by using Joint::resetDelta().\n"
@@ -112 +112 @@
 j->resetDelta();
 j->getModel().close();
-printf("As you can see, Joint's delta fields have altered:\n\n%s\n", j->getModel().getF0Geno().getGene().c_str());
+printf("As you can see, Joint's delta fields have altered:\n\n%s\n", j->getModel().getF0Geno().getGenes().c_str());
 }
 
@@ -123 +123 @@
 j->getModel().close();
 printf("f0 is now:\n\n%s\n...so this is %s joint.\n",
-       j->getModel().getF0Geno().getGene().c_str(), option?"a delta":"an absolute");
+       j->getModel().getF0Geno().getGenes().c_str(), option?"a delta":"an absolute");
 
 }
@@ -155 +155 @@
 CHANGE_ONE_PROPERTY(j->extraProperties());
 j->getModel().close();
-printf("And after that we have this genotype:\n\n%s\n", j->getModel().getF0Geno().getGene().c_str());
+printf("And after that we have this genotype:\n\n%s\n", j->getModel().getF0Geno().getGenes().c_str());
 }
 
@@ -250 +250 @@
 n->getModel().close();
 printf("The final object description will be then: '%s'\nAnd the full f0 genotype:\n\n%s\n",
-       n->getDetails().c_str(), n->getModel().getF0Geno().getGene().c_str());
+       n->getDetails().c_str(), n->getModel().getF0Geno().getGenes().c_str());
 
 
@@ -281 +281 @@
         }
 Geno g(gen);
-printf("\nSource genotype: '%s'\n",g.getGene().c_str());
+printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
 printf("                  ( format %c %s)\n",
        g.getFormat(), g.getComment().c_str());
@@ -292 +292 @@
         return 2;       
         }
-printf("Converted to f0:\n%s\n",m.getF0Geno().getGene().c_str());
+printf("Converted to f0:\n%s\n",m.getF0Geno().getGenes().c_str());
 
 printf("Model contains: %d part(s)\n"

cpp/frams/_demos/genooper_test.cpp

@@ -9 +9 @@
 {
         printf("Genotype: %s\nFormat: %c\nValid: %s\nComment: %s\n",
-                g.getGene().c_str(), g.getFormat(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
+                g.getGenes().c_str(), g.getFormat(), g.isValid() ? "yes" : "no", g.getComment().len() == 0 ? "(empty)" : g.getComment().c_str());
 }
 
@@ -47 +47 @@
         printGenAndTitle(gvalidated, "validated");
 
-        printf("\nHTMLized: %s\n", genetics.genman.HTMLize(gvalidated.getGene().c_str()).c_str());
+        printf("\nHTMLized: %s\n", genetics.genman.HTMLize(gvalidated.getGenes().c_str()).c_str());
 
         return 0;

cpp/frams/_demos/geometry/apices_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -47 +47 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
+        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
 }
 

cpp/frams/_demos/geometry/info_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -72 +72 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
+        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
         
         // Printing calculated values.

cpp/frams/_demos/geometry/surface_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -47 +47 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
+        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
 }
 

cpp/frams/_demos/geometry/volume_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -39 +39 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts(resultModel.getF0Geno().getGeneAndFormat().c_str());
+        puts(resultModel.getF0Geno().getGenesAndFormat().c_str());
 }
 

cpp/frams/_demos/multiline_f0_test.cpp

@@ -26 +26 @@
         }
 Geno g(gen);
-printf("\nSource genotype: '%s'\n",g.getGene().c_str());
+printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
 printf("                  ( format %c %s)\n",
        g.getFormat(), g.getComment().c_str());
@@ -37 +37 @@
         return 2;       
         }
-printf("Converted to f0:\n%s\n",m.getF0Geno().getGene().c_str());
+printf("Converted to f0:\n%s\n",m.getF0Geno().getGenes().c_str());
 
 printf("\nusing Param::save() to create the \"expanded\" form of the f0 genotype...\n(MultiParamLoader should be able to load this)");

cpp/frams/_demos/part_shapes.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -52 +52 @@
 
         m.close();
-        puts(m.getF0Geno().getGeneAndFormat().c_str());
+        puts(m.getF0Geno().getGenesAndFormat().c_str());
         // the genotype can be fed directly to the genotype viewer, like this:
         // part_shapes | theater -g -

cpp/frams/_demos/shapeconvert.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -87 +87 @@
 
         Geno f0_g = newmodel.getF0Geno();
-        puts(f0_g.getGeneAndFormat().c_str());
+        puts(f0_g.getGenesAndFormat().c_str());
 
         return 0;