Changeset 367 for trunk/sources/HeuristicLab.StructureIdentification/Evaluation/VarianceAccountedForEvaluator.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/VarianceAccountedForEvaluator.cs (modified) (2 diffs)

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

@@ -54 +54 @@
 
     public override double Evaluate(IScope scope, IFunctionTree functionTree, int targetVariable, Dataset dataset) {
-      double[] errors = new double[dataset.Rows];
-      double[] originalTargetVariableValues = new double[dataset.Rows];
-      double targetMean = dataset.GetMean(targetVariable);
+      int trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;
+      int trainingEnd = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
+      double[] errors = new double[trainingEnd-trainingStart];
+      double[] originalTargetVariableValues = new double[trainingEnd-trainingStart];
+      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);
@@ -70 +72 @@
         }
 
-        errors[sample] = original - estimated;
-        originalTargetVariableValues[sample] = original;
+        errors[sample-trainingStart] = original - estimated;
+        originalTargetVariableValues[sample-trainingStart] = original;
       }