Changeset 4722 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Symbols/Argument.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/Symbols/Argument.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Symbols/Argument.cs

@@ -43 +43 @@
 
     [StorableConstructor]
-    private Argument() : base() { }
-
+    private Argument(bool deserializing) : base(deserializing) { }
+    private Argument(Argument original, Cloner cloner)
+      : base(original, cloner) {
+      argumentIndex = original.argumentIndex;
+      name = "ARG" + original.argumentIndex;
+    }
     public Argument(int argumentIndex)
       : base("ARG" + argumentIndex, Argument.ArgumentDescription) {
@@ -56 +60 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Argument clone = (Argument)base.Clone(cloner);
-      clone.argumentIndex = argumentIndex;
-      clone.name = "ARG" + argumentIndex;
-      return clone;
+      return new Argument(this, cloner);
     }
   }