Changeset 1248 for cpp

Timestamp:

05/21/23 23:03:45 (20 months ago)

Author:

Maciej Komosinski

Message:

Less duplicated constants (default values of Part and Joint properties)

File:

• cpp/frams/genetics/geneprops.cpp (modified) (1 diff)

cpp/frams/genetics/geneprops.cpp

@@ -10 +10 @@
 GeneProps::GeneProps()
 {
+        Part_MinMaxDef default_part = Model::getDefPart();
+        Joint default_joint = Model::getDefJoint();
+
         length = 1.0;
         weight = 1.0;
-        friction = 0.4;
+        friction = default_part.friction;
         curvedness = 0.0;
         twist = 0.0;
         energy = 1.0;
 
-        muscle_power = 0.25; // "biological" property
-        assimilation = 0.25; // "biological" property
-        stamina = 0.25; // "biological" property
-        ingestion = 0.25; // "biological" property
-
-        muscle_bend_range = 1.0;
+        // before 2023-05, the four fields below were aggregated and normalized using normalizeBiol4(), but this normalization only worked for f1 and f4 - other genetic encodings do not perform such normalization. If at all, this should be handled by the expdef depending on the goal of the experiment (e.g., to encourage specialization).
+        muscle_power = 0.25; // "biological" property, same as findNeuroClass("BendMuscle or RotMuscle")->paraminterface->getDoubleById("power")
+        assimilation = default_part.assim; // "biological" property
+        stamina = default_joint.stamina; // "biological" property
+        ingestion = default_part.ingest; // "biological" property
+
+        muscle_bend_range = 1.0; // same as findNeuroClass("BendMuscle")->paraminterface->getDoubleById("range")
         muscle_reset_range = true;
 
-        cred = 0.5;
-        cgreen = 0.5;
-        cblue = 0.5;
-
-        normalizeBiol4();
+        cred = default_part.vcolor.x;
+        cgreen = default_part.vcolor.y;
+        cblue = default_part.vcolor.z;
 }