Changeset 1249 for cpp/frams/genetics/f4/f4_conv.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_conv.cpp (modified) (9 diffs)

cpp/frams/genetics/f4/f4_conv.cpp

@@ -124 +124 @@
         // reset recursive traverse flags
         for (int i = 0; i < cells->cell_count; i++)
-                cells->C[i]->recProcessedFlag = 0;
+                cells->C[i]->recurProcessedFlag = false;
 
         open(using_checkpoints); // begin model build
@@ -131 +131 @@
         for (int i = 0; i < cells->cell_count; i++)
         {
-                int res = buildModelRec(cells->C[i]);
+                int res = buildModelRecur(cells->C[i]);
                 if (res)
                 {
@@ -166 +166 @@
 
 
-int f4_Model::buildModelRec(f4_Cell *C)
-{
-        int partidx;
-        int j, res;
-        MultiRange range;
-
-        if (C->recProcessedFlag)
+int f4_Model::buildModelRecur(f4_Cell *C)
+{
+        if (C->recurProcessedFlag)
                 // already processed
                 return 0;
 
         // mark it processed
-        C->recProcessedFlag = 1;
+        C->recurProcessedFlag = true;
 
         // make sure parent is a stick
-        if (NULL != C->dadlink)
+        if (C->dadlink != NULL)
                 if (C->dadlink->type != CELL_STICK)
                 {
@@ -187 +183 @@
 
         // make sure its parent is processed first
-        if (NULL != C->dadlink)
-        {
-                res = buildModelRec(C->dadlink);
+        if (C->dadlink != NULL)
+        {
+                int res = buildModelRecur(C->dadlink);
                 if (res) return res;
         }
 
         char tmpLine[100];
-
-        range = C->genoRange;
+        MultiRange range = C->genoRange;
+
         if (C->type == CELL_STICK)
         {
@@ -208 +204 @@
                                 //C->firstend.x, C->firstend.y, C->firstend.z
                         );
-                        partidx = addFromString(PartType, tmpLine, &range);
-                        if (partidx < 0) return -1;
+                        jj_p1_refno = addFromString(PartType, tmpLine, &range);
+                        if (jj_p1_refno < 0) return -1;
                         this->checkpoint();
-                        jj_p1_refno = partidx;
                 }
                 else {
@@ -225 +220 @@
                         /*"vol=" 1.0/C->P.mass,*/ C->P.friction, C->P.ingestion, C->P.assimilation
                 );
-                partidx = addFromString(PartType, tmpLine, &range);
-                if (partidx < 0) return -2;
-                C->p2_refno = partidx;
+                C->p2_refno = addFromString(PartType, tmpLine, &range);
+                if (C->p2_refno < 0) return -2;
 
                 // new joint object
@@ -245 +239 @@
                         C->P.stamina
                 );
-                partidx = addFromString(JointType, tmpLine, &range);
-                if (partidx < 0) return -13;
+                C->joint_refno = addFromString(JointType, tmpLine, &range);
+                if (C->joint_refno < 0) return -13;
                 this->checkpoint();
-                C->joint_refno = partidx;
         }
 
@@ -254 +247 @@
         {
                 const char* nclass = C->neuclass->name.c_str();
-                int partno, jointno;
                 if (C->neuclass->getPreferredLocation() == 0)
                 {
-                        if (strcmp(nclass, "N") == 0)
-                        {
-                                partno = C->dadlink->p2_refno;
-                                if ((partno < 0) || (partno >= getPartCount())) return -21;
-                                else sprintf(tmpLine, "p=%d,d=\"N:in=%g,fo=%g,si=%g\"", partno, C->inertia, C->force, C->sigmo);
-                        }
+                        if (strcmp(nclass, "N") == 0) //special case just to specify the only neuron properties supported by f4, i.e., the properties for neuron class 'N'
+                                sprintf(tmpLine, "d=\"N:in=%g,fo=%g,si=%g\"", C->inertia, C->force, C->sigmo);
                         else
-                        {
                                 sprintf(tmpLine, "d=\"%s\"", nclass);
-                        }
-                        partidx = addFromString(NeuronType, tmpLine, &range);
-                        if (partidx < 0) return -22;
+
+                        C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
+                        if (C->neuro_refno < 0) return -22;
                         this->checkpoint();
-                        C->neuro_refno = partidx;
                 }
                 else if (C->neuclass->getPreferredLocation() == 1) // attached to Part or have no required attachment - also part
                 {
-                        partno = C->dadlink->p2_refno;
+                        int partno = C->dadlink->p2_refno;
                         if ((partno < 0) || (partno >= getPartCount())) return -21;
 
-                        if (strcmp(nclass, "N") == 0)
-                                sprintf(tmpLine, "p=%d,d=\"N:in=%g,fo=%g,si=%g\"", partno, C->inertia, C->force, C->sigmo);
-                        else
-                                sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
-
-                        partidx = addFromString(NeuronType, tmpLine, &range);
-                        if (partidx < 0) return -22;
+                        sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
+
+                        C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
+                        if (C->neuro_refno < 0) return -22;
                         this->checkpoint();
-                        C->neuro_refno = partidx;
                 }
                 else // attached to Joint, assume there are only three possibilities of getPreferredLocation()
                 {
-                        jointno = C->dadlink->joint_refno;
+                        int jointno = C->dadlink->joint_refno;
 
                         if (strcmp(nclass, "@") == 0)
                                 sprintf(tmpLine, "j=%d,d=\"@:p=%g\"", jointno, C->P.muscle_power);
                         else if (strcmp(nclass, "|") == 0)
-                                sprintf(tmpLine, "j=%d,d=\"|:p=%g,r=%g\"", jointno, C->P.muscle_power, C->mz);
+                        {
+                                sprintf(tmpLine, "j=%d,d=\"|:p=%g,r=%g\"", jointno, C->P.muscle_power, C->dadlink->P.muscle_bend_range); //Macko 2023-05 change: we take muscle_bend_range from dadlink, not from C, because we also assign this neuron to C->dadlink->joint_refno. Without this, for example in /*4*/<<X><<<<X>N:|>X>X>X>X the muscle is attached to the junction with 3 sticks, but gets range=33% as in a four-stick junction. f1 correctly sets range=0.5 for the analogous phenotype: X(X[|],X(X,X,X))
+                        }
                         else
                                 sprintf(tmpLine, "j=%d,d=\"%s\"", jointno, nclass);
 
-                        partidx = addFromString(NeuronType, tmpLine, &range);
-                        if (partidx < 0) return -32;
+                        C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
+                        if (C->neuro_refno < 0) return -32;
                         this->checkpoint();
                 }
-                C->neuro_refno = partidx;
-                int n_refno = C->neuro_refno;
-
-                for (j = 0; j < C->conns_count; j++)
+                for (int j = 0; j < C->conns_count; j++)
                 {
                         if (C->conns[j]->from != NULL)
-                                buildModelRec(C->conns[j]->from);
+                                buildModelRecur(C->conns[j]->from);
 
                         tmpLine[0] = 0;
@@ -320 +301 @@
                         if (from >= 0)
                         {
-                                sprintf(tmpLine, "%d,%d,%g", n_refno, from, C->conns[j]->weight);
+                                sprintf(tmpLine, "%d,%d,%g", C->neuro_refno, from, C->conns[j]->weight);
                                 if (addFromString(NeuronConnectionType, tmpLine, &range) < 0) return -35;
                                 this->checkpoint();