Changeset 367 for trunk/sources/HeuristicLab.StructureIdentification/Evaluation/CoefficientOfDeterminationEvaluator.cs

Timestamp:

07/07/08 16:59:35 (16 years ago)

Author:

gkronber

Message:

fixed small bugs in GP evaluators

File:

• trunk/sources/HeuristicLab.StructureIdentification/Evaluation/CoefficientOfDeterminationEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/CoefficientOfDeterminationEvaluator.cs

@@ -44 +44 @@
 
     public override double Evaluate(IScope scope, IFunctionTree functionTree, int targetVariable, Dataset dataset) {
+      int trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;
+      int trainingEnd = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
       double errorsSquaredSum = 0.0;
       double originalDeviationTotalSumOfSquares = 0.0;
-      double targetMean = dataset.GetMean(targetVariable);
+      double targetMean = dataset.GetMean(targetVariable, trainingStart, trainingEnd);
       functionTree.PrepareEvaluation(dataset);
-      for(int sample = 0; sample < dataset.Rows; sample++) {
+      for(int sample = trainingStart; sample < trainingEnd; sample++) {
         double estimated = functionTree.Evaluate(sample);
         double original = dataset.GetValue(sample, targetVariable);