Changeset 888 for branches/CloningRefactorBranch/HeuristicLab.Scheduling.JSSP/Schedule.cs

Timestamp:

12/02/08 21:30:34 (15 years ago)

Author:

gkronber

Message:

Refactored cloning in plugins HL.Routing and HL.Scheduling

#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.Scheduling.JSSP/Schedule.cs (modified) (3 diffs)

branches/CloningRefactorBranch/HeuristicLab.Scheduling.JSSP/Schedule.cs

@@ -41 +41 @@
     public Schedule() : this(0, 100) { }
 
+    public Schedule(Schedule original) : this(original, new Dictionary<Guid, object>()) { }
+    protected Schedule(Schedule original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.schedule = new ScheduleTree[original.Machines];
+      for (int i = 0; i < original.Machines; i++) {
+        this.schedule[i] = (ScheduleTree)Auxiliary.Clone(original.schedule[i], clonedObjects);
+      }
+    }
+
     public int Machines {
       get { return schedule.Length; }
@@ -64 +73 @@
     }
 
-    #region IStorable Members
+   #region IStorable Members
 
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
@@ -87 +96 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      int timespan = 0;
-      if ((schedule != null) && (schedule.Length > 0)) {
-        timespan = schedule[0].Timespan;
-      }
-      Schedule clone = new Schedule(this.Machines, timespan);
-      clonedObjects.Add(Guid, clone);
-      clone.schedule = new ScheduleTree[this.Machines];
-      for(int i = 0; i < this.Machines; i++) {
-        clone.schedule[i] = (ScheduleTree)Auxiliary.Clone(schedule[i], clonedObjects);
-      }
-      return clone;
+      return new Schedule(this, clonedObjects);
     }