Changeset 1249 for cpp/frams/genetics/f4/f4_general.cpp

Timestamp:

05/21/23 23:16:51 (18 months ago)

Author:

Maciej Komosinski

Message:

Multiple issues fixed when calculating bending range for the '|' bending muscle (earlier it was always 1.0 despite the code that supposedly calculated this)

File:

• cpp/frams/genetics/f4/f4_general.cpp (modified) (12 diffs)

cpp/frams/genetics/f4/f4_general.cpp

@@ -12 +12 @@
 #include <frams/model/model.h> // for min and max attributes
 #include <common/nonstd_math.h>
+#include <algorithm> // std::min, std::max
 
 #ifdef DMALLOC
@@ -46 +47 @@
         anglepos = nangle;
         commacount = 0;
-        childcount = 0;
+        stickchildcount = 0;
         P = newP;
         rolling = 0;
@@ -65 +66 @@
                         //firstend = ndad->lastend;
                         //OM = ndad->OM;
-                        ndad->childcount++;
+                        ndad->stickchildcount++;
                 }
                 if (ndad->type == CELL_NEURON)
@@ -76 +77 @@
         // adjust lastend
         //lastend = firstend + ((Orient)OM * (Pt3D(1,0,0) * P.len));
-        mz = 1;
+        P.muscle_bend_range = 1;
 }
 
@@ -96 +97 @@
         anglepos = nangle;
         commacount = 0;
-        childcount = 0;
+        stickchildcount = 0;
         P = newP;
         rolling = 0;
@@ -115 +116 @@
                         //firstend = ndad->lastend;
                         //OM = ndad->OM;
-                        ndad->childcount++;
+                        ndad->stickchildcount++;
                 }
                 if (ndad->type == CELL_NEURON)
@@ -126 +127 @@
         // adjust lastend
         //lastend = firstend + ((Orient)OM * (Pt3D(1,0,0) * P.len));
-        mz = 1;
+        P.muscle_bend_range = 1;
 }
 
@@ -548 +549 @@
 
 
-void f4_Cell::adjustRec()
-{
-        //f4_OrientMat rot;
-        int i;
-
-        if (recProcessedFlag)
+void f4_Cell::adjustRecur()
+{
+        if (recurProcessedFlag)
                 // already processed
                 return;
 
         // mark it processed
-        recProcessedFlag = 1;
+        recurProcessedFlag = true;
 
         // make sure its parent is processed first
         if (dadlink != NULL)
-                dadlink->adjustRec();
+                dadlink->adjustRecur();
 
         // count children
-        childcount = 0;
-        for (i = 0; i < org->cell_count; i++)
+        stickchildcount = 0;
+        for (int i = 0; i < org->cell_count; i++)
         {
                 if (org->C[i]->dadlink == this)
                         if (org->C[i]->type == CELL_STICK)
-                                childcount++;
-        }
+                                stickchildcount++;
+        }
+
+        if (dadlink == NULL)
+                P.muscle_bend_range = 1.0;
+        else
+                P.muscle_bend_range = 1.0 / std::max(1, dadlink->stickchildcount); //bend range in f1: 0, 1 (line XX[|]) -> 100%, 2 (Y-shape X(X[|],X)) -> 50%, 3 (cross X(X[|],X,X)) -> 33%
+        //MacKo 2023-05: but shouldn't this formula ^^ also take commacount into consideration, like in f1?
 
         if (type == CELL_STICK)
@@ -580 +584 @@
                         // rotation due to rolling
                         xrot = rolling;
-                        mz = 1;
                 }
                 else
@@ -589 +592 @@
                         Padj.propagateAlong(false);
 
-                        //rot = Orient_1;
+                        //f4_OrientMat rot = Orient_1;
 
                         // rotation due to rolling
@@ -612 +615 @@
                         // rotation in world coordinates
                         //OM =  ((f4_OrientMat)dadlink->OM) * OM;
-                        mz = dadlink->mz / dadlink->childcount;
                 }
                 //Pt3D lastoffset = (Orient)OM * (Pt3D(1,0,0)*P.len);
@@ -737 +739 @@
         // reset recursive traverse flags
         for (int i = 0; i < cell_count; i++)
-                C[i]->recProcessedFlag = 0;
+                C[i]->recurProcessedFlag = false;
         // process every cell
         for (int i = 0; i < cell_count; i++)
-                C[i]->adjustRec();
+                C[i]->adjustRecur();
 
         //DB( printf("Cell simulation done, %d cells. \n", nc); )
 
         if (PRINT_CELLS_DEVELOPMENT) print_cells("Final");
+        if (PRINT_CELLS_DEVELOPMENT)
+                for (int i = 0; i < cell_count; i++)
+                        printf("%d,%d,dad=%d\tstick_children=%d\tcommas=%d\t|:range=%g\n", i, C[i]->nr, C[i]->dadlink ? C[i]->dadlink->nr : -1, C[i]->stickchildcount, C[i]->commacount, C[i]->P.muscle_bend_range);
 
         return errorcode;