Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Manipulator/UniformMutation.cs

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Manipulator/UniformMutation.cs (modified) (7 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Manipulator/UniformMutation.cs

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Manipulator {
+
   using HeuristicLab.Common;
   using HeuristicLab.Core;
@@ -11 +12 @@
   using HeuristicLab.Problems.ProgramSynthesis.Push.Encoding;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Generators.CodeGenerator;
-  using HeuristicLab.Random;
 
   /// <summary>
@@ -23 +23 @@
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
       Parameters.Add(new LookupParameter<PlushVector>("PlushVector", "The vector which should be manipulated."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("MinLength", "The min length of the vector."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("MaxLength", "The max length of the vector."));
       Parameters.Add(new ValueLookupParameter<IReadOnlyExpressionsConfiguration>("Instructions", "The enabled instructions"));
       Parameters.Add(new ValueLookupParameter<IReadOnlyErcOptions>("ErcOptions", "ERC options"));
       Parameters.Add(new ValueLookupParameter<PercentValue>("InInstructionProbability", "The probability of IN Instructions"));
 
-      Parameters.Add(new FixedValueParameter<PercentValue>("InstructionMutationProbability", "The probability a value gets mutated", new PercentValue(0.02)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>("CloseMutationDeviation", "When mutating individual, the amount of which the close marker is incremented or decrement is based on a random sample from a normal distribution with mean 0 and standard deviation set by the close mutation deviation parameter", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<PercentValue>("InstructionMutationProbability", "The probability an instruction gets mutated", new PercentValue(0.02)));
+      Parameters.Add(new FixedValueParameter<PercentValue>("CloseMutationProbability", "The probability close gets mutated", new PercentValue(0.02)));
+      Parameters.Add(new FixedValueParameter<PercentValue>("CloseIncrementRate", "When mutating individual, the increment rate specifies if close should be increased or decreased by 1.", new PercentValue(0.5)));
     }
 
@@ -50 +49 @@
     }
 
-    public IValueParameter<PercentValue> CloseMutationDeviationParameter
+    public IValueParameter<PercentValue> CloseMutationProbabilityParameter
     {
-      get { return (IValueParameter<PercentValue>)Parameters["CloseMutationDeviation"]; }
+      get { return (IValueParameter<PercentValue>)Parameters["CloseMutationProbability"]; }
     }
 
-    public double CloseMutationDeviation
+    public double CloseMutationProbability
     {
-      get { return CloseMutationDeviationParameter.Value.Value; }
-      set { CloseMutationDeviationParameter.Value.Value = value; }
+      get { return CloseMutationProbabilityParameter.Value.Value; }
+      set { CloseMutationProbabilityParameter.Value.Value = value; }
+    }
+
+    public IValueParameter<PercentValue> CloseIncrementRateParameter
+    {
+      get { return (IValueParameter<PercentValue>)Parameters["CloseIncrementRate"]; }
+    }
+
+    public double CloseIncrementRate
+    {
+      get { return CloseIncrementRateParameter.Value.Value; }
+      set { CloseIncrementRateParameter.Value.Value = value; }
     }
 
@@ -72 +82 @@
     {
       get { return (ILookupParameter<PlushVector>)Parameters["PlushVector"]; }
-    }
-    public IValueLookupParameter<IntValue> MinLengthParameter
-    {
-      get { return (IValueLookupParameter<IntValue>)Parameters["MinLength"]; }
-    }
-    public IValueLookupParameter<IntValue> MaxLengthParameter
-    {
-      get { return (IValueLookupParameter<IntValue>)Parameters["MaxLength"]; }
     }
     public IValueLookupParameter<IReadOnlyExpressionsConfiguration> InstructionsParameter
@@ -99 +101 @@
 
     public sealed override IOperation InstrumentedApply() {
-      Manipulate(RandomParameter.ActualValue, PlushVectorParameter.ActualValue);
+      Manipulate(
+        RandomParameter.ActualValue,
+        PlushVectorParameter.ActualValue,
+        CloseIncrementRate,
+        ErcOptionsParameter.ActualValue,
+        InstructionsParameter.ActualValue,
+        InInstructionProbabilityParameter.ActualValue.Value,
+        CloseMutationProbability,
+        InstructionMutationProbability);
       return base.InstrumentedApply();
     }
 
-    private void Manipulate(IRandom random, PlushVector plushVector) {
-      var normalDistributedRandom = new NormalDistributedRandom(random, 0, CloseMutationDeviation);
-      var ercOptions = ErcOptionsParameter.ActualValue;
-      var instructions = InstructionsParameter.ActualValue;
-      var inInstructionProbability = InInstructionProbabilityParameter.ActualValue.Value;
-      var instructionMutationProbability = InstructionMutationProbability;
+    private static void Manipulate(
+      IRandom random,
+      PlushVector plushVector,
+      double closeIncrementRate,
+      IReadOnlyErcOptions ercOptions,
+      IReadOnlyExpressionsConfiguration instructions,
+      double inInstructionProbability,
+      double closeMutationProbability,
+      double instructionMutationProbability
+      ) {
 
       for (var i = 0; i < plushVector.Entries.Count; i++) {
@@ -123 +137 @@
         }
 
-        entry.Close += normalDistributedRandom.Next();
+        x = random.NextDouble();
+
+        if (x < closeMutationProbability) {
+          x = random.NextDouble();
+          entry.Close += x < closeIncrementRate ? 1 : -1;
+
+          if (entry.Close < 0)
+            entry.Close = 0;
+        }
       }