Changeset 887 for branches/CloningRefactorBranch/HeuristicLab.Operators.Stopwatch/Stopwatch.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.Stopwatch/Stopwatch.cs (modified) (3 diffs)

branches/CloningRefactorBranch/HeuristicLab.Operators.Stopwatch/Stopwatch.cs

@@ -40 +40 @@
     }
 
+    /// <summary>
+    /// Copy constructor to create deep clones.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    public Stopwatch(Stopwatch original) : this(original, new Dictionary<Guid, object>()) { }
+    /// <summary>
+    /// Copy constructor to create deep clones reusing already cloned object references.
+    /// </summary>
+    /// <param name="original">The instance to be cloned.</param>
+    /// <param name="clonedObjects">Already cloned objects (for referential integrity).</param>
+    protected Stopwatch(Stopwatch original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      elapsedTime = original.elapsedTime;
+      if (original.running) this.Start();
+    }
+
     public void Start() {
       stopwatch.Start();
@@ -58 +74 @@
     }
 
+    /// <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) {
-      Stopwatch clone = (Stopwatch)base.Clone(clonedObjects);
-      if(running) clone.Start();
-      clone.elapsedTime = elapsedTime;
-      return clone;
+      return new Stopwatch(this, clonedObjects);
     }
 
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
       XmlAttribute runningAttr = document.CreateAttribute("Running");
@@ -75 +94 @@
       return node;
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       long elapsedTicks = long.Parse(node.Attributes["ElapsedTicks"].Value);
       elapsedTime = TimeSpan.FromTicks(elapsedTicks);
       running = bool.Parse(node.Attributes["Running"].Value);
-      if(running) stopwatch.Start();
+      if (running) stopwatch.Start();
       base.Populate(node, restoredObjects);
     }