Changeset 125 for branches/XmlReaderWriterBranch/HeuristicLab.Core/EngineBase.cs

Timestamp:

04/15/08 16:41:18 (17 years ago)

Author:

gkronber

Message:

created a branch that combines the XmlReader and XmlWriter branches

Location:

branches/XmlReaderWriterBranch

Files:

• . (copied) (copied from branches/XmlTextWriterBranch)
• HeuristicLab.Core/EngineBase.cs (modified) (1 diff)

branches/XmlReaderWriterBranch/HeuristicLab.Core/EngineBase.cs

@@ -204 +204 @@
       writer.WriteEndElement(); // </ExecutionTime>
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      myOperatorGraph = (IOperatorGraph)PersistenceManager.Restore(node.SelectSingleNode("OperatorGraph"), restoredObjects);
-      myGlobalScope = (IScope)PersistenceManager.Restore(node.SelectSingleNode("GlobalScope"), restoredObjects);
-
-      XmlNode stackNode = node.SelectSingleNode("ExecutionStack");
-      for (int i = stackNode.ChildNodes.Count - 1; i >= 0; i--)
-        myExecutionStack.Push((IOperation)PersistenceManager.Restore(stackNode.ChildNodes[i], restoredObjects));
-
-      XmlNode timeNode = node.SelectSingleNode("ExecutionTime");
-      myExecutionTime = TimeSpan.Parse(timeNode.InnerText);
+    public override void Populate(XmlReader reader, IDictionary<Guid,IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      reader.Read();
+      myOperatorGraph = (IOperatorGraph)PersistenceManager.Restore(reader, "OperatorGraph", restoredObjects);
+      reader.Skip();
+      myGlobalScope = (IScope)PersistenceManager.Restore(reader, "GlobalScope", restoredObjects);
+      reader.Skip();
+      if(reader.Name!="ExecutionStack") throw new XmlException("Expected \"ExecutionStack\", found: \""+reader.Name+"\"");
+      List<IOperation> operationList = new List<IOperation>();
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          operationList.Insert(0, (IOperation)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      foreach(IOperation op in operationList)
+        myExecutionStack.Push(op);
+      myExecutionTime = TimeSpan.Parse(reader.ReadElementString("ExecutionTime"));
     }
     #endregion