Changeset 121 for branches/XmlTextReaderBranch/HeuristicLab.Data/IntMatrixData.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.Data/IntMatrixData.cs (modified) (1 diff)

branches/XmlTextReaderBranch/HeuristicLab.Data/IntMatrixData.cs

@@ -56 +56 @@
       return node;
     }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      int dim1 = int.Parse(node.Attributes["Dimension1"].Value, CultureInfo.InvariantCulture.NumberFormat);
-      int dim2 = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat);
-      string[] tokens = node.InnerText.Split(';');
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  int dim1 = int.Parse(node.Attributes["Dimension1"].Value, CultureInfo.InvariantCulture.NumberFormat);
+    //  int dim2 = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat);
+    //  string[] tokens = node.InnerText.Split(';');
+    //  int[,] data = new int[dim1, dim2];
+    //  for(int i = 0; i < dim1; i++) {
+    //    for(int j = 0; j < dim2; j++) {
+    //      data[i, j] = int.Parse(tokens[i * dim2 + j], CultureInfo.InvariantCulture.NumberFormat);
+    //    }
+    //  }
+    //  Data = data;
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      int dim1 = int.Parse(reader["Dimension1"], CultureInfo.InvariantCulture.NumberFormat);
+      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++) {
-        for (int j = 0; j < dim2; j++) {
+      for(int i = 0; i < dim1; i++) {
+        for(int j = 0; j < dim2; j++) {
           data[i, j] = int.Parse(tokens[i * dim2 + j], CultureInfo.InvariantCulture.NumberFormat);
         }