Changeset 123 for branches/XmlTextReaderBranch/HeuristicLab.Core

Timestamp:

04/15/08 15:57:41 (16 years ago)

Author:

gkronber

Message:

fixed more bugs (not thoroughly tested but at least it works for OSGP_NOx and OSGA_TSP)

Location:

branches/XmlTextReaderBranch/HeuristicLab.Core

Files:

• CompositeOperation.cs (modified) (1 diff)
• ConstrainedItemBase.cs (modified) (1 diff)
• OperatorGroup.cs (modified) (1 diff)
• OperatorLibrary.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Core/CompositeOperation.cs

@@ -84 +84 @@
       base.Populate(reader, restoredObjects);
 
-      reader.ReadToDescendant("Operations");
-      while(reader.IsStartElement()) 
-        AddOperation((IOperation)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
+      if(reader.Name != "Operations") throw new XmlException("Expected: \"Operations\", found: \""+reader.Name+"\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          AddOperation((IOperation)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Core/ConstrainedItemBase.cs

@@ -111 +111 @@
       if(reader.Name == "Constraints") {
         myConstraints.Clear();
-        while(reader.IsStartElement())
+        reader.Read();
+        while(reader.IsStartElement()) {
           AddConstraint((IConstraint)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
         reader.ReadEndElement();
       }

branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorGroup.cs

@@ -111 +111 @@
       myName = reader["Name"];
       base.Populate(reader, restoredObjects);
-
-      reader.ReadToDescendant("SubGroups");
-      while(reader.IsStartElement()) 
-        AddSubGroup((IOperatorGroup)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
-      reader.ReadToDescendant("Operators");
-      while(reader.IsStartElement())
-        AddOperator((IOperator)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
+      reader.Read();
+      if(reader.Name != "SubGroups") throw new XmlException("Expected: \"SubGroups\", found: \"" + reader.Name + "\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          AddSubGroup((IOperatorGroup)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
+      if(reader.Name != "Operators") throw new XmlException("Expected: \"Operators\", found: \"" + reader.Name + "\"");
+      if(!reader.IsEmptyElement) {
+        reader.Read();
+        while(reader.IsStartElement()) {
+          AddOperator((IOperator)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorLibrary.cs

@@ -58 +58 @@
     public override void Populate(XmlReader reader, IDictionary<Guid,IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
+      reader.Read();
       myGroup = (IOperatorGroup)PersistenceManager.Restore(reader, "OperatorGroup", restoredObjects);
+      reader.Read();
     }
     #endregion