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

Timestamp:

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

Author:

Maciej Komosinski

Message:

Improved the fS encoding

File:

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

cpp/frams/genetics/fS/fS_general.cpp

@@ -17 +17 @@
 bool fS_Genotype::TURN_WITH_ROTATION = false;
 
-const std::map<string, double> defaultValues = {
-                {INGESTION,      0.5},//Model::getDefPart().ingest },
-                {FRICTION,       0.5},//Model::getDefPart().friction},
-                {STIFFNESS,              0.5},//Model::getDefJoint().stif},
-                {ROT_X,          0.0},
-                {ROT_Y,          0.0},
-                {ROT_Z,          0.0},
-                {RX,             0.0},
-                {RY,             0.0},
-                {RZ,             0.0},
-                {SIZE,           1.0},
-                {SIZE_X,         0.5},//Model::getDefPart().scale.x},
-                {SIZE_Y,         0.5},//Model::getDefPart().scale.y},
-                {SIZE_Z,         0.5}//Model::getDefPart().scale.z}
-};
+void Node::prepareParams()
+{
+        defaultValues = {
+                        {INGESTION, Model::getDefPart().ingest},
+                        {FRICTION,  Model::getDefPart().friction},
+                        {STIFFNESS, Model::getDefJoint().stif},
+                        {ROT_X,     0.0},
+                        {ROT_Y,     0.0},
+                        {ROT_Z,     0.0},
+                        {RX,        0.0},
+                        {RY,        0.0},
+                        {RZ,        0.0},
+                        {SIZE,      1.0},
+                        {SIZE_X,    Model::getDefPart().scale.x},
+                        {SIZE_Y,    Model::getDefPart().scale.y},
+                        {SIZE_Z,    Model::getDefPart().scale.z}
+        };
+}
 
 double fS_stod(const string&  str, int start, size_t* size)
@@ -76 +79 @@
 
 
-fS_Neuron::fS_Neuron(const char *str, int start, int length)
-{
+fS_Neuron::fS_Neuron(const char *str, int _start, int length)
+{
+        start = _start + 1;
+        end = start + length;
         if (length == 0)
                 return;
@@ -123 +128 @@
 Node::Node(Substring &restOfGeno, Node *_parent, GenotypeParams _genotypeParams)
 {
+        prepareParams();
         partDescription = new Substring(restOfGeno);
         genotypeParams = _genotypeParams;
@@ -165 +171 @@
         for (int i = 0; i < restOfGenotype.len; i++)
         {
-                if (GENE_TO_SHAPETYPE.find(restOfGenotype.at(i)) != GENE_TO_SHAPETYPE.end())
+                if (GENE_TO_SHAPE.find(restOfGenotype.at(i)) != GENE_TO_SHAPE.end())
                         return i;
         }
@@ -193 +199 @@
 void Node::extractPartType(Substring &restOfGenotype)
 {
-        auto itr = GENE_TO_SHAPETYPE.find(restOfGenotype.at(0));
-        if (itr == GENE_TO_SHAPETYPE.end())
+        auto itr = GENE_TO_SHAPE.find(restOfGenotype.at(0));
+        if (itr == GENE_TO_SHAPE.end())
                 throw fS_Exception("Invalid part type", restOfGenotype.start);
 
@@ -465 +471 @@
                 Neuro *neuro = new Neuro(*neurons[i]);
                 model.addNeuro(neuro);
+                neuro->addMapping(MultiRange(IRange(neurons[i]->start, neurons[i]->end)));
                 if (neuro->getClass()->preflocation == NeuroClass::PREFER_JOINT && parent != nullptr)
                 {
@@ -536 +543 @@
                 result += std::string(count, mod).c_str();
         }
-        result += SHAPETYPE_TO_GENE.at(partType);
+        result += SHAPE_TO_GENE.at(partType);
 
         if (!neurons.empty())
@@ -649 +656 @@
 }
 
-void fS_Genotype::buildModel(Model &model)
-{
+Model fS_Genotype::buildModel(bool using_checkpoints)
+{
+
+        Model model;
+        model.open(using_checkpoints);
+
         getState();
         startNode->buildModel(model, nullptr);
         buildNeuroConnections(model);
+
+        model.close();
+        return model;
 }