Changeset 1796 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/CoefficientOfDeterminationEvaluator.cs

Timestamp:

05/14/09 13:46:57 (15 years ago)

Author:

gkronber

Message:

Refactored GP evaluation to make it possible to use different evaluators to interpret function trees. #615 (Evaluation of HL3 function trees should be equivalent to evaluation in HL2)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/CoefficientOfDeterminationEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/CoefficientOfDeterminationEvaluator.cs

@@ -42 +42 @@
     }
 
-    public override void Evaluate(IScope scope, BakedTreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, IFunctionTree tree, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
       double errorsSquaredSum = 0.0;
       double originalDeviationTotalSumOfSquares = 0.0;
       double targetMean = dataset.GetMean(targetVariable, start, end);
+
+      double originalSum = 0.0;
+      int n = 0;
       for (int sample = start; sample < end; sample++) {
-        double estimated = evaluator.Evaluate(sample);
+        double estimated = evaluator.Evaluate(tree, sample);
         double original = dataset.GetValue(sample, targetVariable);
         if (updateTargetValues) {
@@ -56 +59 @@
           errorsSquaredSum += error * error;
 
-          double origDeviation = original - targetMean;
-          originalDeviationTotalSumOfSquares += origDeviation * origDeviation;
+          originalSum += original;
+          n++;
+        }
+      }
+
+      double originalMean = originalSum / n;
+      for(int sample = start; sample < end; sample++){
+        double original = dataset.GetValue(sample, targetVariable);
+        if (!double.IsNaN(original) && !double.IsInfinity(original)) {
+          original = original - originalMean;
+          original = original * original;
+          originalDeviationTotalSumOfSquares += original;
         }
       }