Changeset 1914 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/TreeEvaluatorBase.cs

Timestamp:

05/27/09 15:42:04 (15 years ago)

Author:

epitzer

Message:

Migration of DataAnalysis, GP, GP.StructureIdentification and Modeling to new Persistence-3.3 (#603)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/TreeEvaluatorBase.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.4/TreeEvaluatorBase.cs

@@ -28 +28 @@
 using System.Diagnostics;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -34 +35 @@
   /// </summary>
   public abstract class TreeEvaluatorBase : ItemBase, ITreeEvaluator {
+
     protected const double EPSILON = 1.0e-7;
+
+    [Storable]
     protected double estimatedValueMax;
+
+    [Storable]
     protected double estimatedValueMin;
+
+    [Storable]
+    protected Dataset dataset;
 
     protected class Instr {
@@ -49 +58 @@
     protected Instr[] codeArr;
     protected int PC;
-    protected Dataset dataset;
     protected int sampleIndex;
 
@@ -135 +143 @@
       return clone;
     }
-
-    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      XmlAttribute minEstimatedValueAttr = document.CreateAttribute("MinEstimatedValue");
-      minEstimatedValueAttr.Value = XmlConvert.ToString(estimatedValueMin);
-      node.Attributes.Append(minEstimatedValueAttr);
-
-      XmlAttribute maxEstimatedValueAttr = document.CreateAttribute("MaxEstimatedValue");
-      maxEstimatedValueAttr.Value = XmlConvert.ToString(estimatedValueMax);
-      node.Attributes.Append(maxEstimatedValueAttr);
-
-      node.AppendChild(PersistenceManager.Persist("Dataset", dataset, document, persistedObjects));
-      return node;
-    }
-
-    public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
-      base.Populate(node, restoredObjects);
-      estimatedValueMax = XmlConvert.ToDouble(node.Attributes["MaxEstimatedValue"].Value);
-      estimatedValueMin = XmlConvert.ToDouble(node.Attributes["MinEstimatedValue"].Value);
-
-      dataset = (Dataset)PersistenceManager.Restore(node.SelectSingleNode("Dataset"), restoredObjects);
-    }
   }
 }