Changeset 10538 for branches/DataPreprocessing/HeuristicLab.Problems.LawnMower/3.3

Timestamp:

03/05/14 14:48:13 (11 years ago)

Author:

pfleck

Message:

• merged trunk

Location:

branches/DataPreprocessing

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.LawnMower/3.3/Evaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.LawnMower/3.3/Interpreter.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.Problems.LawnMower/3.3/Evaluator.cs

@@ -32 +32 @@
   [StorableClass]
   [Item("Lawn Mower Evaluator", "Evaluator for the lawn mower demo GP problem.")]
-  public class Evaluator : SingleSuccessorOperator, ISingleObjectiveEvaluator {
+  public class Evaluator : InstrumentedOperator, ISingleObjectiveEvaluator {
 
     private const string QualityParameterName = "Quality";
@@ -72 +72 @@
       return new Evaluator(this, cloner);
     }
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       int length = LawnLengthParameter.ActualValue.Value;
       int width = LawnWidthParameter.ActualValue.Value;
@@ -88 +88 @@
 
       QualityParameter.ActualValue = new DoubleValue(numberOfMowedCells);
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }

branches/DataPreprocessing/HeuristicLab.Problems.LawnMower/3.3/Interpreter.cs

@@ -54 +54 @@
       lawn[mowerState.Position.Item1, mowerState.Position.Item2] = true;
       EvaluateLawnMowerProgram(tree.Root, mowerState, lawn, tree.Root.Subtrees.Skip(1).ToArray());
-
       return lawn;
     }
@@ -115 +114 @@
       } else if (node.Symbol is Frog) {
         var p = EvaluateLawnMowerProgram(node.GetSubtree(0), mowerState, lawn, adfs);
-
-        uint newRow = (uint)((mowerState.Position.Item1 + lawn.GetLength(0) + p.Item1 % lawn.GetLength(0)) % lawn.GetLength(0));
-        uint newCol = (uint)((mowerState.Position.Item2 + lawn.GetLength(1) + p.Item2 % lawn.GetLength(1)) % lawn.GetLength(1));
+        int x = p.Item1;
+        int y = p.Item2;
+        while (x < 0) x += lawn.GetLength(0);
+        while (y < 0) y += lawn.GetLength(1);
+        var newRow = (uint)((mowerState.Position.Item1 + x) % lawn.GetLength(0));
+        var newCol = (uint)((mowerState.Position.Item2 + y) % lawn.GetLength(1));
         mowerState.Position = new Tuple<uint, uint>(newRow, newCol);
         mowerState.Energy = mowerState.Energy - 1;
@@ -130 +132 @@
                                   select adf).Single();
         // clone the function definition because we are replacing the argument nodes
-        functionDefinition = (DefunTreeNode) functionDefinition.Clone();
+        functionDefinition = (DefunTreeNode)functionDefinition.Clone();
         // find the argument tree nodes and their parents in the original function definition
         // toList is necessary to prevent that newly inserted branches are iterated