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

Timestamp:

07/03/20 00:32:23 (5 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/full_props.cpp (modified) (2 diffs)

cpp/frams/_demos/full_props.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2016  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -47 +47 @@
 */
 
-int main(int argc,char*argv[])
+int main(int argc, char*argv[])
 {
-StdioFILE::setStdio();//setup VirtFILE::Vstdin/out/err
-LoggerToStdout messages_to_stderr(LoggerBase::Enable | LoggerBase::DontBlock,VirtFILE::Vstderr); //errors -> stderr, don't interfere with stdout
+        StdioFILE::setStdio();//setup VirtFILE::Vstdin/out/err
+        LoggerToStdout messages_to_stderr(LoggerBase::Enable | LoggerBase::DontBlock, VirtFILE::Vstderr); //errors -> stderr, don't interfere with stdout
 
-PreconfiguredGenetics genetics;
+        PreconfiguredGenetics genetics;
 
-bool reverse=false;
-char* gen_arg=0;
-for(int i=1;i<argc;i++)
+        bool reverse = false;
+        char* gen_arg = 0;
+        for (int i = 1; i < argc; i++)
         {
-        char* ar=argv[i];
-        if (ar[0]=='-')
-                switch(ar[1])
+                char* ar = argv[i];
+                if (ar[0] == '-')
+                        switch (ar[1])
                         {
-                        case 'r': reverse=true; break;
+                        case 'r': reverse = true; break;
                         case 'h': puts("usage: full_props [-r[everse]] [genotype_or_stdin]\n"); break;
                         }
+                else
+                        if (!gen_arg)
+                                gen_arg = ar;
+        }
+        SString gen;
+        if (gen_arg)
+                gen = gen_arg;
         else
-                if (!gen_arg)
-                        gen_arg=ar;
-        }
-SString gen;
-if (gen_arg)
-        gen=gen_arg;
-else
-        loadSString(VirtFILE::Vstdin,gen);
-Geno g(gen);
-Model m(g);
+                loadSString(VirtFILE::Vstdin, gen);
+        Geno g(gen);
+        Model m(g, Model::SHAPE_UNKNOWN);
 
-if (!m.isValid())
+        if (!m.isValid())
         {
-        logPrintf("","full_props",LOG_ERROR,"Cannot build Model from the supplied genotype\n");
-        return 2;       
+                logPrintf("", "full_props", LOG_ERROR, "Cannot build Model from the supplied genotype\n");
+                return 2;
         }
 
-m.open();
-for(int i=0;i<m.getNeuroCount();i++)
+        m.open();
+        for (int i = 0; i < m.getNeuroCount(); i++)
         {
-        Neuro *n=m.getNeuro(i);
-        SyntParam p=n->classProperties(reverse);
-        p.update();// ...so everyone reading the source can recognize that p was created to update the neuro d field
-        // but actually, calling update() here is not necessary, because ~SyntParam() would do it anyway
+                Neuro *n = m.getNeuro(i);
+                SyntParam p = n->classProperties(reverse);
+                p.update();// ...so everyone reading the source can recognize that p was created to update the neuro d field
+                // but actually, calling update() here is not necessary, because ~SyntParam() would do it anyway
         }
-m.close();
+        m.close();
 
-// normal f0 (omitting default values) would be retrieved using m.getF0Geno()
-// the following form allows for more control:
-Geno f0_g;
-m.makeGeno(f0_g,NULL,reverse);//third arg is "handle_defaults" == whether f0 should omit default property values
-puts(f0_g.getGenesAndFormat().c_str());
+        // normal f0 (omitting default values) would be retrieved using m.getF0Geno()
+        // the following form allows for more control:
+        Geno f0_g;
+        m.makeGeno(f0_g, NULL, reverse);//third arg is "handle_defaults" == whether f0 should omit default property values
+        puts(f0_g.getGenesAndFormat().c_str());
 
-return 0;
+        return 0;
 }