Changeset 887 for branches/CloningRefactorBranch/HeuristicLab.Operators.Programmable/ProgrammableOperator.cs

Timestamp:

12/02/08 21:10:17 (16 years ago)

Author:

gkronber

Message:

Refactored cloning in all plugins except: HL.Communication, HL.Hive, HL.GP, HL.Routing, HL.Scheduling, HL.SimOpt, HL.Visualization

#285 (Cloning could be improved by creating objects at the bottom of the cloning chain with 'new' instead of the top with Activator.CreateInstance())

File:

• branches/CloningRefactorBranch/HeuristicLab.Operators.Programmable/ProgrammableOperator.cs (modified) (4 diffs)

branches/CloningRefactorBranch/HeuristicLab.Operators.Programmable/ProgrammableOperator.cs

@@ -55 +55 @@
     }
 
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
     public ProgrammableOperator() {
       myCode = "Result.Data = true;";
@@ -60 +63 @@
       AddVariableInfo(new VariableInfo("Result", "A computed variable", typeof(BoolData), VariableKind.New | VariableKind.Out));
       executeMethod = null;
+    }
+
+
+    /// <summary>
+    /// Copy constructor to create deep clones.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    public ProgrammableOperator(ProgrammableOperator original) : this(original, new Dictionary<Guid, object>()) { }
+    /// <summary>
+    /// Copy constructor to create a deep clone of an ProgrammableOperator instance.
+    /// </summary>
+    /// <param name="original">The original instance to be cloned.</param>
+    /// <param name="clonedObjects">Already cloned object references.</param>
+    protected ProgrammableOperator(ProgrammableOperator original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.myDescription = original.Description;
+      this.myCode = original.Code;
+      this.executeMethod = original.executeMethod;
     }
 
@@ -143 +164 @@
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ProgrammableOperator clone = (ProgrammableOperator)base.Clone(clonedObjects);
-      clone.myDescription = Description;
-      clone.myCode = Code;
-      clone.executeMethod = executeMethod;
-      return clone;
-    }
-
     public override IOperation Apply(IScope scope) {
       if (executeMethod == null) {
@@ -196 +209 @@
     }
 
+
+    /// <summary>
+    /// Creates a deep clone with the copy constructor reusing already cloned
+    /// object references.
+    /// </summary>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    /// <returns>The cloned instance.</returns>
+    public override object Clone(IDictionary<Guid, object> clonedObjects) {
+      return new ProgrammableOperator(this, clonedObjects);
+    }
     #region Persistence Methods
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {