Changeset 3219 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/SymbolicExpressionTree.cs

Timestamp:

03/25/10 19:19:37 (14 years ago)

Author:

gkronber

Message:

Worked on SymbolicTreeEncoding plugin. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3

Files:

• . (modified) (1 prop)
• SymbolicExpressionTree.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTree/3.3/FunctionTree.cs) (6 diffs)

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

@@ -24 +24 @@
 using System.Text;
 using HeuristicLab.Core;
-using HeuristicLab.GP.Interfaces;
 using System.Xml;
 
-namespace HeuristicLab.GP {
-  public class FunctionTree : IFunctionTree {
-    private List<IFunctionTree> subTrees;
+namespace HeuristicLab.Encodings.SymbolicExpressionTree {
+  public class SymbolicExpressionTree  {
+    private List<SymbolicExpressionTree> subTrees;
     private IFunction function;
 
-    public FunctionTree() {
+    public SymbolicExpressionTree() {
     }
 
-    public FunctionTree(IFunction function) {
-      subTrees = new List<IFunctionTree>();
+    public SymbolicExpressionTree(Symbol symbol) {
+      subTrees = new List<SymbolicExpressionTree>();
       this.function = function;
     }
 
-    protected FunctionTree(FunctionTree original) {
+    protected SymbolicExpressionTree(SymbolicExpressionTree original) {
       this.function = original.Function;
-      this.subTrees = new List<IFunctionTree>(original.SubTrees.Count);
-      foreach (IFunctionTree originalSubTree in original.SubTrees) {
-        this.SubTrees.Add((IFunctionTree)originalSubTree.Clone());
+      this.subTrees = new List<SymbolicExpressionTree>(original.SubTrees.Count);
+      foreach (SymbolicExpressionTree originalSubTree in original.SubTrees) {
+        this.SubTrees.Add((SymbolicExpressionTree)originalSubTree.Clone());
       }
     }
 
-    #region IFunctionTree Members
     public virtual bool HasLocalParameters {
       get { return false; }
     }
 
-    public virtual IList<IFunctionTree> SubTrees {
+    public virtual IList<SymbolicExpressionTree> SubTrees {
       get { return subTrees; }
     }
 
-    public IFunction Function {
+    public Symbol Function {
       get { return function; }
       protected set { function = value; }
@@ -64 +62 @@
     public int GetSize() {
       int size = 1;
-      foreach (IFunctionTree tree in SubTrees) size += tree.GetSize();
+      foreach (SymbolicExpressionTree tree in SubTrees) size += tree.GetSize();
       return size;
     }
@@ -70 +68 @@
     public int GetHeight() {
       int maxHeight = 0;
-      foreach (IFunctionTree tree in SubTrees) maxHeight = Math.Max(maxHeight, tree.GetHeight());
+      foreach (SymbolicExpressionTree tree in SubTrees) maxHeight = Math.Max(maxHeight, tree.GetHeight());
       return maxHeight + 1;
     }
@@ -82 +80 @@
     }
 
-    public void AddSubTree(IFunctionTree tree) {
+    public void AddSubTree(SymbolicExpressionTree tree) {
       SubTrees.Add(tree);
     }
 
-    public virtual void InsertSubTree(int index, IFunctionTree tree) {
+    public virtual void InsertSubTree(int index, SymbolicExpressionTree tree) {
       SubTrees.Insert(index, tree);
     }
@@ -98 +96 @@
     }
 
-    #endregion
 
     #region IStorable Members
@@ -107 +104 @@
 
     public virtual object Clone() {
-      return new FunctionTree(this);
+      return new SymbolicExpressionTree(this);
     }