Changeset 125 for branches/XmlReaderWriterBranch/HeuristicLab.DataAnalysis/Dataset.cs

Timestamp:

04/15/08 16:41:18 (17 years ago)

Author:

gkronber

Message:

created a branch that combines the XmlReader and XmlWriter branches

Location:

branches/XmlReaderWriterBranch

Files:

• . (copied) (copied from branches/XmlTextWriterBranch)
• HeuristicLab.DataAnalysis/Dataset.cs (modified) (1 diff)

branches/XmlReaderWriterBranch/HeuristicLab.DataAnalysis/Dataset.cs

@@ -149 +149 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      Name = node.Attributes["Name"].Value;
-      rows = int.Parse(node.Attributes["Dimension1"].Value, CultureInfo.InvariantCulture.NumberFormat);
-      columns = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat);
-      
-      VariableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value);
-
-      string[] tokens = node.InnerText.Split(';');
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+    //  Name = node.Attributes["Name"].Value;
+    //  rows = int.Parse(node.Attributes["Dimension1"].Value, CultureInfo.InvariantCulture.NumberFormat);
+    //  columns = int.Parse(node.Attributes["Dimension2"].Value, CultureInfo.InvariantCulture.NumberFormat);
+
+    //  VariableNames = ParseVariableNamesString(node.Attributes["VariableNames"].Value);
+
+    //  string[] tokens = node.InnerText.Split(';');
+    //  if(tokens.Length != rows * columns) throw new FormatException();
+    //  samples = new double[rows * columns];
+    //  for(int row = 0; row < rows; row++) {
+    //    for(int column = 0; column < columns; column++) {
+    //      if(double.TryParse(tokens[row * columns + column], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out samples[row * columns + column]) == false) {
+    //        throw new FormatException("Can't parse " + tokens[row * columns + column] + " as double value.");
+    //      }
+    //    }
+    //  }
+    //  CreateDictionaries();
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      Name = reader["Name"];
+      rows = int.Parse(reader["Dimension1"], CultureInfo.InvariantCulture.NumberFormat);
+      columns = int.Parse(reader["Dimension2"], CultureInfo.InvariantCulture.NumberFormat);
+      VariableNames = ParseVariableNamesString(reader["VariableNames"]);
+      string[] tokens = reader.ReadString().Split(';');
+
       if(tokens.Length != rows * columns) throw new FormatException();
       samples = new double[rows * columns];
       for(int row = 0; row < rows; row++) {
         for(int column = 0; column < columns; column++) {
-          if(double.TryParse(tokens[row * columns + column], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out samples[row*columns + column]) == false) {
+          if(double.TryParse(tokens[row * columns + column], NumberStyles.Float, CultureInfo.InvariantCulture.NumberFormat, out samples[row * columns + column]) == false) {
             throw new FormatException("Can't parse " + tokens[row * columns + column] + " as double value.");
           }