Changeset 3252

Timestamp:

04/01/10 20:59:17 (14 years ago)

Author:

gkronber

Message:

Fixed issues with persistence. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• SymbolicExpressionTree.cs (modified) (1 diff)
• SymbolicExpressionTreeNode.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -32 +32 @@
   [StorableClass]
   [Item("SymbolicExpressionTree", "Represents a symbolic expression tree.")]
-  public class SymbolicExpressionTree : Item {
+  public class SymbolicExpressionTree : Item {    
+    [Storable]
     private SymbolicExpressionTreeNode root;
     public SymbolicExpressionTreeNode Root {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs

@@ -30 +30 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   [StorableClass]
-  public class SymbolicExpressionTreeNode : DeepCloneable {
+  public class SymbolicExpressionTreeNode : ICloneable {
+    [Storable]
     private List<SymbolicExpressionTreeNode> subTrees;
+    [Storable]
     private Symbol symbol;
 
-    public SymbolicExpressionTreeNode() {
-    }
+    public SymbolicExpressionTreeNode() { }
 
     public SymbolicExpressionTreeNode(Symbol symbol) {
@@ -42 +43 @@
     }
 
-    //protected SymbolicExpressionTreeNode(SymbolicExpressionTreeNode original) {
-    //  this.symbol = original.Symbol;
-    //  this.subTrees = new List<SymbolicExpressionTreeNode>(original.SubTrees.Count);
-    //  foreach (SymbolicExpressionTreeNode originalSubTree in original.SubTrees) {
-    //    this.SubTrees.Add((SymbolicExpressionTreeNode)originalSubTree.Clone());
-    //  }
-    //}
+    // copy constructor
+    protected SymbolicExpressionTreeNode(SymbolicExpressionTreeNode original) {
+      symbol = original.symbol;
+      this.subTrees = new List<SymbolicExpressionTreeNode>();
+      foreach (var subtree in original.SubTrees) {
+        AddSubTree((SymbolicExpressionTreeNode)subtree.Clone());
+      }
+    }
 
     public virtual bool HasLocalParameters {
@@ -95 +97 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      SymbolicExpressionTreeNode clone = new SymbolicExpressionTreeNode(symbol);
-      cloner.RegisterClonedObject(this, clone);
-      foreach (var subtree in SubTrees) {
-        clone.AddSubTree((SymbolicExpressionTreeNode)subtree.Clone(cloner));
-      }
-      return clone;
+    #region ICloneable Members
+
+    public virtual object Clone() {
+      return new SymbolicExpressionTreeNode(this);
     }
+
+    #endregion
   }
 }