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

Timestamp:

08/01/09 13:36:13 (15 years ago)

Author:

gkronber

Message:

fixed serialization of function trees and GPModels. (#713)

File:

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

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

@@ -59 +59 @@
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects) {
       XmlNode node = base.GetXmlNode(name, document, persistedObjects);
-      node.AppendChild(PersistenceManager.Persist("Function", FunctionTree.Function, document, persistedObjects));
-      node.AppendChild(FunctionTree.GetXmlNode("FunctionTree", document, persistedObjects));
+      PersistTree(node, document, persistedObjects, FunctionTree);
       return node;
+    }
+
+    private void PersistTree(XmlNode node, XmlDocument document, IDictionary<Guid, IStorable> persistedObjects, IFunctionTree tree) {
+      XmlNode fNode = PersistenceManager.Persist(tree.Function, document, persistedObjects);
+      XmlAttribute subTreesAttr = document.CreateAttribute("Args");
+      subTreesAttr.Value = XmlConvert.ToString(tree.SubTrees.Count);
+      fNode.Attributes.Append(subTreesAttr);
+      node.AppendChild(fNode);
+      XmlNode treeNode = tree.GetXmlNode("Data", document, persistedObjects);
+      if (treeNode != null) fNode.AppendChild(treeNode);
+      foreach (IFunctionTree subTree in tree.SubTrees) {
+        PersistTree(node, document, persistedObjects, subTree);
+      }
     }
 
     public override void Populate(XmlNode node, IDictionary<Guid, IStorable> restoredObjects) {
       base.Populate(node, restoredObjects);
-      IFunction rootFunction = (IFunction)PersistenceManager.Restore(node.SelectSingleNode("Function"), restoredObjects);
-      IFunctionTree rootNode = rootFunction.GetTreeNode();
-      rootNode.Populate(node.SelectSingleNode("FunctionTree"), restoredObjects);
+      int nodeIndex = 0;
+      FunctionTree = RestoreTree(node, ref nodeIndex, restoredObjects);
+    }
+
+    private IFunctionTree RestoreTree(XmlNode node, ref int nodeIndex, IDictionary<Guid, IStorable> restoredObjects) {
+      XmlNode fNode = node.ChildNodes[nodeIndex];
+      int subTrees = XmlConvert.ToInt32(fNode.Attributes["Args"].Value);
+      IFunction f = (IFunction)PersistenceManager.Restore(fNode, restoredObjects);
+      IFunctionTree tree = f.GetTreeNode();
+      if(fNode.ChildNodes.Count>0) tree.Populate(fNode.ChildNodes[0], restoredObjects);
+      nodeIndex++;
+      for (int i = 0; i < subTrees; i++) {
+        tree.AddSubTree(RestoreTree(node, ref nodeIndex, restoredObjects));
+      }
+      return tree;
     }