Changeset 119 for branches/XmlTextWriterBranch/HeuristicLab.Random

Timestamp:

04/14/08 17:49:47 (16 years ago)

Author:

gkronber

Message:

created a branch that uses XmlTextWriter instead of XMLDocument to save documents. Investigating ticket #103.

Location:

branches/XmlTextWriterBranch

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Random/MersenneTwister.cs (modified) (9 diffs)
• HeuristicLab.Random/NormalDistributedRandom.cs (modified) (1 diff)

branches/XmlTextWriterBranch/HeuristicLab.Random/MersenneTwister.cs

@@ -48 +48 @@
 
     public MersenneTwister() {
-      if (!init) seed((uint)DateTime.Now.Ticks);
+      if(!init) seed((uint)DateTime.Now.Ticks);
       init = true;
     }
@@ -70 +70 @@
 
     public void Reset() {
-      lock (locker)
+      lock(locker)
         seed((uint)DateTime.Now.Ticks);
     }
     public void Reset(int s) {
-      lock (locker)
+      lock(locker)
         seed((uint)s);
     }
 
     public int Next() {
-      lock (locker) {
+      lock(locker) {
         return (int)(rand_int32() >> 1);
       }
     }
     public int Next(int maxVal) {
-      lock (locker) {
-        if (maxVal <= 0)
+      lock(locker) {
+        if(maxVal <= 0)
           throw new ArgumentException("The interval [0, " + maxVal + ") is empty");
         int limit = (Int32.MaxValue / maxVal) * maxVal;
         int value = Next();
-        while (value >= limit) value = Next();
+        while(value >= limit) value = Next();
         return value % maxVal;
       }
     }
     public int Next(int minVal, int maxVal) {
-      lock (locker) {
-        if (maxVal <= minVal)
+      lock(locker) {
+        if(maxVal <= minVal)
           throw new ArgumentException("The interval [" + minVal + ", " + maxVal + ") is empty");
         return Next(maxVal - minVal) + minVal;
@@ -101 +101 @@
     }
     public double NextDouble() {
-      lock (locker) {
+      lock(locker) {
         return rand_double53();
       }
@@ -107 +107 @@
 
     #region Persistence Methods
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-
+    //public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid,IStorable> persistedObjects) {
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+
+    //  StringBuilder builder = new StringBuilder();
+    //  builder.Append(state[0]);
+    //  for (int i = 1; i < state.Length; i++) {
+    //    builder.Append(';');
+    //    builder.Append(state[i]);
+    //  }
+    //  XmlNode stateNode = document.CreateNode(XmlNodeType.Element, "State", null);
+    //  stateNode.InnerText = builder.ToString();
+    //  node.AppendChild(stateNode);
+
+    //  XmlNode pNode = document.CreateNode(XmlNodeType.Element, "P", null);
+    //  pNode.InnerText = p.ToString();
+    //  node.AppendChild(pNode);
+
+    //  XmlNode initNode = document.CreateNode(XmlNodeType.Element, "Init", null);
+    //  initNode.InnerText = init.ToString();
+    //  node.AppendChild(initNode);
+
+    //  return node;
+    //}
+    public override void Persist(string name, XmlWriter writer, IDictionary<Guid, IStorable> persistedObjects) {
+      base.Persist(name, writer, persistedObjects);
       StringBuilder builder = new StringBuilder();
       builder.Append(state[0]);
-      for (int i = 1; i < state.Length; i++) {
+      for(int i = 1; i < state.Length; i++) {
         builder.Append(';');
         builder.Append(state[i]);
       }
-      XmlNode stateNode = document.CreateNode(XmlNodeType.Element, "State", null);
-      stateNode.InnerText = builder.ToString();
-      node.AppendChild(stateNode);
-
-      XmlNode pNode = document.CreateNode(XmlNodeType.Element, "P", null);
-      pNode.InnerText = p.ToString();
-      node.AppendChild(pNode);
-
-      XmlNode initNode = document.CreateNode(XmlNodeType.Element, "Init", null);
-      initNode.InnerText = init.ToString();
-      node.AppendChild(initNode);
-
-      return node;
-    }
-    public override void Populate(XmlNode node, IDictionary<Guid,IStorable> restoredObjects) {
+      writer.WriteStartElement("State");
+      writer.WriteValue(builder.ToString());
+      writer.WriteEndElement(); // </State>
+      writer.WriteStartElement("P");
+      writer.WriteValue(p.ToString());
+      writer.WriteEndElement(); // </P>
+      writer.WriteStartElement("Init");
+      writer.WriteValue(init.ToString());
+      writer.WriteEndElement(); // </Init>
+    }
+    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++)
+      for(int i = 0; i < tokens.Length; i++)
         state[i] = uint.Parse(tokens[i]);
       p = int.Parse(node.SelectSingleNode("P").InnerText);
@@ -145 +163 @@
     public void seed(uint s) {
       state[0] = s & 0xFFFFFFFFU;
-      for (int i = 1; i < n; ++i) {
+      for(int i = 1; i < n; ++i) {
         state[i] = 1812433253U * (state[i - 1] ^ (state[i - 1] >> 30)) + (uint)i;
         state[i] &= 0xFFFFFFFFU;
@@ -154 +172 @@
       seed(19650218U);
       int i = 1, j = 0;
-      for (int k = ((n > array.Length) ? n : array.Length); k > 0; --k) {
+      for(int k = ((n > array.Length) ? n : array.Length); k > 0; --k) {
         state[i] = (state[i] ^ ((state[i - 1] ^ (state[i - 1] >> 30)) * 1664525U))
           + array[j] + (uint)j;
@@ -160 +178 @@
         ++j;
         j %= array.Length;
-        if ((++i) == n) { state[0] = state[n - 1]; i = 1; }
-      }
-      for (int k = n - 1; k > 0; --k) {
+        if((++i) == n) { state[0] = state[n - 1]; i = 1; }
+      }
+      for(int k = n - 1; k > 0; --k) {
         state[i] = (state[i] ^ ((state[i - 1] ^ (state[i - 1] >> 30)) * 1566083941U)) - (uint)i;
         state[i] &= 0xFFFFFFFFU;
-        if ((++i) == n) { state[0] = state[n - 1]; i = 1; }
+        if((++i) == n) { state[0] = state[n - 1]; i = 1; }
       }
       state[0] = 0x80000000U;
@@ -174 +192 @@
     #region Random Number Generation Methods
     private uint rand_int32() {
-      if (p == n) gen_state();
+      if(p == n) gen_state();
       uint x = state[p++];
       x ^= (x >> 11);
@@ -202 +220 @@
     }
     private void gen_state() {
-      for (int i = 0; i < (n - m); ++i)
+      for(int i = 0; i < (n - m); ++i)
         state[i] = state[i + m] ^ twiddle(state[i], state[i + 1]);
-      for (int i = n - m; i < (n - 1); ++i)
+      for(int i = n - m; i < (n - 1); ++i)
         state[i] = state[i + m - n] ^ twiddle(state[i], state[i + 1]);
       state[n - 1] = state[m - 1] ^ twiddle(state[n - 1], state[0]);

branches/XmlTextWriterBranch/HeuristicLab.Random/NormalDistributedRandom.cs

@@ -513 +513 @@
 
 
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-
-      XmlNode muNode = document.CreateNode(XmlNodeType.Element, "Mu", null);
-      muNode.InnerText = mu.ToString();
-      node.AppendChild(muNode);
-
-      XmlNode sigmaNode = document.CreateNode(XmlNodeType.Element, "Sigma", null);
-      sigmaNode.InnerText = sigma.ToString();
-      node.AppendChild(sigmaNode);
-
-      node.AppendChild(PersistenceManager.Persist("UniformRandom", uniform, document, persistedObjects));
-
-      return node;
+    //public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+    //  XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+
+    //  XmlNode muNode = document.CreateNode(XmlNodeType.Element, "Mu", null);
+    //  muNode.InnerText = mu.ToString();
+    //  node.AppendChild(muNode);
+
+    //  XmlNode sigmaNode = document.CreateNode(XmlNodeType.Element, "Sigma", null);
+    //  sigmaNode.InnerText = sigma.ToString();
+    //  node.AppendChild(sigmaNode);
+
+    //  node.AppendChild(PersistenceManager.Persist("UniformRandom", uniform, document, persistedObjects));
+
+    //  return node;
+    //}
+    public override void Persist(string name, XmlWriter writer, IDictionary<Guid, IStorable> persistedObjects) {
+      base.Persist(name, writer, persistedObjects);
+      writer.WriteStartElement("Mu");
+      writer.WriteValue(mu.ToString());
+      writer.WriteEndElement();
+      writer.WriteStartElement("Sigma");
+      writer.WriteValue(sigma.ToString());
+      writer.WriteEndElement();
+      PersistenceManager.Persist("UniformRandom", uniform, writer, persistedObjects);
     }