Changeset 122 for branches/XmlTextReaderBranch/HeuristicLab.Data

Timestamp:

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

Author:

gkronber

Message:

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

Location:

branches/XmlTextReaderBranch/HeuristicLab.Data

Files:

• ConstrainedItemList.cs (modified) (1 diff)
• DoubleData.cs (modified) (1 diff)
• IntMatrixData.cs (modified) (1 diff)
• ItemList_T.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Data/ConstrainedItemList.cs

@@ -77 +77 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
-      reader.ReadStartElement("ListItems");
+      reader.Read();
+      if(reader.Name!="ListItems") throw new XmlException("Expected: \"ListItems\", found: \""+reader.Name+"\"");
       suspendConstraintCheck = bool.Parse(reader["SuspendConstraintCheck"]);
       list = new List<IItem>();
-      while(reader.IsStartElement())
-        list.Add((IItem)PersistenceManager.Restore(reader, restoredObjects));
-      reader.ReadEndElement();
+      if(!reader.IsEmptyElement) {
+        while(reader.IsStartElement()) {
+          list.Add((IItem)PersistenceManager.Restore(reader, restoredObjects));
+          reader.Skip();
+        }
+        reader.ReadEndElement();
+      } else {
+        reader.Read();
+      }
     }
     #endregion

branches/XmlTextReaderBranch/HeuristicLab.Data/DoubleData.cs

@@ -69 +69 @@
       base.Populate(reader, restoredObjects);
       double data;
-      if(double.TryParse(reader.ReadString(), NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out data) == true) {
+      string token = reader.ReadString();
+      if(double.TryParse(token, NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out data) == true) {
         Data = data;
       } else {
-        throw new FormatException("Can't parse " + reader.ReadString() + " as double value.");
+        throw new FormatException("Can't parse " + token + " as double value.");
       }
     }

branches/XmlTextReaderBranch/HeuristicLab.Data/IntMatrixData.cs

@@ -74 +74 @@
       int dim2 = int.Parse(reader["Dimension2"], CultureInfo.InvariantCulture.NumberFormat);
       string[] tokens = reader.ReadString().Split(';');
+
       int[,] data = new int[dim1, dim2];
       for(int i = 0; i < dim1; i++) {

branches/XmlTextReaderBranch/HeuristicLab.Data/ItemList_T.cs

@@ -63 +63 @@
     public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(reader, restoredObjects);
-      while(reader.IsStartElement()) 
+      reader.Read();
+      while(reader.IsStartElement()) {
         list.Add((T)PersistenceManager.Restore(reader, restoredObjects));
+        reader.Skip();
+      }
+      reader.ReadEndElement();
     }