Changeset 123 for branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorGroup.cs

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)

File:

• branches/XmlTextReaderBranch/HeuristicLab.Core/OperatorGroup.cs (modified) (1 diff)

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