Changeset 1261 for cpp/frams

Timestamp:

06/22/23 17:25:06 (18 months ago)

Author:

Maciej Komosinski

Message:

Disabled mutating joint stiffness in fH and fB

Location:

cpp/frams/genetics/fH

Files:

• fH_general.cpp (modified) (2 diffs)
• fH_general.h (modified) (1 diff)

cpp/frams/genetics/fH/fH_general.cpp

@@ -18 +18 @@
 const char *fH_part_names[FH_PART_PROPS_COUNT] = { "fr" }; // , "dn", "ing", "as" };
 
-const char *fH_joint_names[FH_JOINT_PROPS_COUNT] = { "stif", "rotstif" }; //, "stam" };
+const char *fH_joint_names[FH_JOINT_PROPS_COUNT] = { "rotstif" }; //"stif", "stam" }; //actually we would want to disable "rotstif" too (we assume the default value is the best, lower values are good to test technical abilities of phenotypes, but in most cases not useful for evolution - the structures and muscles get weaker and even more elastic), but having no joint properties was never tested, so better leave at least one
 
 void fH_Handle::loadProperties(Param par)
@@ -397 +397 @@
         model->addJoint(newjoint);
 
-        newjoint->stif = par.getDoubleById("stif");
         newjoint->rotstif = par.getDoubleById("rotstif");
+        //newjoint->stif = par.getDoubleById("stif");
         //newjoint->stamina = par.getDoubleById("stam");
         newjoint->attachToParts(firstpart, secondpart);

cpp/frams/genetics/fH/fH_general.h

@@ -19 +19 @@
 #define STICKH_LENGTH_TYPE "f 0.001 1.999 1.0" ///<Length of stick handle. Minimum should not be equal to 0, because calculating direction of next part from current stick with length 0 would be impossible
 #define FH_PART_PROPS_COUNT   1 ///<Count of part properties
-#define FH_JOINT_PROPS_COUNT  2 ///<Count of joint properties
+#define FH_JOINT_PROPS_COUNT  1 ///<Count of joint properties
 #define FH_PE_NEURO_DET       "d" ///<Id of details type definition in f0_neuro_paramtab
 #define FH_PE_CONN_WEIGHT     "w" ///<Id of weight type definition in f0_neuroconn_paramtab