Changeset 122 for branches/XmlTextReaderBranch/HeuristicLab.Core

Timestamp:

04/15/08 14:17:26 (16 years ago)

Author:

gkronber

Message:

bug fixes to make loading of OSGA-TSP work. Some non-working code remains

Location:

branches/XmlTextReaderBranch/HeuristicLab.Core

Files:

• AtomicOperation.cs (modified) (1 diff)
• CompositeOperation.cs (modified) (1 diff)
• ConstrainedItemBase.cs (modified) (6 diffs)
• EngineBase.cs (modified) (1 diff)
• OperatorBase.cs (modified) (1 diff)
• OperatorGraph.cs (modified) (1 diff)
• OperatorGroup.cs (modified) (1 diff)
• PersistenceManager.cs (modified) (3 diffs)
• Scope.cs (modified) (1 diff)
• Variable.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Core/AtomicOperation.cs

@@ -64 +64 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
+      reader.Read();
       myOperator = (IOperator)PersistenceManager.Restore(reader, "Operator", restoredObjects);
+      reader.Skip();
       myScope = (IScope)PersistenceManager.Restore(reader, "Scope", restoredObjects);
+      reader.Read();
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Core/CompositeOperation.cs

@@ -81 +81 @@
     //}
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      myExecuteInParallel = bool.Parse(reader["ExecuteInParallel"]);
       base.Populate(reader, restoredObjects);
 
-      myExecuteInParallel = bool.Parse(reader["ExecuteInParallel"]);
-
-      reader.ReadStartElement("Operations");
+      reader.ReadToDescendant("Operations");
       while(reader.IsStartElement()) 
         AddOperation((IOperation)PersistenceManager.Restore(reader, restoredObjects));

branches/XmlTextReaderBranch/HeuristicLab.Core/ConstrainedItemBase.cs

@@ -39 +39 @@
       ConstrainedItemBase clone = (ConstrainedItemBase)base.Clone(clonedObjects);
       clone.myConstraints.Clear();
-      foreach (IConstraint constraint in Constraints)
+      foreach(IConstraint constraint in Constraints)
         clone.AddConstraint((IConstraint)Auxiliary.Clone(constraint, clonedObjects));
       return clone;
@@ -49 +49 @@
     }
     public virtual void RemoveConstraint(IConstraint constraint) {
-      if (myConstraints.Remove(constraint))
+      if(myConstraints.Remove(constraint))
         OnConstraintRemoved(constraint);
     }
@@ -55 +55 @@
     public bool IsValid() {
       bool result = true;
-      foreach (IConstraint constraint in Constraints)
+      foreach(IConstraint constraint in Constraints)
         result = result && constraint.Check(this);
       return result;
@@ -62 +62 @@
       bool result = true;
       violatedConstraints = new List<IConstraint>();
-      foreach (IConstraint constraint in Constraints) {
-        if (!constraint.Check(this)) {
+      foreach(IConstraint constraint in Constraints) {
+        if(!constraint.Check(this)) {
           result = false;
           violatedConstraints.Add(constraint);
@@ -77 +77 @@
     public event EventHandler<ConstraintEventArgs> ConstraintAdded;
     protected virtual void OnConstraintAdded(IConstraint constraint) {
-      if (ConstraintAdded != null)
+      if(ConstraintAdded != null)
         ConstraintAdded(this, new ConstraintEventArgs(constraint));
     }
     public event EventHandler<ConstraintEventArgs> ConstraintRemoved;
     protected virtual void OnConstraintRemoved(IConstraint constraint) {
-      if (ConstraintRemoved != null)
+      if(ConstraintRemoved != null)
         ConstraintRemoved(this, new ConstraintEventArgs(constraint));
     }
 
     #region Persistence Methods
-    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 (Constraints.Count > 0) {
+      if(Constraints.Count > 0) {
         XmlNode constraintsNode = document.CreateNode(XmlNodeType.Element, "Constraints", null);
-        foreach (IConstraint constraint in Constraints)
+        foreach(IConstraint constraint in Constraints)
           constraintsNode.AppendChild(PersistenceManager.Persist(constraint, document, persistedObjects));
         node.AppendChild(constraintsNode);
@@ -108 +108 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
-      if(reader.IsStartElement()) {
-        reader.ReadToDescendant("Constraints");
+      reader.Read();
+      if(reader.Name == "Constraints") {
         myConstraints.Clear();
         while(reader.IsStartElement())

branches/XmlTextReaderBranch/HeuristicLab.Core/EngineBase.cs

@@ -192 +192 @@
     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.ReadStartElement("ExecutionStack");
+      reader.Skip();
+      if(reader.Name!="ExecutionStack") throw new XmlException("Expected \"ExecutionStack\", found: \""+reader.Name+"\"");
       List<IOperation> operationList = new List<IOperation>();
-      while(reader.IsStartElement()) {
-        operationList.Insert(0, (IOperation)PersistenceManager.Restore(reader, restoredObjects));
+      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);
-      reader.ReadEndElement();
-
-      reader.ReadStartElement("ExecutionTime");
-      myExecutionTime = TimeSpan.Parse(reader.ReadString());
-      reader.ReadEndElement();
+      myExecutionTime = TimeSpan.Parse(reader.ReadElementString("ExecutionTime"));
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorBase.cs

@@ -479 +479 @@
     //}
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(reader, restoredObjects);
       myName = reader["Name"];
       if(reader["Breakpoint"] != null)
         myBreakpoint = bool.Parse(reader["Breakpoint"]);
-      reader.ReadStartElement("SubOperators");
-      while(reader.IsStartElement())
-        AddSubOperator((IOperator)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
-      reader.ReadStartElement("VariableInfos");
+
+      base.Populate(reader, restoredObjects);
+      // constraintItemBase already reads to the next subelement
+      if(reader.Name != "SubOperators") throw new XmlException("Expected: \"SubOperators\" found: \"" + reader.Name+"\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          AddSubOperator((IOperator)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name != "VariableInfos") throw new XmlException("Expected: \"VariableInfos\" found: \"" + reader.Name+"\"");
       myVariableInfos.Clear();
-      while(reader.IsStartElement())
-        AddVariableInfo((IVariableInfo)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
-      reader.ReadStartElement("Variables");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {        
+          AddVariableInfo((IVariableInfo)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name != "Variables") throw new XmlException("Expected: \"Variables\" found: \"" + reader.Name + "\"");
       myVariables.Clear();
-      while(reader.IsStartElement()) 
-        AddVariable((IVariable)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          AddVariable((IVariable)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorGraph.cs

@@ -149 +149 @@
       base.Populate(reader, restoredObjects);
 
-      reader.ReadToDescendant("Operators");
+      reader.Read();
+      if(reader.Name != "Operators") throw new XmlException("Expected: Operators found: " + reader.Name);
+      reader.Read();
       while(reader.IsStartElement()) {
         IOperator op = (IOperator)PersistenceManager.Restore(reader, restoredObjects);
+        reader.Skip();
         myOperators.Add(op.Guid, op);
       }

branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorGroup.cs

@@ -109 +109 @@
     //}
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      myName = reader["Name"];
       base.Populate(reader, restoredObjects);
-      myName = reader["Name"];
-      reader.ReadStartElement("SubGroups");
+
+      reader.ReadToDescendant("SubGroups");
       while(reader.IsStartElement()) 
         AddSubGroup((IOperatorGroup)PersistenceManager.Restore(reader, restoredObjects));
       reader.ReadEndElement();
-      reader.ReadStartElement("Operators");
+      reader.ReadToDescendant("Operators");
       while(reader.IsStartElement())
         AddOperator((IOperator)PersistenceManager.Restore(reader, restoredObjects));

branches/XmlTextReaderBranch/HeuristicLab.Core/PersistenceManager.cs

@@ -51 +51 @@
 
     public static IStorable Restore(XmlReader reader, string elementName, IDictionary<Guid, IStorable> restoredObjects) {
-      reader.ReadToDescendant(elementName);
-      return RestoreElement(reader, restoredObjects);
+      reader = reader.ReadSubtree();
+      reader.Read();
+      if(reader.Name != elementName) throw new XmlException("Expected: \"" + elementName + "\" found: \"" + reader.Name+"\"");
+      IStorable result = RestoreElement(reader, restoredObjects);
+      reader.Read();
+      reader.Close();
+      return result;
     }
 
     public static IStorable Restore(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      reader = reader.ReadSubtree();
       reader.Read();
-      return RestoreElement(reader, restoredObjects);
+      IStorable result = RestoreElement(reader, restoredObjects);
+      reader.Read();
+      reader.Close();
+      return result;
     }
     private static IStorable RestoreElement(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       Guid guid = new Guid(reader["GUID"]);
-      if(restoredObjects.ContainsKey(guid)) {
-        reader.ReadEndElement();
+      if(restoredObjects.ContainsKey(guid)) {        
         return restoredObjects[guid];
       } else {
@@ -69 +77 @@
         restoredObjects.Add(guid, instance);
         instance.Populate(reader, restoredObjects);
-        reader.ReadEndElement();
         return instance;
       }
@@ -90 +97 @@
     }
     public static IStorable Load(Stream stream) {
-      XmlDocument doc = new XmlDocument();
-      XmlTextReader reader = new XmlTextReader(stream);
-      reader.WhitespaceHandling = WhitespaceHandling.None;
+      XmlReaderSettings settings = new XmlReaderSettings();
+      settings.IgnoreComments = true;
+      settings.IgnoreWhitespace = true;
+      XmlReader reader = XmlReader.Create(stream, settings);
       reader.MoveToContent(); // read "<?xml version="1.0"?/>
       return PersistenceManager.RestoreElement(reader, new Dictionary<Guid, IStorable>());

branches/XmlTextReaderBranch/HeuristicLab.Core/Scope.cs

@@ -313 +313 @@
     //}
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      myName = reader["Name"];
       base.Populate(reader, restoredObjects);
-      myName = reader["Name"];
-
-      reader.ReadStartElement("Variables");
-      while(reader.IsStartElement()) {
-        IVariable variable = (IVariable)PersistenceManager.Restore(reader, restoredObjects);
-        AddVariable(variable);
-      }
-      reader.ReadEndElement();
-
-      if(reader.IsStartElement() && reader.Name=="Aliases") {
-        reader.ReadStartElement("Aliases");
-        while(reader.IsStartElement()) 
+      reader.Read();
+      if(reader.Name != "Variables") throw new XmlException("Expected: \"Variables\", found: \""+reader.Name+"\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          IVariable variable = (IVariable)PersistenceManager.Restore(reader, restoredObjects);
+          reader.Skip();
+          AddVariable(variable);
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name == "Aliases" && !reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
           AddAlias(reader["Alias"], reader["Name"]);
+        }
         reader.ReadEndElement();
-      }
-      reader.ReadStartElement("SubScopes");
-      while(reader.IsStartElement()) {
-        IScope scope = (IScope)PersistenceManager.Restore(reader, restoredObjects);
-        AddSubScope(scope);
-      }
-      reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name != "SubScopes") throw new XmlException("Expected: \"SubScopes\", found: \"" + reader.Name + "\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          IScope scope = (IScope)PersistenceManager.Restore(reader, restoredObjects);
+          reader.Skip();
+          AddSubScope(scope);
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Core/Variable.cs

@@ -117 +117 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       myName = reader["Name"];
+      reader.Read();
       if(reader.IsStartElement())
         myValue = (IItem)PersistenceManager.Restore(reader, "Value", restoredObjects);