Changeset 3462 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs

Timestamp:

04/21/10 15:21:34 (14 years ago)

Author:

gkronber

Message:

Refactored symbolic expression tree encoding and problem classes for symbolic regression. #937 , #938

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs (modified) (11 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.GeneralSymbols;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Symbols;
 using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
 using System.Diagnostics;
@@ -38 +38 @@
   /// </summary>
   public class SymbolicSimplifier {
+    private Addition addSymbol = new Addition();
+    private Multiplication mulSymbol = new Multiplication();
+    private Division divSymbol = new Division();
+    private Constant constSymbol = new Constant();
+    private Variable varSymbol = new Variable();
+
     public SymbolicExpressionTree Simplify(SymbolicExpressionTree originalTree) {
       var clone = (SymbolicExpressionTreeNode)originalTree.Root.Clone();
@@ -194 +200 @@
         return a;
       } else {
-        var div = (new Division()).CreateTreeNode();
+        var div = divSymbol.CreateTreeNode();
         div.SubTrees.Add(a);
         div.SubTrees.Add(b);
@@ -215 +221 @@
       } else if (IsAddition(a) && IsAddition(b)) {
         // merge additions
-        var add = (new Addition()).CreateTreeNode();
+        var add = addSymbol.CreateTreeNode();
         for (int i = 0; i < a.SubTrees.Count - 1; i++) add.AddSubTree(a.SubTrees[i]);
         for (int i = 0; i < b.SubTrees.Count - 1; i++) add.AddSubTree(b.SubTrees[i]);
@@ -232 +238 @@
         return MakeAddition(b, a);
       } else if (IsAddition(a) && IsConstant(b)) {
-        var add = (new Addition()).CreateTreeNode();
+        var add = addSymbol.CreateTreeNode();
         for (int i = 0; i < a.SubTrees.Count - 1; i++) add.AddSubTree(a.SubTrees[i]);
         if (IsConstant(a.SubTrees.Last()))
@@ -242 +248 @@
         return add;
       } else if (IsAddition(a)) {
-        var add = (new Addition()).CreateTreeNode();
+        var add = addSymbol.CreateTreeNode();
         add.AddSubTree(b);
         foreach (var subTree in a.SubTrees) {
@@ -250 +256 @@
         return add;
       } else {
-        var add = (new Addition()).CreateTreeNode();
+        var add = addSymbol.CreateTreeNode();
         add.SubTrees.Add(a);
         add.SubTrees.Add(b);
@@ -296 +302 @@
         return MakeDivision(MakeMultiplication(b.SubTrees[0], a), b.SubTrees[1]);
       } else if (IsMultiplication(a) && IsMultiplication(b)) {
-        var mul = (new Multiplication()).CreateTreeNode();
+        var mul = mulSymbol.CreateTreeNode();
         for (int i = 0; i < a.SubTrees.Count - 1; i++) mul.AddSubTree(a.SubTrees[i]);
         for (int i = 0; i < b.SubTrees.Count - 1; i++) mul.AddSubTree(b.SubTrees[i]);
@@ -302 +308 @@
         return mul;
       } else if (IsMultiplication(a)) {
-        var mul = (new Multiplication()).CreateTreeNode();
+        var mul = mulSymbol.CreateTreeNode();
         for (int i = 0; i < a.SubTrees.Count - 1; i++) mul.AddSubTree(a.SubTrees[i]);
         mul.AddSubTree(MakeMultiplication(a.SubTrees.Last(), b));
         return mul;
       } else if (IsMultiplication(b)) {
-        var mul = (new Multiplication()).CreateTreeNode();
+        var mul = mulSymbol.CreateTreeNode();
         for (int i = 0; i < b.SubTrees.Count - 1; i++) mul.AddSubTree(b.SubTrees[i]);
         mul.AddSubTree(MakeMultiplication(b.SubTrees.Last(), a));
         return mul;
       } else {
-        var mul = (new Multiplication()).CreateTreeNode();
+        var mul = mulSymbol.CreateTreeNode();
         mul.SubTrees.Add(a);
         mul.SubTrees.Add(b);
@@ -346 +352 @@
 
     private SymbolicExpressionTreeNode MakeConstant(double value) {
-      ConstantTreeNode constantTreeNode = (ConstantTreeNode)(new Constant().CreateTreeNode());
+      ConstantTreeNode constantTreeNode = (ConstantTreeNode)(constSymbol.CreateTreeNode());
       constantTreeNode.Value = value;
       return (SymbolicExpressionTreeNode)constantTreeNode;
@@ -352 +358 @@
 
     private SymbolicExpressionTreeNode MakeVariable(double weight, string name) {
-      var tree = (VariableTreeNode)(new Variable().CreateTreeNode());
+      var tree = (VariableTreeNode)varSymbol.CreateTreeNode();
       tree.Weight = weight;
       tree.VariableName = name;