Changeset 14585 for branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs

Timestamp:

01/18/17 16:59:47 (7 years ago)

Author:

bburlacu

Message:

#2635: Limit estimated values to range by default.

File:

• branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs (modified) (2 diffs)

branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs

@@ -212 +212 @@
 
     private double Calculate(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, DoubleLimit estimationLimits, IRegressionProblemData problemData, IEnumerable<int> rows) {
-      var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
+      var lowerEstimationLimit = EstimationLimitsParameter.ActualValue.Lower;
+      var upperEstimationLimit = EstimationLimitsParameter.ActualValue.Upper;
+      var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows).LimitToRange(lowerEstimationLimit, upperEstimationLimit);
       var targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows).ToList();
       var parentQualities = ParentQualitiesParameter.ActualValue.Select(x => x.Value);
@@ -234 +236 @@
             threshold = parentQuality * (1 - actualSelectionPressure.Value / 100.0);
         }
+
         var estimatedEnumerator = estimatedValues.GetEnumerator();
         var targetEnumerator = targetValues.GetEnumerator();