Changeset 1259 for cpp/frams/genetics/f4/f4_conv.cpp

Timestamp:

06/22/23 03:52:39 (15 months ago)

Author:

Maciej Komosinski

Message:

f4: three #define's -> enum, minor refactorizations, added comments

File:

• cpp/frams/genetics/f4/f4_conv.cpp (modified) (7 diffs)

cpp/frams/genetics/f4/f4_conv.cpp

@@ -153 +153 @@
 f4_Cell* f4_Model::getStick(f4_Cell *C)
 {
-        if (C->type == CELL_STICK) return C;
+        if (C->type == f4_Cell_type::CELL_STICK) return C;
         if (NULL != C->dadlink)
                 return getStick(C->dadlink);
         // we have no more dadlinks, find any stick
         for (int i = 0; i < cells->cell_count; i++)
-                if (cells->C[i]->type == CELL_STICK)
+                if (cells->C[i]->type == f4_Cell_type::CELL_STICK)
                         return cells->C[i];
         // none!
@@ -177 +177 @@
         // make sure parent is a stick
         if (C->dadlink != NULL)
-                if (C->dadlink->type != CELL_STICK)
+                if (C->dadlink->type != f4_Cell_type::CELL_STICK)
                 {
                         C->dadlink = getStick(C->dadlink);
@@ -192 +192 @@
         MultiRange range = C->genoRange;
 
-        if (C->type == CELL_STICK)
+        if (C->type == f4_Cell_type::CELL_STICK)
         {
                 int jj_p1_refno;  // save for later
@@ -244 +244 @@
         }
 
-        if (C->type == CELL_NEURON)
+        if (C->type == f4_Cell_type::CELL_NEURON)
         {
                 const char* nclass = C->neuclass->name.c_str();
@@ -253 +253 @@
                         else
                                 sprintf(tmpLine, "d=\"%s\"", nclass);
-
-                        C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
-                        if (C->neuro_refno < 0) return -22;
-                        this->checkpoint();
                 }
                 else if (C->neuclass->getPreferredLocation() == 1) // attached to Part or have no required attachment - also part
@@ -264 +260 @@
 
                         sprintf(tmpLine, "p=%d,d=\"%s\"", partno, nclass);
-
-                        C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
-                        if (C->neuro_refno < 0) return -22;
-                        this->checkpoint();
                 }
                 else // attached to Joint, assume there are only three possibilities of getPreferredLocation()
@@ -277 +269 @@
                         else if (strcmp(nclass, "|") == 0)
                         {
-                                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))
+                                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 (see also conv_f1_f0_branch_muscle_range) for the analogous phenotype: X(X[|],X(X,X,X))
                         }
                         else
                                 sprintf(tmpLine, "j=%d,d=\"%s\"", jointno, nclass);
-
-                        C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
-                        if (C->neuro_refno < 0) return -32;
-                        this->checkpoint();
-                }
+                }
+
+                C->neuro_refno = addFromString(NeuronType, tmpLine, &range);
+                if (C->neuro_refno < 0) return -22;
+                this->checkpoint();
+
                 for (int j = 0; j < C->conns_count; j++)
                 {