Changeset 896 for cpp/frams/genetics/f9

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/f9/f9_oper.cpp (modified) (4 diffs)

cpp/frams/genetics/f9/f9_oper.cpp

@@ -5 +5 @@
 #include "f9_oper.h"
 #include "f9_conv.h"
-#include <common/nonstd.h> //randomN, rnd01
+#include <common/nonstd.h> //rndUint, rnd01
 
 
@@ -55 +55 @@
         for (int i = 0; i < len; i++)
         {
-                if (rnd01 < mut_prob) //normalize prob with the length of the genotype
+                if (rndDouble(1) < mut_prob) //normalize prob with the length of the genotype
                 {
                         char oldgene = gene[i];
-                        gene[i] = turtle_commands_f9[randomN(symbols)];
+                        gene[i] = turtle_commands_f9[rndUint(symbols)];
                         if (gene[i] != oldgene) changes++;
                 }
         }
 
-        if (rnd01 < mut_prob) //add or delete a random char
+        if (rndDouble(1) < mut_prob) //add or delete a random char
         {
                 SString newgeno(gene);
-                if (randomN(2) == 0) //add
+                if (rndUint(2) == 0) //add
                 {
                         int symbols = strlen(turtle_commands_f9);
-                        int p = randomN(len + 1);  //random location
+                        int p = rndUint(len + 1);  //random location
                         //printf("before add: %s\n",(const char*)newgeno);
-                        newgeno = newgeno.substr(0, p) + SString(turtle_commands_f9 + randomN(symbols), 1) + newgeno.substr(p);
+                        newgeno = newgeno.substr(0, p) + SString(turtle_commands_f9 + rndUint(symbols), 1) + newgeno.substr(p);
                         //printf("after add: %s\n",(const char*)newgeno);
                         changes++;
@@ -77 +77 @@
                 else if (len > 1) //delete
                 {
-                        int p = randomN(len);  //random location
+                        int p = rndUint(len);  //random location
                         //printf("before delete: %s\n",(const char*)newgeno);
                         newgeno = newgeno.substr(0, p) + newgeno.substr(p + 1);
@@ -95 +95 @@
 {
         int len1 = strlen(g1), len2 = strlen(g2);
-        int p1 = randomN(len1);  //random cut point for first genotype
-        int p2 = randomN(len2);  //random cut point for second genotype
+        int p1 = rndUint(len1);  //random cut point for first genotype
+        int p2 = rndUint(len2);  //random cut point for second genotype
         char *child1 = (char*)malloc(p1 + len2 - p2 + 1);
         char *child2 = (char*)malloc(p2 + len1 - p1 + 1);