Changeset 732 for cpp/frams/_demos/loader_test_geno.cpp

Timestamp:

02/15/18 00:42:07 (6 years ago)

Author:

Maciej Komosinski

Message:

Added support for "checkpoints" (intermediate phases of development of the Model when converting between genetic encodings). See Model.checkpoint() and conv_f1.cpp for an example.

File:

• cpp/frams/_demos/loader_test_geno.cpp (modified) (3 diffs)

cpp/frams/_demos/loader_test_geno.cpp

@@ -26 +26 @@
         long count = 0, totalsize = 0;
         StdioFileSystem_autoselect stdiofilesys;
-        MiniGenotypeLoader loader(argv[1]);
+        GenotypeMiniLoader 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;
+        GenotypeMini *loaded;
         while (loaded = loader.loadNextGenotype())
         { // if loaded != NULL then the "org:" object data was
@@ -51 +51 @@
                         if (field_name)
                         {
-                                Param p(minigenotype_paramtab, loaded);
+                                Param p(genotypemini_paramtab, loaded);
                                 int field_index = p.findId(field_name);
                                 if (field_index < 0)
@@ -68 +68 @@
         }
         // the loop repeats until loaded==NULL, which could be beacause of error
-        if (loader.getStatus() == MiniGenotypeLoader::OnError)
+        if (loader.getStatus() == GenotypeMiniLoader::OnError)
                 fprintf(stderr, "Error: %s", loader.getError().c_str());
         // (otherwise it was the end of the file)