Changeset 808 for cpp

Timestamp:

06/21/18 02:30:37 (6 years ago)

Author:

Maciej Komosinski

Message:

New option for mutation in numerical encoding fn: mutate all variables instead of one, randomly selected variable
New option for crossover in numerical encoding fn: the amount of linear mix can be random, not only fixed by user

Location:

cpp/frams/genetics/fn

Files:

• fn_oper.cpp (modified) (4 diffs)
• fn_oper.h (modified) (1 diff)

cpp/frams/genetics/fn/fn_oper.cpp

@@ -24 +24 @@
 static ParamEntry GENOfnparam_tab[] =
 {
-        { "Genetics: fn", 1, 4, },
-        { "fn_xover", 0, 0, "Inherited in linear mix crossover", "f 0.5 1.0 0.9", FIELD(xover_proportion), "0.5 => children are averaged parents.\n0.8 => children are only 20% different from parents.\n1.0 => each child is identical to one parent (no crossover).", },
+        { "Genetics: fn", 1, 6, },
+        { "fn_xover", 0, 0, "Fraction inherited in linear mix crossover", "f 0.5 1.0 0.9", FIELD(xover_proportion), "0.5 => children are averaged parents.\n0.8 => children are only 20% different from parents.\n1.0 => each child is identical to one parent (no crossover).", },
+        { "fn_xover_random", 0, 0, "Random fraction inherited in crossover", "d 0 1 1", FIELD(xover_proportion_random), "If active, the amount of linear mix is random in each crossover operation, so the \"Fraction inherited in linear mix crossover\" parameter is ignored.", },
         { "fn_mut_bound_low", 1, 0, "Lower bounds for mutation", "s 0 0 [-10.0, -10.0]", FIELD(mut_bound_low), "A vector of lower bounds (one real value for each variable)", },
         { "fn_mut_bound_high", 1, 0, "Higher bounds for mutation", "s 0 0 [10.0, 10.0]", FIELD(mut_bound_high), "A vector of higher bounds (one real value for each variable)", },
         { "fn_mut_stddev", 1, 0, "Standard deviations for mutation", "s 0 0 [0.1, 0.1]", FIELD(mut_stddev), "A vector of standard deviations (one real value for each variable)", },
+        { "fn_mut_single_var", 0, 0, "Mutate only a single variable", "d 0 1 0", FIELD(mut_single_var), "If active, only a single randomly selected variable will be mutated in each mutation operation. Otherwise all variables will be mutated.", },
         { 0, },
 };
@@ -76 +78 @@
         }
 
-        int which = randomN(values.size());
-        values[which] = GenoOperators::mutateCreep('f', values[which], bound_low[which], bound_high[which], stddev[which], false);
+        if (mut_single_var) //mutate only one, randomly selected variable
+        {
+                int which = randomN(values.size());
+                values[which] = GenoOperators::mutateCreep('f', values[which], bound_low[which], bound_high[which], stddev[which], false);
+                chg = 1.0f / values.size();
+        }
+        else //mutate all variables
+        {
+                for (int which = 0; which < values.size(); which++)
+                        values[which] = GenoOperators::mutateCreep('f', values[which], bound_low[which], bound_high[which], stddev[which], false);
+                chg = 1.0f;
+        }
         string saved = GenoConv_fn0::vectorToString(values);
         free(gene);
         gene = strdup(saved.c_str()); //reallocate
-        chg = 1.0f / values.size();
         return GENOPER_OK;
 }
@@ -92 +103 @@
         //xover_proportion = 0.1; //testing...
 
-        chg1 = xover_proportion;
-        chg2 = 1 - xover_proportion;
+        double proportion = xover_proportion_random ? 0.5 + rnd0N(0.5) : xover_proportion;
+
+        chg1 = proportion;
+        chg2 = 1 - proportion;
 
         vector<double> v1 = GenoConv_fn0::stringToVector(g1);
@@ -104 +117 @@
         }
 
-        GenoOperators::linearMix(v1, v2, xover_proportion);
+        GenoOperators::linearMix(v1, v2, proportion);
 
         string saved = GenoConv_fn0::vectorToString(v1);

cpp/frams/genetics/fn/fn_oper.h

@@ -21 +21 @@
 
         double xover_proportion;
+        int xover_proportion_random, mut_single_var;
         SString mut_bound_low, mut_bound_high, mut_stddev;
 };