Changeset 896 for cpp/frams/genetics/fL/fL_matheval.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/genetics/fL/fL_matheval.cpp (modified) (11 diffs)

cpp/frams/genetics/fL/fL_matheval.cpp

@@ -613 +613 @@
 void MathEvaluation::mutateValueOrVariable(MathEvaluation::Number *&currval, bool usetime)
 {
-        if (randomN(2) == 0 && varcount > 0) // use variable
+        if (rndUint(2) == 0 && varcount > 0) // use variable
         {
                 if (currval && currval->type == TokenType::NUMBER)
@@ -619 +619 @@
                         delete currval;
                 }
-                int var = randomN(varcount + (usetime ? 1 : 0));
+                int var = rndUint(varcount + (usetime ? 1 : 0));
                 if (varcount == var) // time is used
                 {
@@ -633 +633 @@
                 if (!currval || currval->type == TokenType::VARIABLE)
                 {
-                        currval = new Number(rnd01);
+                        currval = new Number(rndDouble(1));
                 }
                 else
                 {
-                        currval->value = rnd01;
+                        currval->value = rndDouble(1);
                 }
         }
@@ -654 +654 @@
                 count = operatorstrings.size() - arithmeticoperatorscount;
         }
-        randop += randomN(count);
+        randop += rndUint(count);
         return operators[operatorstrings[randop]];
 }
@@ -663 +663 @@
         {
                 int currsize = postfixlist.size();
-                int varid = randomN(varcount);
+                int varid = rndUint(varcount);
                 postfixlist.push_back(vars[varid]);
-                if (randomN(2) == 0 && varcount > 1)
-                {
-                        int varid2 = randomN(varcount - 1);
+                if (rndUint(2) == 0 && varcount > 1)
+                {
+                        int varid2 = rndUint(varcount - 1);
                         if (varid2 >= varid) varid2++;
                         postfixlist.push_back(vars[varid2]);
@@ -673 +673 @@
                 else
                 {
-                        Number *num = new Number(rnd01);
+                        Number *num = new Number(rndDouble(1));
                         postfixlist.push_back(num);
                 }
-                int opid = arithmeticoperatorscount + randomN(comparisonoperatorscount);
+                int opid = arithmeticoperatorscount + rndUint(comparisonoperatorscount);
                 postfixlist.push_back(operators[operatorstrings[opid]]);
                 if (currsize > 0)
@@ -689 +689 @@
         if (postfixlist.size() == 0)
         {
-                Number *val = new Number(rnd01);
+                Number *val = new Number(rndDouble(1));
                 postfixlist.push_back(val);
                 return -1;
         }
-        int method = randomN(postfixlist.size() < MAX_MUT_FORMULA_SIZE ? MATH_MUT_COUNT : MATH_MUT_COUNT - 1);
+        int method = rndUint(postfixlist.size() < MAX_MUT_FORMULA_SIZE ? MATH_MUT_COUNT : MATH_MUT_COUNT - 1);
         switch (method)
         {
@@ -704 +704 @@
                 std::list<Token *>::iterator it = postfixlist.begin();
                 // insertion can be applied from 1st occurrence
-                int insertlocation = 1 + randomN(postfixlist.size() - 1);
+                int insertlocation = 1 + rndUint(postfixlist.size() - 1);
                 std::advance(it, insertlocation);
                 Operator *rndop;
@@ -732 +732 @@
                         id++;
                 }
-                int randid = randomN(numbersineval.size());
+                int randid = rndUint(numbersineval.size());
                 Number *numptr = (Number *)(*numbersineval[randid]);
                 mutateValueOrVariable(numptr, usetime);
@@ -750 +750 @@
                 if (ops.size() > 0)
                 {
-                        int randid = randomN(ops.size());
+                        int randid = rndUint(ops.size());
                         Operator *rndop;
                         if (randid == (int)ops.size() - 1)
@@ -783 +783 @@
                 if (firstofpairs.size() > 0)
                 {
-                        int rndid = randomN(firstofpairs.size());
+                        int rndid = rndUint(firstofpairs.size());
                         if ((*firstofpairs[rndid])->type == TokenType::NUMBER)
                         {