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

Timestamp:

11/07/14 17:51:01 (9 years ago)

Author:

Maciej Komosinski

Message:

Sources support both 32-bit and 64-bit, and more compilers

File:

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

cpp/frams/genetics/f4/f4_general.h

@@ -101 +101 @@
         int onestep();  // execute one simulation step (till a division)
 
-        int   addlink(f4_Cell * nfrom, double nw, long nt);
+        int   addlink(f4_Cell * nfrom, double nw, int nt);
         void  adjustRec();
 
@@ -129 +129 @@
         //f4_OrientMat OM;
         double       mz;            // freedom in z
-        long         p2_refno;   // number of last end part object, used in f0
-        long         joint_refno;   // number of the joint object, used in f0
-        long         neuro_refno;   // number of the neuro object, used in f0
-
-        long         ctrl;  // neuron type
+        int          p2_refno;   // number of last end part object, used in f0
+        int          joint_refno;   // number of the joint object, used in f0
+        int          neuro_refno;   // number of the neuro object, used in f0
+
+        int          ctrl;  // neuron type
         double       state;
         double       inertia;
@@ -147 +147 @@
 {
 public:
-        f4_CellLink(f4_Cell * nfrom, double nw, long nt);
+        f4_CellLink(f4_Cell * nfrom, double nw, int nt);
         f4_Cell *    from;
         // type: 0: input, 1 '*', 2 'G', 3 'T', 4 'S'
-        long         t;
+        int          t;
         double       w;
 };
@@ -205 +205 @@
         int       pos;        // original position in string
         int       i1;           // internal int  parameter1
-        long      l1;           // internal long parameter1
+        int       l1;           // internal long parameter1
         double    f1;           // internal double parameter1