Changeset 481 for trunk/sources

Timestamp:

08/10/08 11:57:49 (16 years ago)

Author:

gkronber

Message:

fixed another small bug (#242 All GP evaluators should support the 'UseEstimatedTargetValues' switch for autoregressive modelling)

File:

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

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

@@ -69 +69 @@
       treeSize = scope.GetVariableValue<IntData>("TreeSize", false).Data;
       totalEvaluatedNodes = scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data;
-      trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;
-      trainingEnd = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
+      int trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;
+      int trainingEnd = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
       useEstimatedValues = GetVariableValue<BoolData>("UseEstimatedTargetValue", scope, true).Data;
       // prepare for autoregressive modelling by saving the original values of the target-variable to a backup array
-      if(useEstimatedValues && backupValues == null) {
+      if(useEstimatedValues && 
+        (backupValues == null || trainingStart!=this.trainingStart || trainingEnd!=this.trainingEnd)) {
+        this.trainingStart = trainingStart;
+        this.trainingEnd = trainingEnd;
         backupValues = new double[trainingEnd - trainingStart];
         for(int i = trainingStart; i < trainingEnd; i++) {