Changeset 6684

Timestamp:

08/30/11 17:48:18 (13 years ago)

Author:

mkommend

Message:

#1579: Changed cloning of SymbolicExpressionTreeNodes.

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• SymbolicExpressionTreeNode.cs (modified) (1 diff)
• SymbolicExpressionTreeTerminalNode.cs (modified) (1 diff)

trunk/sources/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;
+        }
       }
     }

trunk/sources/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() { }