Changeset 17195

Timestamp:

08/09/19 09:02:36 (5 years ago)

Author:

gkronber

Message:

#2994: added early stopping and fixed a bug in ConstrainedConstantOptimizationEvaluator

File:

• branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/ConstrainedConstantOptimizationEvaluator.cs (modified) (2 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Extensions/ConstrainedConstantOptimizationEvaluator.cs

@@ -240 +240 @@
       var targetMean = target.Average();
       var pred = interpreter.GetSymbolicExpressionTreeValues(tree, problemData.Dataset, problemData.TrainingIndices).ToArray();
+      if (pred.Any(pi => double.IsInfinity(pi) || double.IsNaN(pi))) return targetVariance;
+
       var predStDev = pred.StandardDeviationPop();
+      if (predStDev == 0) return targetVariance; // constant expression
       var predMean = pred.Average();
 
@@ -441 +444 @@
 
       // evaluate tree with updated constants
-      var residualVariance = SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.Calculate(interpreter, scaledTree, lowerEstimationLimit, upperEstimationLimit, problemData, rows, applyLinearScaling: false);
+      var residualVariance = SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.Calculate(interpreter, tree, lowerEstimationLimit, upperEstimationLimit, problemData, rows, applyLinearScaling: true);
       return Math.Min(residualVariance, targetVariance);
     }