Changeset 125 for branches/XmlReaderWriterBranch/HeuristicLab.Random

Timestamp:

04/15/08 16:41:18 (16 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.Random/MersenneTwister.cs (modified) (1 diff)
• HeuristicLab.Random/NormalDistributedRandom.cs (modified) (1 diff)

branches/XmlReaderWriterBranch/HeuristicLab.Random/MersenneTwister.cs

@@ -148 +148 @@
       writer.WriteEndElement(); // </Init>
     }
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-
-      string stateString = node.SelectSingleNode("State").InnerText;
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+
+    //  string stateString = node.SelectSingleNode("State").InnerText;
+    //  string[] tokens = stateString.Split(';');
+    //  for(int i = 0; i < tokens.Length; i++)
+    //    state[i] = uint.Parse(tokens[i]);
+    //  p = int.Parse(node.SelectSingleNode("P").InnerText);
+    //  init = bool.Parse(node.SelectSingleNode("Init").InnerText);
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      reader.Read();
+      string stateString = reader.ReadElementString("State");
       string[] tokens = stateString.Split(';');
       for(int i = 0; i < tokens.Length; i++)
         state[i] = uint.Parse(tokens[i]);
-      p = int.Parse(node.SelectSingleNode("P").InnerText);
-      init = bool.Parse(node.SelectSingleNode("Init").InnerText);
+      p = int.Parse(reader.ReadElementString("P"));
+      init = bool.Parse(reader.ReadElementString("Init"));
     }
     #endregion

branches/XmlReaderWriterBranch/HeuristicLab.Random/NormalDistributedRandom.cs

@@ -539 +539 @@
     }
 
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-
-      mu = double.Parse(node.SelectSingleNode("Mu").InnerText);
-      sigma = double.Parse(node.SelectSingleNode("Sigma").InnerText);
-      uniform = (IRandom)PersistenceManager.Restore(node.SelectSingleNode("UniformRandom"), restoredObjects);
+    //public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+    //  base.Populate(node, restoredObjects);
+
+    //  mu = double.Parse(node.SelectSingleNode("Mu").InnerText);
+    //  sigma = double.Parse(node.SelectSingleNode("Sigma").InnerText);
+    //  uniform = (IRandom)PersistenceManager.Restore(node.SelectSingleNode("UniformRandom"), restoredObjects);
+    //}
+    public override void Populate(XmlReader reader, IDictionary<Guid, IStorable> restoredObjects) {
+      base.Populate(reader, restoredObjects);
+      mu = double.Parse(reader.ReadElementString("Mu"));
+      sigma = double.Parse(reader.ReadElementString("Sigma"));
+      uniform = (IRandom)PersistenceManager.Restore(reader, "UniformRandom", restoredObjects);
+      reader.Read();
     }