Changeset 3513 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

04/23/10 14:28:07 (14 years ago)

Author:

gkronber

Message:

Added upper and lower estimation limits. #938 (Data types and operators for regression problems)

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

Files:

• DataAnalysisSolution.cs (modified) (3 diffs)
• Symbolic/SimpleArithmeticExpressionInterpreter.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisSolution.cs

@@ -50 +50 @@
       }
     }
+    [Storable]
+    private double lowerEstimationLimit;
+    public double LowerEstimationLimit {
+      get { return lowerEstimationLimit; }
+      set {
+        if (lowerEstimationLimit != value) {
+          lowerEstimationLimit = value;
+          OnEstimatedValuesChanged(EventArgs.Empty);
+        }
+      }
+    }
+
+    [Storable]
+    private double upperEstimationLimit;
+    public double UpperEstimationLimit {
+      get { return upperEstimationLimit; }
+      set {
+        if (upperEstimationLimit != value) {
+          upperEstimationLimit = value;
+          OnEstimatedValuesChanged(EventArgs.Empty);
+        }
+      }
+    }
 
     public abstract IEnumerable<double> EstimatedValues { get; }
@@ -56 +79 @@
 
     protected DataAnalysisSolution() : base() { }
-    protected DataAnalysisSolution(DataAnalysisProblemData problemData)
+    protected DataAnalysisSolution(DataAnalysisProblemData problemData) : this(problemData, double.NegativeInfinity, double.PositiveInfinity) { }
+    protected DataAnalysisSolution(DataAnalysisProblemData problemData, double lowerEstimationLimit, double upperEstimationLimit)
       : this() {
       this.problemData = problemData;
+      this.lowerEstimationLimit = lowerEstimationLimit;
+      this.upperEstimationLimit = upperEstimationLimit;
       Initialize();
     }
@@ -74 +100 @@
       // don't clone the problem data!
       clone.problemData = problemData;
+      clone.lowerEstimationLimit = lowerEstimationLimit;
+      clone.upperEstimationLimit = upperEstimationLimit;
       clone.Initialize();
       return clone;

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

@@ -34 +34 @@
   [Item("SimpleArithmeticExpressionInterpreter", "Interpreter for arithmetic symbolic expression trees including function calls.")]
   // not thread safe!
-  public class SimpleArithmeticExpressionInterpreter : Item, ISymbolicExpressionTreeInterpreter {
+  public class SimpleArithmeticExpressionInterpreter : NamedItem, ISymbolicExpressionTreeInterpreter {
     private class OpCodes {
       public const byte Add = 1;
@@ -47 +47 @@
 
     private const int ARGUMENT_STACK_SIZE = 1024;
+
     private Dataset dataset;
     private int row;
     private Instruction[] code;
     private int pc;
+
+    public SimpleArithmeticExpressionInterpreter()
+      : base() {
+    }
 
     public IEnumerable<double> GetSymbolicExpressionTreeValues(SymbolicExpressionTree tree, Dataset dataset, IEnumerable<int> rows) {
@@ -61 +66 @@
         pc = 0;
         argStackPointer = 0;
-        var estimatedValue = Evaluate();
-        if (double.IsNaN(estimatedValue) || double.IsInfinity(estimatedValue)) yield return 0.0;
-        else yield return estimatedValue;
+        yield return Evaluate();
       }
     }