Changeset 9996 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

09/20/13 10:10:41 (11 years ago)

Author:

bburlacu

Message:

#1772: Removed unnecessary subproject (not included in solution). Merged changes from tree layout branch.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Fragment.cs (modified) (1 diff)
• GeneticExchange.cs (modified) (1 diff)
• LayoutEngines/ReingoldTilfordLayoutEngine.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Fragment.cs

@@ -56 +56 @@
       Length = original.Length;
       Index = original.Index;
+      OldIndex = original.OldIndex;
     }
 

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/GeneticExchange.cs

@@ -28 +28 @@
   [StorableClass]
   public class GeneticExchange : Item {
-    public IFragment FragmentIn { get; set; }
-    public IFragment FragmentOut { get; set; }
+    [Storable]
+    private IFragment inFragment;
+    public IFragment FragmentIn {
+      get { return inFragment; }
+      set { inFragment = value; }
+    }
+    [Storable]
+    private IFragment outFragment;
+    public IFragment FragmentOut {
+      get { return outFragment; }
+      set { outFragment = value; }
+    }
 
     [StorableConstructor]
     private GeneticExchange(bool serializing) : base(serializing) { }
-    private GeneticExchange(GeneticExchange original, Cloner cloner) : base(original, cloner) { }
+
+    private GeneticExchange(GeneticExchange original, Cloner cloner)
+      : base(original, cloner) {
+      inFragment = (IFragment)original.inFragment.Clone();
+      outFragment = (IFragment)original.outFragment.Clone();
+    }
     public GeneticExchange() { }
 

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/LayoutEngines/ReingoldTilfordLayoutEngine.cs

@@ -46 +46 @@
         root = value;
       }
-    }
-
-    /// <summary>
-    /// Returns a string containing all the coordinates (useful for debugging).
-    /// </summary>
-    /// <returns></returns>
-    public string DumpCoordinates() {
-      if (nodes == null || nodes.Count == 0) return string.Empty;
-      return nodes.Values.Aggregate("", (current, node) => current + (node.X + " " + node.Y + Environment.NewLine));
     }
 
@@ -161 +152 @@
 
     private void SecondWalk(ILayoutNode<T> v, float m) {
-      if (!nodes.Values.Contains(v)) throw new Exception("Layout node not present in dictionary!");
       v.X = v.Prelim + m;
       v.Y = v.Level * minVerticalSpacing;