Changeset 520 for cpp/frams

Timestamp:

06/22/16 16:41:58 (8 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

Location:

cpp/frams/_demos

Files:

• loader_test_geno.cpp (modified) (1 diff)
• loader_test_param.cpp (modified) (1 diff)
• saver_test_geno.cpp (modified) (1 diff)

cpp/frams/_demos/loader_test_geno.cpp

@@ -11 +11 @@
 
  \include loader_test.cpp
-*/
+ */
 
-int main(int argc,char*argv[])
+int main(int argc, char*argv[])
 {
-if (argc<2)
+        if (argc < 2)
         {
-        fprintf(stderr,"Arguments: filename [genotype name or index (1-based) [field name]]\n"
-             "If a genotype is indicated (by providing the optional genotype identifier), the program will output the raw genotype, suitable for Framsticks Theater's genotype viewer mode. If a genotype and a field name is given, the field value (instead of the raw genotype) is printed. If the second argument is not given, the genotype names from the file will be listed.\n"
-             "Example: loader_test walking.gen \"Basic Quadruped\" | theater -g -\n"
-                );
-        return 1;
+                fprintf(stderr, "Arguments: filename [genotype name or index (1-based) [field name]]\n"
+                        "If a genotype is indicated (by providing the optional genotype identifier), the program will output the raw genotype, suitable for Framsticks Theater's genotype viewer mode. If a genotype and a field name is given, the field value (instead of the raw genotype) is printed. If the second argument is not given, the genotype names from the file will be listed.\n"
+                        "Example: loader_test walking.gen \"Basic Quadruped\" | theater -g -\n"
+                        );
+                return 1;
         }
 
-long count=0,totalsize=0;
-StdioFileSystem_autoselect stdiofilesys;
-MiniGenotypeLoader loader(argv[1]);
-const char* selected=(argc<3)?NULL:argv[2];
-const char* field_name=(argc<4)?NULL:argv[3];
-int selected_index=(selected&&isdigit(selected[0]))?atol(selected):0;
-// using char* constructor (passing the file name to open)
-MiniGenotype *loaded;
-while(loaded=loader.loadNextGenotype())
+        long count = 0, totalsize = 0;
+        StdioFileSystem_autoselect stdiofilesys;
+        MiniGenotypeLoader loader(argv[1]);
+        const char* selected = (argc < 3) ? NULL : argv[2];
+        const char* field_name = (argc < 4) ? NULL : argv[3];
+        int selected_index = (selected&&isdigit(selected[0])) ? atol(selected) : 0;
+        // using char* constructor (passing the file name to open)
+        MiniGenotype *loaded;
+        while (loaded = loader.loadNextGenotype())
         { // if loaded != NULL then the "org:" object data was
-         // loaded into MiniGenotype object
-        count++;
-        totalsize+=loaded->genotype.len();
-        if (selected)
+                // loaded into MiniGenotype object
+                count++;
+                totalsize += loaded->genotype.len();
+                if (selected)
                 {
-                if (selected_index)
+                        if (selected_index)
                         {
-                        if (selected_index!=count)
-                                continue;
+                                if (selected_index != count)
+                                        continue;
                         }
-                else
+                        else
                         {
-                        if (strcmp(loaded->name.c_str(),selected))
-                                continue;
+                                if (strcmp(loaded->name.c_str(), selected))
+                                        continue;
                         }
-                if (field_name)
+                        if (field_name)
                         {
-                        Param p(minigenotype_paramtab,loaded);
-                        int field_index=p.findId(field_name);
-                        if (field_index<0)
+                                Param p(minigenotype_paramtab, loaded);
+                                int field_index = p.findId(field_name);
+                                if (field_index < 0)
                                 {
-                                printf("Field '%s' not found\n",field_name);
-                                return 3;
+                                        printf("Field '%s' not found\n", field_name);
+                                        return 3;
                                 }
-                        else
-                                puts(p.get(field_index).c_str());
-                                }
+                                else
+                                        puts(p.get(field_index).c_str());
+                        }
                         else
                                 puts(loaded->genotype.c_str());
+                        return 0;
+                }
+                fprintf(stderr, "%d. %s\t(%d characters)\n", count, loaded->name.c_str(), loaded->genotype.len());
+        }
+        // the loop repeats until loaded==NULL, which could be beacause of error
+        if (loader.getStatus() == MiniGenotypeLoader::OnError)
+                fprintf(stderr, "Error: %s", loader.getError().c_str());
+        // (otherwise it was the end of the file)
+        if (selected)
+        {
+                fprintf(stderr, "genotype %s not found in %s\n", selected, argv[1]);
+                return 2;
+        }
+        else
+        {
+                fprintf(stderr, "\ntotal: %d items, %d characters\n", count, totalsize);
                 return 0;
-                }
-        fprintf(stderr,"%d. %s\t(%d characters)\n",count,loaded->name.c_str(),loaded->genotype.len());
-        }
-// the loop repeats until loaded==NULL, which could be beacause of error
-if (loader.getStatus()==MiniGenotypeLoader::OnError)
-        fprintf(stderr,"Error: %s",loader.getError().c_str());
-// (otherwise it was the end of the file)
-if (selected)
-        {
-        fprintf(stderr,"genotype %s not found in %s\n",selected,argv[1]);
-        return 2;
-        }
-else
-        {
-        fprintf(stderr,"\ntotal: %d items, %d characters\n",count,totalsize);
-        return 0;
         }
 }

cpp/frams/_demos/loader_test_param.cpp

@@ -14 +14 @@
  Additional information and messages are printed to standard error.
  You can redirect one or both streams if needed.
- 
+
  A sample input file for this program is "loader_test_param.in",
  so you can run this program from the "cpp" directory as
  ./loader_test_param  frams/_demos/loader_test_param.in
- 
+
  \include loader_test_param.cpp
  */

cpp/frams/_demos/saver_test_geno.cpp

@@ -11 +11 @@
 
  \include saver_test_geno.cpp
-*/
+ */
 
-int main(int argc,char*argv[])
+int main(int argc, char*argv[])
 {
-if (argc<3)
+        if (argc < 3)
         {
-        fprintf(stderr,"Arguments: filename number_of_genotypes\n"
-             "Example: saver_test_geno file.gen 3\n"
-                );
-        return 1;
+                fprintf(stderr, "Arguments: filename number_of_genotypes\n"
+                        "Example: saver_test_geno file.gen 3\n"
+                        );
+                return 1;
         }
 
-StdioFileSystem_autoselect stdiofilesys;
-VirtFILE *f=Vfopen(argv[1],"w");
-if (f)
+        StdioFileSystem_autoselect stdiofilesys;
+        VirtFILE *f = Vfopen(argv[1], "w");
+        if (f)
         {
-        int N=atoi(argv[2]);
-        MiniGenotype g;
-        Param p(minigenotype_paramtab,&g);
-        g.clear();
-        printf("Saving %d genotypes to %s\n",N,argv[1]);
-        for(int i=1;i<=N;i++)
+                int N = atoi(argv[2]);
+                MiniGenotype g;
+                Param p(minigenotype_paramtab, &g);
+                g.clear();
+                printf("Saving %d genotypes to %s\n", N, argv[1]);
+                for (int i = 1; i <= N; i++)
                 {
-                g.name=SString::sprintf("Genotype#%d",i);
-                g.genotype=""; for(int x=0;x<i;x++) g.genotype+="X";
-                g.velocity=0.1*i;
-                g.energy0=1;
-                g.info="Saved by saver_test_geno.cpp";
-                g.is_valid=1;
-                p.save(f,"org");
+                        g.name = SString::sprintf("Genotype#%d", i);
+                        g.genotype = ""; for (int x = 0; x < i; x++) g.genotype += "X";
+                        g.velocity = 0.1*i;
+                        g.energy0 = 1;
+                        g.info = "Saved by saver_test_geno.cpp";
+                        g.is_valid = 1;
+                        p.save(f, "org");
                 }
-        delete f;
-        return 0;
+                delete f;
+                return 0;
         }
-else
+        else
         {
-        printf("Could not write to %s\n",argv[1]);
-        return 1;
+                printf("Could not write to %s\n", argv[1]);
+                return 1;
         }
 }