Changeset 5177 for branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SingleObjectiveSymbolicRegressionEvaluator.cs

Timestamp:

12/26/10 03:51:30 (14 years ago)

Author:

swagner

Message:

Removed property ExecutionContext in Operator (#1333)

File:

• branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SingleObjectiveSymbolicRegressionEvaluator.cs (modified) (2 diffs)

branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SingleObjectiveSymbolicRegressionEvaluator.cs

@@ -144 +144 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation Apply(IExecutionContext context) {
       int seed = Random.Next();
       IEnumerable<int> rows = GenerateRowsToEvaluate(seed, RelativeNumberOfEvaluatedSamples.Value, SamplesStart.Value, SamplesEnd.Value)
           .Where(i => i < RegressionProblemData.TestSamplesStart.Value || RegressionProblemData.TestSamplesEnd.Value <= i);
-      double quality = Evaluate(SymbolicExpressionTreeInterpreter, SymbolicExpressionTree, LowerEstimationLimit.Value, UpperEstimationLimit.Value,
+      double quality = Evaluate(context, SymbolicExpressionTreeInterpreter, SymbolicExpressionTree, LowerEstimationLimit.Value, UpperEstimationLimit.Value,
         RegressionProblemData.Dataset,
         RegressionProblemData.TargetVariable.Value, rows);
       QualityParameter.ActualValue = new DoubleValue(quality);
-      return base.Apply();
+      return base.Apply(context);
     }
 
@@ -163 +163 @@
     }
 
-    public abstract double Evaluate(ISymbolicExpressionTreeInterpreter interpreter,
+    public abstract double Evaluate(IExecutionContext context,
+      ISymbolicExpressionTreeInterpreter interpreter,
       SymbolicExpressionTree solution, double lowerEstimationLimit, double upperEstimationLimit,
       Dataset dataset,