Changeset 1006 for cpp/frams/genetics/fS/fS_general.h

Timestamp:

07/14/20 16:04:46 (5 years ago)

Author:

Maciej Komosinski

Message:

Improved the fS encoding

File:

• cpp/frams/genetics/fS/fS_general.h (modified) (9 diffs)

cpp/frams/genetics/fS/fS_general.h

@@ -27 +27 @@
 const char NEURON_END = ']';
 const char NEURON_SEPARATOR = ';';
-const SString NEURON_INTERNAL_SEPARATOR("_");
+const SString NEURON_INTERNAL_SEPARATOR("'");
 #define NEURON_I_W_SEPARATOR ':'
 //@}
@@ -69 +69 @@
 const char CUBOID = 'C';
 const char CYLINDER = 'R';
-const std::unordered_map<Part::Shape, char> SHAPETYPE_TO_GENE = {
+const std::unordered_map<Part::Shape, char> SHAPE_TO_GENE = {
                 {Part::Shape::SHAPE_ELLIPSOID, ELLIPSOID},
                 {Part::Shape::SHAPE_CUBOID,    CUBOID},
@@ -76 +76 @@
 
 // This map is inverse to SHAPE_TO_SYMBOL. Those two should be compatible
-const std::unordered_map<char, Part::Shape> GENE_TO_SHAPETYPE = {
+const std::unordered_map<char, Part::Shape> GENE_TO_SHAPE = {
                 {ELLIPSOID, Part::Shape::SHAPE_ELLIPSOID},
                 {CUBOID,    Part::Shape::SHAPE_CUBOID},
                 {CYLINDER,  Part::Shape::SHAPE_CYLINDER},
 };
-const int SHAPE_COUNT = 3;    // This should be the count of SHAPETYPE_TO_GENE and GENE_TO_SHAPETYPE
+const int SHAPE_COUNT = 3;    // This should be the count of SHAPE_TO_GENE and GENE_TO_SHAPE
 
 const char DEFAULT_JOINT = 'a';
@@ -100 +100 @@
 };
 
-extern const std::map<string, double> defaultValues;
-
 /** @name Number of tries of performing a mutation before GENOPER_FAIL is returned */
 #define mutationTries  20
@@ -198 +196 @@
         MultiRange toMultiRange()
         {
-                MultiRange range;
-                range.add(start, start + len - 1);
-                return range;
+                int end = start + len - 1;
+                return MultiRange(IRange(start, end));
         }
 };
@@ -244 +241 @@
 {
 public:
+        int start, end;
         std::map<int, double> inputs;
 
@@ -274 +272 @@
         Part *part;     /// A part object built from node. Used in building the Model
         int partCodeLen; /// The length of substring that directly describes the corresponding part
+        std::map<string, double> defaultValues;
         GenotypeParams genotypeParams;
-
 
         vector<Node *> children;    /// Vector of all direct children
         std::map<char, int> modifiers;     /// Vector of all modifiers
         vector<fS_Neuron *> neurons;    /// Vector of all the neurons
+
+        void prepareParams();
 
         double getDistance();
@@ -398 +398 @@
 
         /**
-         * Change the value of the size parameter by given multiplier
-         * Do not change the value if any of the size restrictions is not satisfied
-         * @param paramKey
-         * @param multiplier
-         * @param ensureCircleSection
-         * @return True if the parameter value was change, false otherwise
-         */
-        bool mutateSizeParam(string paramKey,  bool ensureCircleSection);
-
-        /**
          * Counts all the nodes in subtree
          * @return node count
@@ -521 +511 @@
          * @param a reference to a model that will contain a built model
          */
-        void buildModel(Model &model);
+        Model buildModel(bool using_checkpoints);
 
         /**