Changeset 4722 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -63 +63 @@
     }
 
-    public SymbolicExpressionTree()
-      : base() {
+    [StorableConstructor]
+    protected SymbolicExpressionTree(bool deserializing) : base(deserializing) { }
+    protected SymbolicExpressionTree(SymbolicExpressionTree original, Cloner cloner)
+      : base(original, cloner) {
+      root = cloner.Clone(original.Root);
     }
-
+    public SymbolicExpressionTree() : base() { }
     public SymbolicExpressionTree(SymbolicExpressionTreeNode root)
       : base() {
@@ -84 +87 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      SymbolicExpressionTree clone = new SymbolicExpressionTree();
-      cloner.RegisterClonedObject(this, clone);
-      if (root != null)
-        clone.root = (SymbolicExpressionTreeNode)this.root.Clone();
-      return clone;
+      return new SymbolicExpressionTree(this, cloner);
     }
   }