Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

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

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Interpreter.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Problems.GeneticProgramming.LawnMower {
-  public class Interpreter {
+  public static class Interpreter {
     private enum Heading {
       South,
@@ -45 +45 @@
     }
 
-
     public static bool[,] EvaluateLawnMowerProgram(int length, int width, ISymbolicExpressionTree tree) {
-
       bool[,] lawn = new bool[length, width];
       var mowerState = new MowerState();
@@ -56 +54 @@
       return lawn;
     }
-
 
     private static Tuple<int, int> EvaluateLawnMowerProgram(ISymbolicExpressionTreeNode node, MowerState mowerState, bool[,] lawn, IEnumerable<ISymbolicExpressionTreeNode> adfs) {

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Problem.cs

@@ -50 +50 @@
     }
 
+    #region item cloning and persistence
     [StorableConstructor]
-    protected Problem(bool deserializing)
-      : base(deserializing) {
+    protected Problem(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
+    protected Problem(Problem original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Problem(this, cloner);
     }
-    protected Problem(Problem original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    #endregion
+
     public Problem()
       : base() {
@@ -87 +92 @@
     }
 
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() { }
-
     public override double Evaluate(ISymbolicExpressionTree tree, IRandom random) {
       var length = LawnLengthParameter.Value.Value;
@@ -105 +106 @@
       return numberOfMowedCells;
     }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Problem(this, cloner);
-    }
   }
 }

branches/crossvalidation-2434/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Solution.cs

@@ -37 +37 @@
     public double Quality { get; private set; }
 
+    #region item cloning and persistence
     [StorableConstructor]
     private Solution(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
     private Solution(Solution original, Cloner cloner)
       : base(original, cloner) {
@@ -46 +50 @@
       this.Quality = original.Quality;
     }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Solution(this, cloner);
+    }
+    #endregion
 
     public Solution(ISymbolicExpressionTree tree, int length, int width, double quality)
@@ -54 +62 @@
       this.Quality = quality;
     }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Solution(this, cloner);
-    }
   }
 }