Changeset 247 for cpp/frams/genetics/f4

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

Location:

cpp/frams/genetics/f4

Files:

• f4_general.cpp (modified) (3 diffs)
• f4_general.h (modified) (4 diffs)
• oper_f4.cpp (modified) (2 diffs)
• oper_f4.h (modified) (1 diff)

cpp/frams/genetics/f4/f4_general.cpp

@@ -593 +593 @@
 
 
-int f4_Cell::addlink(f4_Cell * nfrom, double nw, long nt)
+int f4_Cell::addlink(f4_Cell * nfrom, double nw, int nt)
 {
         if (nolink >= MAXINPUTS - 1) return -1; // full!
@@ -675 +675 @@
 
 
-f4_CellLink::f4_CellLink(f4_Cell * nfrom, double nw, long nt)
+f4_CellLink::f4_CellLink(f4_Cell * nfrom, double nw, int nt)
 {
         from = nfrom;
@@ -1234 +1234 @@
         int i, j, t, res;
         char tc1, tc2;
-        long relfrom;
+        int relfrom;
         double w;
         unsigned gpos, oldpos;

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
 

cpp/frams/genetics/f4/oper_f4.cpp

@@ -606 +606 @@
 
 
-unsigned long Geno_f4::style(const char *g, int pos)
+uint32_t Geno_f4::style(const char *g, int pos)
 {
         char ch = g[pos];
@@ -616 +616 @@
         if (!strchr(STYL4CAT_MODIFIC STYL4CAT_NEUMOD STYL4CAT_DIGIT STYL4CAT_REST, ch))
                 return GENSTYLE_CS(0, GENSTYLE_INVALID);
-        unsigned long style = GENSTYLE_CS(0, GENSTYLE_STRIKEOUT); //default, should be changed below
+        uint32_t style = GENSTYLE_CS(0, GENSTYLE_STRIKEOUT); //default, should be changed below
         if (strchr("X ", ch))              style = GENSTYLE_CS(0, GENSTYLE_NONE);
         if (strchr("N", ch))               style = GENSTYLE_RGBS(0, 200, 0, GENSTYLE_NONE);

cpp/frams/genetics/f4/oper_f4.h

@@ -38 +38 @@
         int crossOver(char *&g1, char *&g2, float& chg1, float& chg2);
         const char* getSimplest() { return "X"; }
-        unsigned long style(const char *g, int pos);
+        uint32_t style(const char *g, int pos);
 
         // mutation probabilities