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

Timestamp:

11/06/10 01:56:04 (13 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/SymbolicExpressionTreeGrammar.cs (modified) (1 diff)

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

@@ -30 +30 @@
     [StorableConstructor]
     private SymbolicExpressionTreeGrammar(bool deserializing) : base(deserializing) { }
-    //default ctor for cloning
-    private SymbolicExpressionTreeGrammar() : base(false) { }
+    // don't call storable ctor of base class to prevent full cloning
+    // instead use storable ctor to initialize an empty grammar and fill with InizializeShallowClone
+    private SymbolicExpressionTreeGrammar(SymbolicExpressionTreeGrammar original, Cloner cloner)
+      : base(false) {
+      cloner.RegisterClonedObject(original, this);
+      InitializeShallowClone(original);
+    }
+    private SymbolicExpressionTreeGrammar() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      SymbolicExpressionTreeGrammar clone = new SymbolicExpressionTreeGrammar();
-      cloner.RegisterClonedObject(this, clone);
-      InitializeShallowClone(clone);
-      return clone;
+      return new SymbolicExpressionTreeGrammar(this, cloner);
     }
   }