Changeset 13280 for stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt

Timestamp:

11/19/15 11:42:02 (9 years ago)

Author:

gkronber

Message:

#2472: merged r12921,r12936:12938,r12940,r12947,r13055:13058,r13163,r13267,r13269 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Interpreter.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs (modified) (5 diffs)
• HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Interpreter.cs

@@ -32 +32 @@
     public int FoodEaten { get; private set; }
     public BoolMatrix World { get; private set; }
-
     public ISymbolicExpressionTree Expression { get; private set; }
 
+    public int ElapsedTime { get; set; }
 
-    public int ElapsedTime { get; set; }
     private int currentDirection;
     private int currentAntLocationRow;

stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs

@@ -22 +22 @@
 using System;
 using System.Diagnostics.Contracts;
-using System.Drawing.Text;
 using System.Linq;
 using HeuristicLab.Common;
@@ -38 +37 @@
   [StorableClass]
   public sealed class Problem : SymbolicExpressionTreeProblem, IStorableContent {
-    public string Filename { get; set; }
 
     #region constant for default world (Santa Fe)
@@ -104 +102 @@
     }
 
+    #region item cloning and persistence
+    // persistence
+    [StorableConstructor]
+    private Problem(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() { }
+
+    // cloning 
+    private Problem(Problem original, Cloner cloner) : base(original, cloner) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new Problem(this, cloner);
+    }
+    #endregion
+
     public Problem()
       : base() {
@@ -114 +126 @@
       g.AddSymbols(new string[] { "IfFoodAhead", "Prog2" }, 2, 2);
       g.AddSymbols(new string[] { "Prog3" }, 3, 3);
-      g.AddTerminalSymbols(new string[] { "Left", "Right", "Move" });
+      g.AddTerminalSymbols(new string[] { "Move", "Left", "Right" });
       base.Encoding = new SymbolicExpressionTreeEncoding(g, 20, 10);
     }
@@ -137 +149 @@
     }
 
-    // persistence
-    [StorableConstructor]
-    private Problem(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-    }
-
-    // cloning 
-    private Problem(Problem original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Problem(this, cloner);
-    }
-
     #region helpers
     private bool[,] ToBoolMatrix(char[][] ch) {

stable/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Drawing;
 using HeuristicLab.Common;
@@ -54 +53 @@
     }
 
+    #region item cloning and persistence
     [StorableConstructor]
     private Solution(bool deserializing) : base(deserializing) { }
@@ -70 +70 @@
       return new Solution(this, cloner);
     }
+    #endregion
   }
 }