Changeset 6685 for branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

08/31/11 11:52:11 (13 years ago)

Author:

abeham

Message:

#1628

• Updated branch from trunk
• Changed ReferenceEqualityComparer<T> to become a non-generic class (generic implementation probably was only made because of lacking support for co- and contravariance in C# 3.5)
• Added finished experiment from sample algorithms to the tests
• Wrote a unit test to instantiate every IDeepCloneable type, clone it and compare the objects in the object graph for equal references
• Wrote a unit test to load the experiment, clone it and compare again the objects in the object graph
• Preliminary fix for a potential bug in ThreadSafeLog
• Preliminary fix for a potential bug in OperatorGraphVisualizationInfo
• Preliminary fix for a potential bug in Calculator (and added license headers)
• Preliminary fix for a potential bug in ScrambleMove

Location:

branches/GeneralizedQAP

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTerminalNode.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -55 +55 @@
       : base() {
       symbol = original.symbol; // symbols are reused
-      subtrees = new List<ISymbolicExpressionTreeNode>(original.subtrees.Count);
-      foreach (var subtree in original.subtrees) {
-        var clonedSubtree = cloner.Clone(subtree);
-        subtrees.Add(clonedSubtree);
-        clonedSubtree.Parent = this;
+      if (original.subtrees != null) {
+        subtrees = new List<ISymbolicExpressionTreeNode>(original.subtrees.Count);
+        foreach (var subtree in original.subtrees) {
+          var clonedSubtree = cloner.Clone(subtree);
+          subtrees.Add(clonedSubtree);
+          clonedSubtree.Parent = this;
+        }
       }
     }

branches/GeneralizedQAP/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeTerminalNode.cs

@@ -37 +37 @@
     [StorableConstructor]
     protected SymbolicExpressionTreeTerminalNode(bool deserializing) : base(deserializing) { }
-    // don't call cloning constructor of base to prevent allocation of sub-trees list in base!
-    protected SymbolicExpressionTreeTerminalNode(SymbolicExpressionTreeTerminalNode original, Cloner cloner)
-      : base() {
-      // symbols are reused
-      this.Symbol = original.Symbol;
-    }
+    protected SymbolicExpressionTreeTerminalNode(SymbolicExpressionTreeTerminalNode original, Cloner cloner) : base(original, cloner) { }
     protected SymbolicExpressionTreeTerminalNode() : base() { }