Changeset 702 for trunk/sources/HeuristicLab.GP.StructureIdentification/Evaluators/MeanSquaredErrorEvaluator.cs

Timestamp:

10/29/08 11:21:04 (16 years ago)

Author:

gkronber

Message:

fixed #328 by restructuring evaluation operators to remove state in evaluation operators.

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/Evaluators/MeanSquaredErrorEvaluator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/Evaluators/MeanSquaredErrorEvaluator.cs

@@ -27 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.DataAnalysis;
 
 namespace HeuristicLab.GP.StructureIdentification {
   public class MeanSquaredErrorEvaluator : GPEvaluatorBase {
-    protected DoubleData mse;
     public override string Description {
       get {
@@ -43 +43 @@
     }
 
-    public override IOperation Apply(IScope scope) {
-      mse = GetVariableValue<DoubleData>("MSE", scope, false, false);
-      if(mse == null) {
-        mse = new DoubleData();
-        scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("MSE"), mse));
-      }
-
-      return base.Apply(scope);
-    }
-
-    public override void Evaluate(int start, int end) {
+    public override void Evaluate(IScope scope, BakedTreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
       double errorsSquaredSum = 0;
       for(int sample = start; sample < end; sample++) {
-        double original = GetOriginalValue(sample);
-        double estimated = GetEstimatedValue(sample);
-        SetOriginalValue(sample, estimated);
+        double original = dataset.GetValue(targetVariable, sample);
+        double estimated = evaluator.Evaluate(sample);
+        if(updateTargetValues) {
+          dataset.SetValue(targetVariable, sample, estimated);
+        }
         if(!double.IsNaN(original) && !double.IsInfinity(original)) {
           double error = estimated - original;
@@ -69 +61 @@
         errorsSquaredSum = double.MaxValue;
       }
+
+      DoubleData mse = GetVariableValue<DoubleData>("MSE", scope, false, false);
+      if(mse == null) {
+        mse = new DoubleData();
+        scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("MSE"), mse));
+      }
+
       mse.Data = errorsSquaredSum;
     }