Changeset 896 for cpp/frams/genetics/fn/fn_oper.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/fn/fn_oper.cpp (modified) (3 diffs)

cpp/frams/genetics/fn/fn_oper.cpp

@@ -5 +5 @@
 #include "fn_oper.h"
 #include "fn_conv.h"
-#include <common/nonstd.h> //randomN, rnd01
+#include <common/nonstd.h> //rndUint, rnd01
 
 
@@ -80 +80 @@
         if (mut_single_var) //mutate only one, randomly selected variable
         {
-                int which = randomN(values.size());
+                int which = rndUint(values.size());
                 values[which] = GenoOperators::mutateCreep('f', values[which], bound_low[which], bound_high[which], stddev[which], false);
                 chg = 1.0f / values.size();
@@ -103 +103 @@
         //xover_proportion = 0.1; //testing...
 
-        double proportion = xover_proportion_random ? 0.5 + rnd0N(0.5) : xover_proportion;
+        double proportion = xover_proportion_random ? 0.5 + rndDouble(0.5) : xover_proportion;
 
         chg1 = proportion;