Changeset 732 for cpp/frams/_demos/genotypeloader.h

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/genotypeloader.h (modified) (3 diffs)

cpp/frams/_demos/genotypeloader.h

@@ -8 +8 @@
 #include <frams/util/sstring.h>
 #include <frams/param/multiparamload.h>
-
-/** Defines the association between "org:" object (found in genotype files)
-        and the MiniGenotype fields. MiniGenotypeLoader uses this definition
-        but you can also use it to make MultiParamLoader load genotype
-        */
-extern ParamEntry minigenotype_paramtab[];
-
-/** Helper class, mostly useful with MultiParamLoader
-        or its specialized version: MiniGenotypeLoader.
-        MiniGenotype stores the subset of Genotype fields (the ones normally saved in .gen files)
-        */
-class MiniGenotype
-{
-public:
-        SString name, genotype, info, uid;
-        double info_timestamp;
-        SString info_author, info_email;
-        paInt info_author_ispublic, info_email_ispublic, info_origin;
-        SString info_how_created, info_performance;
-        double energy0, lifespan, velocity, distance, vertvel, vertpos;
-        paInt numparts, numjoints, numneurons, numconnections, ordnumber, generation, instances, is_valid;
-        ExtValue user1, user2, user3;
-        void clear() { Param p(minigenotype_paramtab, this); p.setDefault(); }
-};
+#include "genotypemini.h"
 
 /** In most simple cases this is the class you would use to load a series of genotypes from
@@ -48 +25 @@
         methods, or you can use it as a guide for creating your own specialized class.
         */
-class MiniGenotypeLoader : public MultiParamLoader
+class GenotypeMiniLoader : public MultiParamLoader
 {
-        MiniGenotype genotype_object;
+        GenotypeMini genotype_object;
         Param genotype_param;
         bool initialized;
         void init();
 public:
-        MiniGenotypeLoader();
-        MiniGenotypeLoader(VirtFILE *f);
-        MiniGenotypeLoader(const char* filename);
+        GenotypeMiniLoader();
+        GenotypeMiniLoader(VirtFILE *f);
+        GenotypeMiniLoader(const char* filename);
 
         /** @returns genotype object if one was loaded or NULL otherwise.
 
-                Returned MiniGenotype pointer always references the the same object (MiniGenotypeLoader::genotype_object)
+                Returned GenotypeMini pointer always references the the same object (GenotypeMiniLoader::genotype_object)
                 which means you may need to copy the data from it before calling loadNextGenotype() again.
-                In the default configuration (simple MiniGenotypeLoader) NULL is always final and should be used
+                In the default configuration (simple GenotypeMiniLoader) NULL is always final and should be used
                 to finish processing.
 
@@ -70 +47 @@
                 MultiParamLoader::finished() and other methods to determine the real cause of NULL.
                 */
-        MiniGenotype* loadNextGenotype();
+        GenotypeMini* loadNextGenotype();
 };