Changeset 3442 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic

Timestamp:

04/20/10 15:49:22 (14 years ago)

Author:

gkronber

Message:

Implemented views for DataAnalysisProblems and DataAnalysisSolutions. #938 (Data types and operators for regression problems)

Location:

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

Files:

• ArithmeticExpressionGrammar.cs (modified) (2 diffs)
• SimpleArithmeticExpressionEvaluator.cs (modified) (4 diffs)
• SymbolicSimplifier.cs (added)
• Symbols/ConstantTreeNode.cs (modified) (3 diffs)
• Symbols/Variable.cs (modified) (1 diff)
• Symbols/VariableTreeNode.cs (modified) (2 diffs)

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

@@ -35 +35 @@
   public class ArithmeticExpressionGrammar : DefaultSymbolicExpressionGrammar {
     [Storable]
-    private List<string> variableNames = new List<string>();
-    public IEnumerable<string> VariableNames {
-      get { return variableNames; }
-      set {
-        variableNames = new List<string>(value);
-        variableSymbol.VariableNames = variableNames;
-      }
-    }
-
-    [Storable]
     private HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable variableSymbol;
 
@@ -58 +48 @@
       var div = new Division();
       var constant = new Constant();
+      constant.MinValue = -20;
+      constant.MaxValue = 20;
       variableSymbol = new HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols.Variable();
 

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

@@ -44 +44 @@
         this.row = row;
         pc = 0;
-        arguments.Clear();
+        argumentStack.Clear();
         var estimatedValue = Evaluate();
         if (double.IsNaN(estimatedValue) || double.IsInfinity(estimatedValue)) yield return 0.0;
@@ -51 +51 @@
     }
 
-    private List<double> arguments = new List<double>();
+    private Stack<List<double>> argumentStack = new Stack<List<double>>();
     public double Evaluate() {
       var currentInstr = code[pc++];
@@ -85 +85 @@
         case CodeSymbol.Call: {
             // save current arguments
-            var oldArgs = new List<double>(arguments);
-            arguments.Clear();
+            List<double> arguments = new List<double>();
             // evaluate sub-trees
             for (int i = 0; i < currentInstr.nArguments; i++) {
               arguments.Add(Evaluate());
             }
+            argumentStack.Push(arguments);
             // save the pc
             int nextPc = pc;
@@ -97 +97 @@
             // evaluate the function
             double v = Evaluate();
+            argumentStack.Pop();
             // restore the pc => evaluation will continue at point after my subtrees  
             pc = nextPc;
-            // restore arguments
-            arguments = oldArgs;
             return v;
           }
         case CodeSymbol.Arg: {
-            return arguments[currentInstr.iArg0];
+            return argumentStack.Peek()[currentInstr.iArg0];
           }
         case CodeSymbol.Dynamic: {

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

@@ -34 +34 @@
       get { return (Constant)base.Symbol; }
     }
-    public override bool HasLocalParameters {
-      get {
-        return true;
-      }
-    }
 
     private double constantValue;
@@ -54 +49 @@
     public ConstantTreeNode(Constant constantSymbol) : base(constantSymbol) { }
 
+    public override bool HasLocalParameters {
+      get {
+        return true;
+      }
+    }
     public override void ResetLocalParameters(IRandom random) {
       base.ResetLocalParameters(random);
@@ -63 +63 @@
       return new ConstantTreeNode(this);
     }
+
+    public override string ToString() {
+      return constantValue.ToString("E5");
+    }
   }
 }

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

@@ -52 +52 @@
     private List<string> variableNames;
     [Storable]
-    public ICollection<string> VariableNames {
+    public IEnumerable<string> VariableNames {
       get { return variableNames; }
       set {

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

@@ -56 +56 @@
     public VariableTreeNode(Variable variableSymbol) : base(variableSymbol) { }
 
+    public override bool HasLocalParameters {
+      get {
+        return true;
+      }
+    }
+
     public override void ResetLocalParameters(IRandom random) {
       base.ResetLocalParameters(random);
@@ -68 +74 @@
       return new VariableTreeNode(this);
     }
+
+    public override string ToString() {
+      return weight.ToString("E5") + " * " + variableName;
+    }
   }
 }