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

Timestamp:

05/21/23 23:16:51 (11 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.h (modified) (3 diffs)

cpp/frams/genetics/f4/f4_general.h

@@ -181 +181 @@
          * Adjusts properties of stick objects.
          */
-        void  adjustRec();
-
-        int        nr;                 ///<number of cell (seems to be used only in old f1 converter for neuron connections)
+        void  adjustRecur();
+
+        int        nr;                 ///<number of cell (seems to be used only in the approximate f1 converter for neuron connections)
         int        type;               ///<type
         f4_Cell *dadlink;              ///<pointer to cell parent
@@ -192 +192 @@
         f4_Node *old_gcur;             ///<used externally by f4_Cells::oneStep() to track changes of gcur, i.e., to detect progress in cell development
         repeat_stack repeat;           ///<stack holding repetition nodes and counters
-        int recProcessedFlag;          ///<used during recursive traverse
+        bool recurProcessedFlag;       ///<used during recursive traverse
         MultiRange genoRange;          ///<remember the genotype codes affecting this cell so far
 
         GeneProps    P;                ///<properties
         int          anglepos;         ///<number of position within dad's children (,)
-        int          childcount;       ///<number of children
+        int          stickchildcount;  ///<number of children (sticks only)
         int          commacount;       ///<number of postitions at lastend (>=childcount)
         double       rolling;          ///<rolling angle ('R') (around x)
@@ -203 +203 @@
         double       zrot;             ///<horizontal rotation angle due to branching (around z)
 
-        double       mz;               ///<freedom in z
         int          p2_refno;         ///<the number of the last end part object, used in f0
         int          joint_refno;      ///<the number of the joint object, used in f0
         int          neuro_refno;      ///<the number of the neuro object, used in f0
 
-        double       inertia;          ///<inertia of neuron
-        double       force;            ///<force of neuron
-        double       sigmo;            ///<sigmoid of neuron
+        double       inertia;          ///<inertia of neuron N
+        double       force;            ///<force of neuron N
+        double       sigmo;            ///<sigmoid of neuron N
         f4_CellConn *conns[F4_MAX_CELL_INPUTS]; ///<array of neuron connections
         int          conns_count;      ///<number of connections