Changeset 972 for cpp/frams/_demos/multiline_f0_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/multiline_f0_test.cpp (modified) (3 diffs)

cpp/frams/_demos/multiline_f0_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-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -13 +13 @@
 #include <common/virtfile/stringfile.h>
 
-int main(int argc,char*argv[])
+int main(int argc, char*argv[])
 {
-LoggerToStdout messages_to_stdout(LoggerBase::Enable);
-PreconfiguredGenetics genetics;
+        LoggerToStdout messages_to_stdout(LoggerBase::Enable);
+        PreconfiguredGenetics genetics;
 
-SString gen(argc>1?argv[1]:"X[|G:1.23]");
-if (!strcmp(gen.c_str(),"-"))
+        SString gen(argc > 1 ? argv[1] : "X[|G:1.23]");
+        if (!strcmp(gen.c_str(), "-"))
         {
-        gen=0;
-        StdioFILEDontClose in(stdin);
-        loadSString(&in,gen);
+                gen = 0;
+                StdioFILEDontClose in(stdin);
+                loadSString(&in, gen);
         }
-Geno g(gen);
-printf("\nSource genotype: '%s'\n",g.getGenes().c_str());
-printf("                  ( format %s %s)\n",
-       g.getFormat().c_str(), g.getComment().c_str());
+        Geno g(gen);
+        printf("\nSource genotype: '%s'\n", g.getGenes().c_str());
+        printf("                  ( format %s %s)\n",
+                g.getFormat().c_str(), g.getComment().c_str());
 
-Model m(g);//.getConverted('0'));
+        Model m(g, Model::SHAPE_UNKNOWN);//.getConverted('0'));
 
-if (!m.isValid())
+        if (!m.isValid())
         {
-        printf("Cannot build Model from this genotype!\n");
-        return 2;       
+                printf("Cannot build Model from this genotype!\n");
+                return 2;
         }
-printf("Converted to f0:\n%s\n",m.getF0Geno().getGenes().c_str());
+        printf("Converted to f0:\n%s\n", m.getF0Geno().getGenes().c_str());
 
-printf("\nusing Param::saveMultiLine() to create the \"expanded\" form of the f0 genotype...\n(MultiParamLoader should be able to load this)");
+        printf("\nusing Param::saveMultiLine() to create the \"expanded\" form of the f0 genotype...\n(MultiParamLoader should be able to load this)");
 
-StringFILE2 f;
+        StringFILE2 f;
 
-static Param modelparam(f0_model_paramtab);
-static Param partparam(f0_part_paramtab);
-static Param jointparam(f0_joint_paramtab);
-static Param neuroparam(f0_neuro_paramtab);
-static Param connparam(f0_neuroconn_paramtab);
+        static Param modelparam(f0_model_paramtab);
+        static Param partparam(f0_part_paramtab);
+        static Param jointparam(f0_joint_paramtab);
+        static Param neuroparam(f0_neuro_paramtab);
+        static Param connparam(f0_neuroconn_paramtab);
 
-modelparam.select(&m);
-modelparam.saveMultiLine(&f,"m");
+        modelparam.select(&m);
+        modelparam.saveMultiLine(&f, "m");
 
-Part *p;
-Joint *j;
-Neuro *n;
+        Part *p;
+        Joint *j;
+        Neuro *n;
 
-for (int i=0;p=(Part*)m.getPart(i);i++)
+        for (int i = 0; p = (Part*)m.getPart(i); i++)
         {
-        partparam.select(p);
-        partparam.saveMultiLine(&f,"p");
+                partparam.select(p);
+                partparam.saveMultiLine(&f, "p");
         }
-for (int i=0;j=(Joint*)m.getJoint(i);i++)
+        for (int i = 0; j = (Joint*)m.getJoint(i); i++)
         {
-        jointparam.select(j);
-        jointparam.setParamTab(j->usedelta?f0_joint_paramtab:f0_nodeltajoint_paramtab);
-        jointparam.saveMultiLine(&f,"j");
+                jointparam.select(j);
+                jointparam.setParamTab(j->usedelta ? f0_joint_paramtab : f0_nodeltajoint_paramtab);
+                jointparam.saveMultiLine(&f, "j");
         }
-for (int i=0;n=(Neuro*)m.getNeuro(i);i++)
+        for (int i = 0; n = (Neuro*)m.getNeuro(i); i++)
         {
-        neuroparam.select(n);
-        neuroparam.saveMultiLine(&f,"n");
+                neuroparam.select(n);
+                neuroparam.saveMultiLine(&f, "n");
         }
-for (int a=0;n=(Neuro*)m.getNeuro(a);a++)
+        for (int a = 0; n = (Neuro*)m.getNeuro(a); a++)
         { // inputs
-        for (int b=0;b<n->getInputCount();b++)
+                for (int b = 0; b < n->getInputCount(); b++)
                 {
-                double w;
-                NeuroConn nc;
-                Neuro* n2=n->getInput(b,w);
-                nc.n1_refno=n->refno; nc.n2_refno=n2->refno;
-                nc.weight=w;
-                nc.info=n->getInputInfo(b);
-                connparam.select(&nc);
-                connparam.saveMultiLine(&f,"c");
+                        double w;
+                        NeuroConn nc;
+                        Neuro* n2 = n->getInput(b, w);
+                        nc.n1_refno = n->refno; nc.n2_refno = n2->refno;
+                        nc.weight = w;
+                        nc.info = n->getInputInfo(b);
+                        connparam.select(&nc);
+                        connparam.saveMultiLine(&f, "c");
                 }
         }
 
-printf("\n============================\n%s\n",f.getString().c_str());
+        printf("\n============================\n%s\n", f.getString().c_str());
 
-return 0;
+        return 0;
 }
 
@@ -95 +95 @@
 
 Source genotype: 'X[|G:1.23]'
-                  ( format 1 )
+                                  ( format 1 )
 Converted to f0:
 p: