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

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/3.3

Files:

• BaseClasses/FunctionTreeBase.cs (modified) (3 diffs)
• GeneticProgrammingModel.cs (modified) (3 diffs)
• HeuristicLab.GP-3.3.csproj (modified) (1 diff)

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/BaseClasses/FunctionTreeBase.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.GP.Interfaces;
+using System.Xml;
 
 namespace HeuristicLab.GP {
@@ -43 +44 @@
       this.subTrees = new List<IFunctionTree>(original.SubTrees.Count);
       foreach (IFunctionTree originalSubTree in original.SubTrees) {
-        this.SubTrees.Add(originalSubTree.Clone());
+        this.SubTrees.Add((IFunctionTree)originalSubTree.Clone());
       }
     }
@@ -93 +94 @@
     }
 
-    public virtual IFunctionTree Clone() {
+    #endregion
+
+    #region IStorable Members
+
+    public Guid Guid {
+      get { throw new NotSupportedException(); }
+    }
+
+    public virtual object Clone() {
       return new FunctionTreeBase(this);
+    }
+
+    public object Clone(IDictionary<Guid, object> clonedObjects) {
+      throw new NotImplementedException();
+    }
+
+    public virtual XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
+      XmlNode node = document.CreateElement(name);
+      //XmlAttribute typeAttr = document.CreateAttribute("Type");
+      //typeAttr.Value = PersistenceManager.BuildTypeString(GetType());
+      //node.Attributes.Append(typeAttr);
+      foreach (IFunctionTree subTree in SubTrees) {
+        XmlNode funNode = PersistenceManager.Persist(Function, document, persistedObjects);
+        node.AppendChild(funNode);
+        funNode.AppendChild(subTree.GetXmlNode("Tree", document, persistedObjects));
+      }
+      return node;
+    }
+
+    public virtual void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
+      for (int i = 0; i < node.ChildNodes.Count; i++) {
+        XmlNode childNode = node.ChildNodes[i];
+        IFunction function = (IFunction)PersistenceManager.Restore(childNode, restoredObjects);
+        IFunctionTree tree = function.GetTreeNode();
+        tree.Populate(childNode.SelectSingleNode("Tree"), restoredObjects);
+        AddSubTree(tree);
+      }
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/GeneticProgrammingModel.cs

@@ -53 +53 @@
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
       GeneticProgrammingModel clone = (GeneticProgrammingModel)base.Clone(clonedObjects);
-      clone.FunctionTree = FunctionTree.Clone();
+      clone.FunctionTree = (IFunctionTree)FunctionTree.Clone();
       return clone;
     }
@@ -59 +59 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      node.Value = GeneralTreeSerializer.Export(FunctionTree);
+      node.AppendChild(PersistenceManager.Persist("Function", FunctionTree.Function, document, persistedObjects));
+      node.AppendChild(FunctionTree.GetXmlNode("FunctionTree", document, persistedObjects));
       return node;
     }
@@ -65 +66 @@
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      FunctionTree = GeneralTreeSerializer.Import(node.Value);
+      IFunction rootFunction = (IFunction)PersistenceManager.Restore(node.SelectSingleNode("Function"), restoredObjects);
+      IFunctionTree rootNode = rootFunction.GetTreeNode();
+      rootNode.Populate(node.SelectSingleNode("FunctionTree"), restoredObjects);
     }
 

branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/HeuristicLab.GP-3.3.csproj

@@ -89 +89 @@
     <Compile Include="BaseClasses\Terminal.cs" />
     <Compile Include="BaseClasses\UnaryFunction.cs" />
-    <Compile Include="FunctionTreeSerializer.cs" />
     <Compile Include="FunctionLibrary.cs" />
     <Compile Include="FunctionLibraryEditor.cs">