Changeset 896 for cpp/frams/genetics/fH

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/fH/fH_oper.cpp (modified) (11 diffs)

cpp/frams/genetics/fH/fH_oper.cpp

@@ -107 +107 @@
         for (unsigned int i = 0; i < parent1->sticks.size(); i++)
         {
-                if (randomN(2) == 0)
+                if (rndUint(2) == 0)
                 {
                         child1->sticks.push_back(parent1->sticks[i]);
@@ -120 +120 @@
         for (unsigned int i = 0; i < parent2->sticks.size(); i++)
         {
-                if (randomN(2) == 0)
+                if (rndUint(2) == 0)
                 {
                         child1->sticks.push_back(parent2->sticks[i]);
@@ -140 +140 @@
         for (unsigned int i = 0; i < parent1->neurons.size(); i++)
         {
-                if ((randomN(2) == 0 || skip2) && !skip1)
+                if ((rndUint(2) == 0 || skip2) && !skip1)
                 {
                         child1->neurons.push_back(parent1->neurons[i]);
@@ -153 +153 @@
         for (unsigned int i = 0; i < parent2->neurons.size(); i++)
         {
-                if ((randomN(2) == 0 || skip2) && !skip1)
+                if ((rndUint(2) == 0 || skip2) && !skip1)
                 {
                         child1->neurons.push_back(parent2->neurons[i]);
@@ -166 +166 @@
         for (unsigned int i = 0; i < parent1->connections.size(); i++)
         {
-                if ((randomN(2) == 0 || skip2) && !skip1)
+                if ((rndUint(2) == 0 || skip2) && !skip1)
                 {
                         child1->connections.push_back(parent1->connections[i]);
@@ -179 +179 @@
         for (unsigned int i = 0; i < parent2->connections.size(); i++)
         {
-                if ((randomN(2) == 0 || skip2) && !skip1)
+                if ((rndUint(2) == 0 || skip2) && !skip1)
                 {
                         child1->connections.push_back(parent2->connections[i]);
@@ -338 +338 @@
         if (changedimensions)
         {
-                int i = randomN(2 * dimensions);
+                int i = rndUint(2 * dimensions);
                 changeDoubleProperty(i, par, handle->type);
         }
@@ -344 +344 @@
         if (changeproperties)
         {
-                int i = 2 * dimensions + randomN(par.getPropCount() - 2 * dimensions);
+                int i = 2 * dimensions + rndUint(par.getPropCount() - 2 * dimensions);
                 changeDoubleProperty(i, par, handle->type);
         }
@@ -360 +360 @@
         for (int i = 0; i < dimensions; i++)
         {
-                par.setDouble(i, min + rnd0N(max - min));
-                par.setDouble(i + dimensions, min + rnd0N(max - min));
+                par.setDouble(i, min + rndDouble(max - min));
+                par.setDouble(i + dimensions, min + rndDouble(max - min));
         }
         handle->loadProperties(par);
         if (handle->type != fHBodyType::NEURON)
         {
-                int i = 2 * dimensions + randomN(par.getPropCount() - 2 * dimensions);
+                int i = 2 * dimensions + rndUint(par.getPropCount() - 2 * dimensions);
                 changeDoubleProperty(i, par, handle->type);
         }
@@ -406 +406 @@
                 allhandlescount += creature->sticks.size();
         }
-        unsigned int toselect = randomN(allhandlescount);
+        unsigned int toselect = rndUint(allhandlescount);
         if (toselect < creature->connections.size())
         {
@@ -436 +436 @@
         if (par.getPropCount() > 0)
         {
-                int i = randomN(par.getPropCount());
+                int i = rndUint(par.getPropCount());
                 if (*par.type(i) == 'f')
                 {