Changeset 247 for cpp/frams/genetics/oper_fx.cpp

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/oper_fx.cpp (modified) (8 diffs)

cpp/frams/genetics/oper_fx.cpp

@@ -58 +58 @@
         if (p->type(i)[0] == 'd')
         {
-                long _mn = 0, _mx = 1, _def = 0;
+                paInt _mn = 0, _mx = 1, _def = 0;
                 defined = p->getMinMax(i, _mn, _mx, _def);
                 if (defined == 1) _mx = _mn + 1;
@@ -150 +150 @@
 void GenoOperators::setIntFromDoubleWithProbabilisticDithering(ParamInterface &p, int index, double value) //TODO
 {
-        p.setInt(index, value); //TODO value=2.5 will result in 2 but we want it to be 2 or 3 with equal probability. value=2.1 would be mostly 2, rarely 3. Careful with negative values (test it!)
+        p.setInt(index, (paInt)value); //TODO value=2.5 will result in 2 but we want it to be 2 or 3 with equal probability. value=2.1 would be mostly 2, rarely 3. Careful with negative values (test it!)
 }
 
@@ -187 +187 @@
 NeuroClass* GenoOperators::parseNeuroClass(char*& s)
 {
-        int len = strlen(s);
+        int len = (int)strlen(s);
         int Len = 0;
         NeuroClass *I = NULL;
@@ -193 +193 @@
         {
                 const char *n = Neuro::getClass(i)->name;
-                int l = strlen(n);
+                int l = (int)strlen(n);
                 if (len >= l && l>Len && (strncmp(s, n, l) == 0)) { I = Neuro::getClass(i); Len = l; }
         }
@@ -210 +210 @@
 int GenoOperators::neuroClassProp(char*& s, NeuroClass *nc, bool also_v1_N_props)
 {
-        int len = strlen(s);
+        int len = (int)strlen(s);
         int Len = 0, I = -1;
         if (nc)
@@ -218 +218 @@
                 {
                         const char *n = p.id(i);
-                        int l = strlen(n);
+                        int l = (int)strlen(n);
                         if (len >= l && l>Len && (strncmp(s, n, l) == 0)) { I = 100 + i; Len = l; }
                         if (also_v1_N_props) //recognize old properties symbols /=!
@@ -225 +225 @@
                                         if (strcmp(n, "in") == 0) n = "="; else
                                                 if (strcmp(n, "fo") == 0) n = "!";
-                                l = strlen(n);
+                                l = (int)strlen(n);
                                 if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = 100 + i; Len = l; }
                         }
@@ -235 +235 @@
         {
                 const char *n = p.id(i);
-                int l = strlen(n);
+                int l = (int)strlen(n);
                 if (len >= l && l>Len && (strncmp(s, n, l) == 0)) { I = i; Len = l; }
         }