Changeset 1006 for cpp/frams/genetics/fS/fS_oper.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_oper.cpp (modified) (8 diffs)

cpp/frams/genetics/fS/fS_oper.cpp

@@ -36 +36 @@
 
 
-
-const std::map<string, double> minValues = {
-                {INGESTION,      0},//Model::getMinPart().ingest},
-                {FRICTION,       0},//Model::getMinPart().friction},
-                {STIFFNESS,              0.1},
-                {ROT_X,          -M_PI},
-                {ROT_Y,          -M_PI},
-                {ROT_Z,          -M_PI},
-                {RX,             -M_PI},
-                {RY,             -M_PI},
-                {RZ,             -M_PI},
-                {SIZE,           0.01},
-                {SIZE_X,         0},//Model::getMinPart().scale.x},
-                {SIZE_Y,         0},//Model::getMinPart().scale.y},
-                {SIZE_Z,         0}//Model::getMinPart().scale.z}
-};
-
-const std::map<string, double> maxValues = {
-                {INGESTION,      1},//Model::getMaxPart().ingest},
-                {FRICTION,       1},//Model::getMaxPart().friction},
-                {STIFFNESS,              0.5},
-                {ROT_X,          M_PI},
-                {ROT_Y,          M_PI},
-                {ROT_Z,          M_PI},
-                {RX,             M_PI},
-                {RY,             M_PI},
-                {RZ,             M_PI},
-                {SIZE,           100.0},
-                {SIZE_X,         1},//Model::getMaxPart().scale.x},
-                {SIZE_Y,         1},//Model::getMaxPart().scale.y},
-                {SIZE_Z,         1}//Model::getMaxPart().scale.z}
-};
-
+void GenoOper_fS::prepareParams()
+{
+        minValues = {
+                        {INGESTION, Model::getMinPart().ingest},
+                        {FRICTION,  Model::getMinPart().friction},
+                        {STIFFNESS, 0.1},
+                        {ROT_X,     -M_PI},
+                        {ROT_Y,     -M_PI},
+                        {ROT_Z,     -M_PI},
+                        {RX,        -M_PI},
+                        {RY,        -M_PI},
+                        {RZ,        -M_PI},
+                        {SIZE,      0.01},
+                        {SIZE_X,    Model::getMinPart().scale.x},
+                        {SIZE_Y,    Model::getMinPart().scale.y},
+                        {SIZE_Z,    Model::getMinPart().scale.z}
+        };
+
+        maxValues = {
+                        {INGESTION, Model::getMaxPart().ingest},
+                        {FRICTION,  Model::getMaxPart().friction},
+                        {STIFFNESS, 0.5},
+                        {ROT_X,     M_PI},
+                        {ROT_Y,     M_PI},
+                        {ROT_Z,     M_PI},
+                        {RX,        M_PI},
+                        {RY,        M_PI},
+                        {RZ,        M_PI},
+                        {SIZE,      100.0},
+                        {SIZE_X,    Model::getMaxPart().scale.x},
+                        {SIZE_Y,    Model::getMaxPart().scale.y},
+                        {SIZE_Z,    Model::getMaxPart().scale.z}
+        };
+}
 
 GenoOper_fS::GenoOper_fS()
 {
+        prepareParams();
         par.setParamTab(genooper_fS_paramtab);
         par.select(this);
@@ -332 +334 @@
         geno.getState();
         Node *node = geno.chooseNode();
-        char partType = SHAPETYPE_TO_GENE.at(availablePartShapes[rndUint(availablePartShapes.size())]);
+        char partType = SHAPE_TO_GENE.at(availablePartShapes[rndUint(availablePartShapes.size())]);
 
         Substring substring(&partType, 0, 1);
@@ -374 +376 @@
         {
                 geno.getState();
-                newNode->mutateSizeParam(SIZE_X, true);
-                newNode->mutateSizeParam(SIZE_Y, true);
-                newNode->mutateSizeParam(SIZE_Z, true);
+                mutateSizeParam(newNode, SIZE_X, true);
+                mutateSizeParam(newNode, SIZE_Y, true);
+                mutateSizeParam(newNode, SIZE_Z, true);
         }
         return true;
@@ -483 +485 @@
         bool isRadius = isRadiusOfBase || key == SIZE_X;
         if (ensureCircleSection && isRadius)
+        if (ensureCircleSection && isRadius)
         {
                 if (randomNode->partType == Part::Shape::SHAPE_ELLIPSOID)
@@ -490 +493 @@
         }
         // Add modified default value for param
-        randomNode->params[key] = mutateCreep('f', defaultValues.at(key), minValues.at(key), maxValues.at(key), true);
+        randomNode->params[key] = mutateCreep('f', randomNode->defaultValues.at(key), minValues.at(key), maxValues.at(key), true);
         return true;
 }
@@ -530 +533 @@
                                 return true;
                         } else
-                                return randomNode->mutateSizeParam(it->first, ensureCircleSection);
+                                return mutateSizeParam(randomNode, it->first, ensureCircleSection);
                 }
         }
@@ -696 +699 @@
 }
 
-bool Node::mutateSizeParam(string key, bool ensureCircleSection)
-{
-        double oldValue = getParam(key);
-        double volume = calculateVolume();
+bool GenoOper_fS::mutateSizeParam(Node *node, string key, bool ensureCircleSection)
+{
+        double oldValue = node->getParam(key);
+        double volume = node->calculateVolume();
         double valueAtMinVolume, valueAtMaxVolume;
         if(key == SIZE)
@@ -715 +718 @@
         double max = std::min(maxValues.at(key), valueAtMaxVolume);
 
-        params[key] = GenoOperators::mutateCreep('f', getParam(key), min, max, true);
-
-        if (!ensureCircleSection || isPartSizeValid())
+        node->params[key] = GenoOperators::mutateCreep('f', node->getParam(key), min, max, true);
+
+        if (!ensureCircleSection || node->isPartSizeValid())
                 return true;
         else
         {
-                params[key] = oldValue;
-                return false;
-        }
-}
+                node->params[key] = oldValue;
+                return false;
+        }
+}