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

Timestamp:

12/02/08 21:30:34 (16 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())

Location:

branches/CloningRefactorBranch/HeuristicLab.Scheduling.JSSP

Files:

• JSSPInjector.cs (modified) (2 diffs)
• Operation.cs (modified) (2 diffs)
• Schedule.cs (modified) (3 diffs)
• ScheduleInjector.cs (modified) (2 diffs)
• ScheduleTree.cs (modified) (2 diffs)

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

@@ -61 +61 @@
     }
 
+    public JSSPInjector(JSSPInjector original) : this(original, new Dictionary<Guid, object>()) { }
+    protected JSSPInjector(JSSPInjector original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.operations = (ItemList)Auxiliary.Clone(original.operations, clonedObjects);
+      this.jobs = (IntData)Auxiliary.Clone(original.jobs, clonedObjects);
+      this.machines = (IntData)Auxiliary.Clone(original.machines, clonedObjects);
+    }
+
     public override IView CreateView() {
       return new JSSPInjectorView(this);
@@ -73 +81 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      JSSPInjector clone = (JSSPInjector)base.Clone(clonedObjects);
-      clone.operations = (ItemList)Auxiliary.Clone(operations, clonedObjects);
-      clone.jobs = (IntData)Auxiliary.Clone(jobs, clonedObjects);
-      clone.machines = (IntData)Auxiliary.Clone(machines, clonedObjects); 
-      return clone;
+      return new JSSPInjector(this, clonedObjects);
     }
 

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

@@ -99 +99 @@
     }
 
+    public Operation(Operation original) : this(original, new Dictionary<Guid, object>()) { }
+    protected Operation(Operation original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      this.duration = (IntData)Auxiliary.Clone(original.duration, clonedObjects);
+      this.start = (IntData)Auxiliary.Clone(original.start, clonedObjects);
+      this.operationIndex = (IntData)Auxiliary.Clone(original.operationIndex, clonedObjects);
+      this.job = (IntData)Auxiliary.Clone(original.job, clonedObjects);
+      this.machines = (IntArrayData)Auxiliary.Clone(original.machines, clonedObjects);
+      this.predecessors = (ItemList)Auxiliary.Clone(original.predecessors, clonedObjects);
+    }
+
     public override string ToString() {
       if(this.Job == -1) {
@@ -128 +139 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Operation clone = new Operation();
-      clonedObjects.Add(Guid, clone);
-      clone.duration = (IntData)Auxiliary.Clone(duration, clonedObjects);
-      clone.start = (IntData)Auxiliary.Clone(start, clonedObjects);
-      clone.operationIndex = (IntData)Auxiliary.Clone(operationIndex, clonedObjects);
-      clone.job = (IntData)Auxiliary.Clone(job, clonedObjects);
-      clone.machines = (IntArrayData)Auxiliary.Clone(machines, clonedObjects);
-      clone.predecessors = (ItemList)Auxiliary.Clone(predecessors, clonedObjects);
-      return clone;
+      return new Operation(this, clonedObjects);
     }
 

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);
     }
 

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

@@ -47 +47 @@
     }
 
+    public ScheduleInjector(ScheduleInjector original) : this(original, new Dictionary<Guid, object>()) { }
+    protected ScheduleInjector(ScheduleInjector original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      if (original.schedule != null) {
+        this.schedule = (Schedule)Auxiliary.Clone(original.schedule, clonedObjects);
+      }
+    }
+
     public override IOperation Apply(IScope scope) {
       IntData machines = GetVariableValue<IntData>("Machines", scope, true);
@@ -56 +64 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ScheduleInjector clone = (ScheduleInjector)base.Clone(clonedObjects);
-      if(schedule != null) {
-        clone.schedule = (Schedule)Auxiliary.Clone(schedule, clonedObjects);
-      }
-      return clone;
+      return new ScheduleInjector(this, clonedObjects);
     }
 
     #region IStorable Members
-    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);
-      if(schedule != null) {
+      if (schedule != null) {
         node.AppendChild(PersistenceManager.Persist("Schedule", schedule, document, persistedObjects));
       }
       return node;
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
       XmlNode scheduleNode = node.SelectSingleNode("Schedule");
-      if(scheduleNode != null) {
+      if (scheduleNode != null) {
         schedule = (Schedule)PersistenceManager.Restore(scheduleNode, restoredObjects);
       }

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

@@ -88 +88 @@
 
     public ScheduleTree() : this(10000) { }
+
+    public ScheduleTree(ScheduleTree original) : this(original, new Dictionary<Guid, object>()) {}
+    protected ScheduleTree(ScheduleTree original, IDictionary<Guid, object> clonedObjects)
+      : base(original, clonedObjects) {
+      foreach (ScheduleTreeNode node in original.InOrder) {
+        if (IsLeaf(node) && (node.Data.job > -1)) {
+          this.InsertOperation(node.Data); // interestingly enough node.Data is not cloned! (gkronber Dec. 2nd, 2008)
+          }
+      }
+    }
 
     private int InsertOperation(Operation op) {
@@ -243 +253 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      ScheduleTree clone = new ScheduleTree(timespan);
-      clonedObjects.Add(Guid, clone);
-      foreach (ScheduleTreeNode node in this.InOrder) {
-        if (IsLeaf(node) && (node.Data.job > -1)) {
-          clone.InsertOperation(node.Data);
-        }
-      }
-      return clone;
+      return new ScheduleTree(this, clonedObjects);
     }