Changeset 1246 for cpp/frams/genetics

Timestamp:

05/20/23 16:33:27 (18 months ago)

Author:

Maciej Komosinski

Message:

Optionally normalize the four "biological" properties when propagating them along sticks (only to test legacy code, now normalization is no longer used)

Location:

cpp/frams/genetics

Files:

• geneprops.cpp (modified) (3 diffs)
• geneprops.h (modified) (1 diff)

cpp/frams/genetics/geneprops.cpp

@@ -136 +136 @@
 }
 
-void GeneProps::propagateAlong(bool use_f1_muscle_reset_range)
+void GeneProps::propagateAlong(bool use_f1_muscle_reset_range, GenePropsOps* ops)
 {
         length = 0.5 * length + 0.5 * standard_values.length;
@@ -149 +149 @@
         muscle_power = 0.8 * muscle_power + 0.2 * standard_values.muscle_power;
 
-        normalizeBiol4();
+        if (ops == NULL)
+                ops = getStandardOps();
+        if (ops->use_normalizebiol4) normalizeBiol4();
 
         if (use_f1_muscle_reset_range)
@@ -267 +269 @@
         use_normalizebiol4 = false;
         auto fields = { length,curvedness,weight,friction,muscle_power,assimilation,stamina,ingestion,twist,energy,cred,cgreen,cblue };
-        for (auto x : fields)
-        {
-                auto xx = dynamic_cast<GenePropsOp_Old*>(x);
-                if (xx)
-                        xx->change = xx->revchange = 0.5;
+        for (auto f : fields)
+        {
+                auto f_gpo = dynamic_cast<GenePropsOp_Old*>(f);
+                if (f_gpo)
+                        f_gpo->change = f_gpo->revchange = 0.5;
         }
 }

cpp/frams/genetics/geneprops.h

@@ -162 +162 @@
          * @param use_reset_range true if this method should modify muscle_bend_range (used in f1 conversion).
          */
-        void propagateAlong(bool use_f1_muscle_reset_range);
+        void propagateAlong(bool use_f1_muscle_reset_range, GenePropsOps* ops = NULL);
 };