Changeset 3258 for trunk

Timestamp:

04/02/10 16:50:07 (14 years ago)

Author:

gkronber

Message:

Moved general set of symbols and evaluator into Encodings.SymbolicExpressionTreeEncoding. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Symbols

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols)
• Addition.cs (deleted)
• Constant.cs (modified) (1 diff)
• ConstantTreeNode.cs (modified) (2 diffs)
• Division.cs (deleted)
• Multiplication.cs (deleted)
• Subtraction.cs (deleted)
• Variable.cs (modified) (1 diff)
• VariableTreeNode.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Symbols/Constant.cs

@@ -21 +21 @@
 
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
   public sealed class Constant : Symbol {
     public override SymbolicExpressionTreeNode CreateTreeNode() {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Symbols/ConstantTreeNode.cs

@@ -24 +24 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
   [StorableClass]
-  public sealed class ConstantTreeNode : SymbolicExpressionTreeNode {
-    private static List<SymbolicExpressionTreeNode> emptySubTrees = new List<SymbolicExpressionTreeNode>();
+  public sealed class ConstantTreeNode : SymbolicExpressionTreeTerminalNode {
     public override bool HasLocalParameters {
       get {
@@ -52 +51 @@
       return new ConstantTreeNode(this);
     }
-
-    protected override void AddSubTree(SymbolicExpressionTreeNode tree) {
-      throw new NotSupportedException();
-    }
-    protected override void InsertSubTree(int index, SymbolicExpressionTreeNode tree) {
-      throw new NotSupportedException();
-    }
-    protected override void RemoveSubTree(int index) {
-      throw new NotSupportedException();
-    }
-    public override System.Collections.Generic.IList<SymbolicExpressionTreeNode> SubTrees {
-      get {
-        return emptySubTrees;
-      }
-    }
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Symbols/Variable.cs

@@ -21 +21 @@
 
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
   public sealed class Variable : Symbol {
     public override SymbolicExpressionTreeNode CreateTreeNode() {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Symbols/VariableTreeNode.cs

@@ -24 +24 @@
 using System.Collections.Generic;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols {
+namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Symbols {
   [StorableClass]
-  public sealed class VariableTreeNode : SymbolicExpressionTreeNode {
-    private static List<SymbolicExpressionTreeNode> emptySubTrees = new List<SymbolicExpressionTreeNode>();
-    public override bool HasLocalParameters {
-      get {
-        return true;
-      }
-    }
-
+  public sealed class VariableTreeNode : SymbolicExpressionTreeTerminalNode {
+    
     private double weight;
     [Storable]
@@ -59 +53 @@
       return new VariableTreeNode(this);
     }
-
-    protected override void AddSubTree(SymbolicExpressionTreeNode tree) {
-      throw new NotSupportedException();
-    }
-    protected override void InsertSubTree(int index, SymbolicExpressionTreeNode tree) {
-      throw new NotSupportedException();
-    }
-    protected override void RemoveSubTree(int index) {
-      throw new NotSupportedException();
-    }
-    public override System.Collections.Generic.IList<SymbolicExpressionTreeNode> SubTrees {
-      get {
-        return emptySubTrees;
-      }
-    }
   }
 }