Changeset 16514

Timestamp:

01/07/19 18:16:54 (6 years ago)

Author:

mkommend

Message:

#2974: Updated CoOp to handle negative R² values approprietly.

Location:

branches/2974_Constants_Optimization

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/ConstantsOptimizationEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/ConstantsOptimization/LMConstantsOptimizer.cs (modified) (1 diff)

branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/ConstantsOptimizationEvaluator.cs

@@ -79 +79 @@
       var constantOptimizationRows = GenerateRowsToEvaluate(rowsPercentage);
       quality = ConstantsOptimization.LMConstantsOptimizer.OptimizeConstants(solution, problemData.Dataset, problemData.TargetVariable, constantOptimizationRows, applyLinearScaling, ConstantOptimizationIterations.Value);
-      if (double.IsNaN(quality) || ConstantOptimizationRowsPercentage.Value != RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value) {
+      if (quality < 0|| double.IsNaN(quality) || ConstantOptimizationRowsPercentage.Value != RelativeNumberOfEvaluatedSamplesParameter.ActualValue.Value) {
         var evaluationRows = GenerateRowsToEvaluate();
         quality = SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.Calculate(interpreter, solution, estimationLimits.Lower, estimationLimits.Upper, problemData, evaluationRows, applyLinearScaling);

branches/2974_Constants_Optimization/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/ConstantsOptimization/LMConstantsOptimizer.cs

@@ -73 +73 @@
 
       var result = OptimizeConstants(term, initialConstants, x, y, maxIterations, out constants);
-      if (result != 0.0 && constants.Length != 0)
+      if (result > 0.0 && constants.Length != 0)
         Util.UpdateConstants(numericNodes, constants);