Changeset 1786 for trunk/sources/HeuristicLab.GP.StructureIdentification

Timestamp:

05/13/09 15:38:26 (16 years ago)

Author:

gkronber

Message:

fixed calculation of range of a variable (to ignore NaNs) and fixed calculation of maxPunishment in the BakedTreeEvaluator. #615 (Evaluation of HL3 function trees should be equivalent to evaluation in HL2)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BakedTreeEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BakedTreeEvaluator.cs ¶

@@ -56 +56 @@
     public void ResetEvaluator(BakedFunctionTree functionTree, Dataset dataset, int targetVariable, int start, int end, double punishmentFactor) {
       this.dataset = dataset;
-      double maximumPunishment = punishmentFactor * dataset.GetRange(targetVariable);
+      double maximumPunishment = punishmentFactor * dataset.GetRange(targetVariable, start, end);
 
       // get the mean of the values of the target variable to determine the max and min bounds of the estimated value
-      double targetMean = dataset.GetMean(targetVariable, start, end - 1);
+      double targetMean = dataset.GetMean(targetVariable, start, end);
       estimatedValueMin = targetMean - maximumPunishment;
       estimatedValueMax = targetMean + maximumPunishment;