Changeset 896 for cpp/frams/genetics/genooperators.cpp

Timestamp:

11/30/19 01:30:22 (5 years ago)

Author:

Maciej Komosinski

Message:

Replaced #defined macros for popular random-related operations with functions

File:

• cpp/frams/genetics/genooperators.cpp (modified) (10 diffs)

cpp/frams/genetics/genooperators.cpp

@@ -38 +38 @@
         int i;
         for (i = 0; i < count; i++) sum += probtab[i];
-        double sel = rnd01*sum;
+        double sel = rndDouble(sum);
         for (sum = 0, i = 0; i < count; i++) { sum += probtab[i]; if (sel < sum) return i; }
         return -1;
@@ -81 +81 @@
                 neucls = n->getClass() == NULL ? 0 : n->getClass()->getProperties().getPropCount();
         if (neuext + neucls == 0) return -1; //no properties in this neuron
-        int index = randomN(neuext + neucls);
+        int index = rndUint(neuext + neucls);
         if (index >= neuext) index = index - neuext + 100;
         return index;
@@ -142 +142 @@
         {
                 result = int(result + 0.5);
-                if (result == current) result += randomN(2) * 2 - 1; //force some change
+                if (result == current) result += rndUint(2) * 2 - 1; //force some change
         }
         else
@@ -238 +238 @@
                 if (Neuro::getClass(i)->genactive)
                         active.push_back(Neuro::getClass(i));
-        if (active.size() == 0) return NULL; else return active[randomN(active.size())];
+        if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
@@ -247 +247 @@
                 if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredOutput() != 0)
                         active.push_back(Neuro::getClass(i));
-        if (active.size() == 0) return NULL; else return active[randomN(active.size())];
+        if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
@@ -256 +256 @@
                 if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredInputs() != 0)
                         active.push_back(Neuro::getClass(i));
-        if (active.size() == 0) return NULL; else return active[randomN(active.size())];
+        if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
@@ -265 +265 @@
                 if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredOutput() != 0 && Neuro::getClass(i)->getPreferredInputs() == 0)
                         active.push_back(Neuro::getClass(i));
-        if (active.size() == 0) return NULL; else return active[randomN(active.size())];
+        if (active.size() == 0) return NULL; else return active[rndUint(active.size())];
 }
 
@@ -274 +274 @@
                 if (NClist[i]->getPreferredOutput() != 0) //this NeuroClass provides output
                         allowed.push_back(i);
-        if (allowed.size() == 0) return -1; else return allowed[randomN(allowed.size())];
+        if (allowed.size() == 0) return -1; else return allowed[rndUint(allowed.size())];
 }
 
@@ -283 +283 @@
                 if (NClist[i]->getPreferredInputs() != 0) //this NeuroClass wants one input connection or more                  
                         allowed.push_back(i);
-        if (allowed.size() == 0) return -1; else return allowed[randomN(allowed.size())];
+        if (allowed.size() == 0) return -1; else return allowed[rndUint(allowed.size())];
 }
 
@@ -291 +291 @@
         for (size_t i = 0; i < strlen(choices); i++) if (!strchrn0(excluded, choices[i])) allowed_count++;
         if (allowed_count == 0) return -1; //no char is allowed
-        int rnd_index = randomN(allowed_count) + 1;
+        int rnd_index = rndUint(allowed_count) + 1;
         allowed_count = 0;
         for (size_t i = 0; i < strlen(choices); i++)