Changeset 2218 for branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Timestamp:

07/31/09 12:31:32 (15 years ago)

Author:

gkronber

Message:

Worked on persistence of function trees. #713

Location:

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Files:

• ConstantFunctionTree.cs (modified) (2 diffs)
• Differential.cs (modified) (2 diffs)
• Variable.cs (modified) (1 diff)
• VariableFunctionTree.cs (modified) (2 diffs)

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/ConstantFunctionTree.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.GP.Interfaces;
+using System.Xml;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -56 +57 @@
     }
 
-    public override IFunctionTree Clone() {
+    public override object Clone() {
       return new ConstantFunctionTree(this);
+    }
+
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<System.Guid, IStorable> persistedObjects) {
+      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlAttribute valueAttr = document.CreateAttribute("Value");
+      valueAttr.Value = XmlConvert.ToString(Value);
+      node.Attributes.Append(valueAttr);
+      return node;
+    }
+
+    public override void Populate(XmlNode node, IDictionary<System.Guid, IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      Value = XmlConvert.ToDouble(node.Attributes["Value"].Value);
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Differential.cs

@@ -21 +21 @@
 
 
+using HeuristicLab.GP.Interfaces;
 namespace HeuristicLab.GP.StructureIdentification {
   public sealed class Differential : Variable {
@@ -31 +32 @@
 
     public Differential() : base() { }
+
+    public override IFunctionTree GetTreeNode() {
+      return new VariableFunctionTree(this);
+    }
   }
 }

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Variable.cs

@@ -40 +40 @@
       }
     }
+
 
     public override IFunctionTree GetTreeNode() {

branches/GP-Refactoring-713/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/VariableFunctionTree.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.GP.Interfaces;
+using System.Xml;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -66 +67 @@
     }
 
-    public override IFunctionTree Clone() {
+    public override object Clone() {
       return new VariableFunctionTree(this);
+    }
+
+    public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<System.Guid, IStorable> persistedObjects) {
+      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlAttribute weightAttr = document.CreateAttribute("Weight");
+      weightAttr.Value = XmlConvert.ToString(Weight);
+      XmlAttribute variableAttr = document.CreateAttribute("Variable");
+      variableAttr.Value = VariableName;
+      XmlAttribute sampleOffsetAttr = document.CreateAttribute("SampleOffset");
+      sampleOffsetAttr.Value = XmlConvert.ToString(SampleOffset);
+      node.Attributes.Append(weightAttr);
+      node.Attributes.Append(sampleOffsetAttr);
+      node.Attributes.Append(variableAttr);
+      return node;
+    }
+
+    public override void Populate(XmlNode node, IDictionary<System.Guid, IStorable> restoredObjects) {
+      base.Populate(node, restoredObjects);
+      Weight = XmlConvert.ToDouble(node.Attributes["Weight"].Value);
+      SampleOffset = XmlConvert.ToInt32(node.Attributes["SampleOffset"].Value);
+      VariableName = node.Attributes["Variable"].Value;
     }