Changeset 121 for branches/XmlTextReaderBranch/HeuristicLab.Scheduling.JSSP

Timestamp:

04/14/08 21:51:15 (16 years ago)

Author:

gkronber

Message:

created a branch that uses XmlTextReader instead of XMLDocument to load documents. Investigating ticket #103. (...work in progress!)

Location:

branches/XmlTextReaderBranch

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Scheduling.JSSP/JSSPInjector.cs (copied) (copied from trunk/sources/HeuristicLab.Scheduling.JSSP/JSSPInjector.cs) (1 diff)
• HeuristicLab.Scheduling.JSSP/Operation.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/Schedule.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/ScheduleInjector.cs (modified) (1 diff)
• HeuristicLab.Scheduling.JSSP/ScheduleTree.cs (modified) (1 diff)

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

@@ -88 +88 @@
       return node;
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      operations = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Operations"), restoredObjects);
-      jobs = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Jobs"), restoredObjects);
-      machines = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Machines"), restoredObjects); 
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  operations = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Operations"), restoredObjects);
+    //  jobs = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Jobs"), restoredObjects);
+    //  machines = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Machines"), restoredObjects);
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      operations = (ItemList)PersistenceManager.Restore(reader, "Operations", restoredObjects);
+      jobs = (IntData)PersistenceManager.Restore(reader, "Jobs", restoredObjects);
+      machines = (IntData)PersistenceManager.Restore(reader, "Machines", restoredObjects);
     }
     #endregion

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

@@ -150 +150 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      job = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Job"), restoredObjects);
-      operationIndex = (IntData)PersistenceManager.Restore(node.SelectSingleNode("OperationIndex"), restoredObjects);
-      start = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Start"), restoredObjects);
-      duration = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Duration"), restoredObjects);
-      predecessors = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Predecessors"), restoredObjects);
-      machines = (IntArrayData)PersistenceManager.Restore(node.SelectSingleNode("Machines"), restoredObjects);
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  job = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Job"), restoredObjects);
+    //  operationIndex = (IntData)PersistenceManager.Restore(node.SelectSingleNode("OperationIndex"), restoredObjects);
+    //  start = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Start"), restoredObjects);
+    //  duration = (IntData)PersistenceManager.Restore(node.SelectSingleNode("Duration"), restoredObjects);
+    //  predecessors = (ItemList)PersistenceManager.Restore(node.SelectSingleNode("Predecessors"), restoredObjects);
+    //  machines = (IntArrayData)PersistenceManager.Restore(node.SelectSingleNode("Machines"), restoredObjects);
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      job = (IntData)PersistenceManager.Restore(reader, "Job", restoredObjects);
+      operationIndex = (IntData)PersistenceManager.Restore(reader, "OperationIndex", restoredObjects);
+      start = (IntData)PersistenceManager.Restore(reader, "Start", restoredObjects);
+      duration = (IntData)PersistenceManager.Restore(reader, "Duration", restoredObjects);
+      predecessors = (ItemList)PersistenceManager.Restore(reader, "Predecessors", restoredObjects);
+      machines = (IntArrayData)PersistenceManager.Restore(reader, "Machines", restoredObjects);
     }
 

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

@@ -77 +77 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      int machines = int.Parse(node.Attributes["Machines"].Value);
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  int machines = int.Parse(node.Attributes["Machines"].Value);
+    //  schedule = new ScheduleTree[machines];
+    //  for(int i = 0; i < machines; i++) {
+    //    schedule[i] = (ScheduleTree)PersistenceManager.Restore(node.SelectSingleNode("Machine" + i.ToString()), restoredObjects);
+    //  }
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      int machines = int.Parse(reader["Machines"]);
       schedule = new ScheduleTree[machines];
       for(int i = 0; i < machines; i++) {
-        schedule[i] = (ScheduleTree)PersistenceManager.Restore(node.SelectSingleNode("Machine" + i.ToString()), restoredObjects);
+        schedule[i] = (ScheduleTree)PersistenceManager.Restore(reader, "Machine" + i.ToString(), restoredObjects);
       }
     }

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

@@ -71 +71 @@
       return node;
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      XmlNode scheduleNode = node.SelectSingleNode("Schedule");
-      if(scheduleNode != null) {
-        schedule = (Schedule)PersistenceManager.Restore(scheduleNode, restoredObjects);
-      }
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  XmlNode scheduleNode = node.SelectSingleNode("Schedule");
+    //  if(scheduleNode != null) {
+    //    schedule = (Schedule)PersistenceManager.Restore(scheduleNode, restoredObjects);
+    //  }
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      if(reader.IsStartElement()) 
+        schedule = (Schedule)PersistenceManager.Restore(reader, "Schedule", restoredObjects);
     }
     #endregion

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

@@ -214 +214 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      string[] tokens = node.InnerText.Split(';');
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  string[] tokens = node.InnerText.Split(';');
+    //  for(int i = 0; i < tokens.Length - 1; i++) {
+    //    TimeSlot t = new TimeSlot(tokens[i]);
+    //    if(t.job > -1) {
+    //      this.InsertOperation(t);
+    //    }
+    //  }
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      string[] tokens = reader.ReadString().Split(';');
       for(int i = 0; i < tokens.Length - 1; i++) {
         TimeSlot t = new TimeSlot(tokens[i]);