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

Timestamp:

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

Author:

gkronber

Message:

Worked on persistence of function trees. #713

File:

• branches/GP-Refactoring-713/sources/HeuristicLab.GP/3.3/GeneticProgrammingModel.cs (modified) (3 diffs)

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);
     }