Changeset 2357 for trunk/sources/HeuristicLab.Modeling/3.2/SimpleR2Evaluator.cs

Timestamp:

09/15/09 14:07:34 (15 years ago)

Author:

gkronber

Message:

Fixed #740 (SimpleEvaluators in HL.GP.StructId and HL.SVM are not compatible with evaluators in HL.Modeling).

File:

• trunk/sources/HeuristicLab.Modeling/3.2/SimpleR2Evaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Modeling/3.2/SimpleR2Evaluator.cs

@@ -30 +30 @@
       double cnt = 0;
       for (int i = 0; i < values.GetLength(0); i++) {
-        double estimated = values[i, 0];
-        double target = values[i, 1];
+        double estimated = values[i, ESTIMATION_INDEX];
+        double target = values[i, ORIGINAL_INDEX];
         if (!double.IsNaN(estimated) && !double.IsInfinity(estimated) &&
             !double.IsNaN(target) && !double.IsInfinity(target)) {
@@ -46 +46 @@
         double targetDeviationTotalSumOfSquares = 0;
         for (int i = 0; i < values.GetLength(0); i++) {
-          double target = values[i, 1];
+          double target = values[i, ORIGINAL_INDEX];
           if (!double.IsNaN(target) && !double.IsInfinity(target)) {
             target = target - targetMean;