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

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/HeuristicLab.GP/3.3/BaseClasses

Files:

• FunctionBase.cs (modified) (1 diff)
• FunctionTreeBase.cs (modified) (1 diff)

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