Changeset 121 for branches/XmlTextReaderBranch/HeuristicLab.Core/EngineBase.cs

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.Core/EngineBase.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Core/EngineBase.cs

@@ -190 +190 @@
       return node;
     }
-    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);
+      myOperatorGraph = (IOperatorGraph)PersistenceManager.Restore(reader, "OperatorGraph", restoredObjects);
+      myGlobalScope = (IScope)PersistenceManager.Restore(reader, "GlobalScope", restoredObjects);
+
+      reader.ReadStartElement("ExecutionStack");
+      List<IOperation> operationList = new List<IOperation>();
+      while(reader.IsStartElement()) {
+        operationList.Insert(0, (IOperation)PersistenceManager.Restore(reader, restoredObjects));
+      }
+      foreach(IOperation op in operationList)
+        myExecutionStack.Push(op);
+      reader.ReadEndElement();
+
+      reader.ReadStartElement("ExecutionTime");
+      myExecutionTime = TimeSpan.Parse(reader.ReadString());
+      reader.ReadEndElement();
     }
     #endregion