Changeset 2219 for branches/GP-Refactoring-713/sources

Timestamp:

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

Author:

gkronber

Message:

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

Location:

branches/GP-Refactoring-713/sources

Files:

• HeuristicLab.GP.Boolean/3.3/Symbols/VariableFunctionTree.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/ConstantFunctionTree.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/Symbols/VariableFunctionTree.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/BaseClasses/FunctionBase.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/BaseClasses/FunctionTreeBase.cs (modified) (1 diff)
• HeuristicLab.GP/3.3/GeneticProgrammingModel.cs (modified) (1 diff)

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

@@ -64 +64 @@
 
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<System.Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlNode node = document.CreateElement(name);
       XmlAttribute varAttr = document.CreateAttribute("Variable");
       varAttr.Value = VariableName;

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

@@ -62 +62 @@
 
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<System.Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlNode node = document.CreateElement(name);
       XmlAttribute valueAttr = document.CreateAttribute("Value");
       valueAttr.Value = XmlConvert.ToString(Value);

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

@@ -72 +72 @@
 
     public override XmlNode GetXmlNode(string name, XmlDocument document, IDictionary<System.Guid, IStorable> persistedObjects) {
-      XmlNode node = base.GetXmlNode(name, document, persistedObjects);
+      XmlNode node = document.CreateElement(name);
       XmlAttribute weightAttr = document.CreateAttribute("Weight");
       weightAttr.Value = XmlConvert.ToString(Weight);

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

@@ -156 +156 @@
 
     public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      throw new NotSupportedException();
+      FunctionBase clone = (FunctionBase)base.Clone(clonedObjects);
+      clone.initializer = (IOperator)Auxiliary.Clone(initializer, clonedObjects);
+      clone.manipulator = (IOperator)Auxiliary.Clone(manipulator, clonedObjects);
+      clone.maxArity = maxArity;
+      clone.minArity = minArity;
+      clone.minTreeHeight = minTreeHeight;
+      clone.minTreeSize = minTreeSize;
+      clone.tickets = tickets;
+      for (int i = 0; i < MaxSubTrees; i++) {
+        var allowedSubFunctionsForSlot = new List<IFunction>();
+        foreach (IFunction f in GetAllowedSubFunctions(i)) {
+          allowedSubFunctionsForSlot.Add((IFunction)Auxiliary.Clone(f, clonedObjects));
+        }
+        clone.allowedSubFunctions.Add(allowedSubFunctionsForSlot);
+      }
+      return clone;
     }
 

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

@@ -111 +111 @@
 
     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;
+      return null;
     }
 
     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

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