Changeset 18104 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

Timestamp:

12/03/21 13:46:20 (2 years ago)

Author:

dpiringe

Message:

#3136

• overrode the method GetActualValue in ValueLookupParameter to get the default value when the execution context is null
• reverted the linear scaling logic for NMSESingleObjectiveConstraintsEvaluator
• in SymbolicRegressionConstantOptimizationEvaluator: removed the usage of GenerateRowsToEvaluate because it uses lookup parameters
• set the value of RelativeNumberOfEvaluatedSamplesParameter for SymbolicRegressionConstantOptimizationEvaluator in StructuredSymbolicRegressionSingleObjectiveProblem if Maximization = true and the SymbolicRegressionConstantOptimizationEvaluator is configured as evaluator
• added the SubFunctionSymbol in TreeToAutoDiffTermConverter

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (modified) (4 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs

@@ -141 +141 @@
                             .GetSubtree(0); //Offset
       var scaling = offset.GetSubtree(0);
-
+      
       //Check if tree contains offset and scaling nodes
       if (!(offset.Symbol is Addition) || !(scaling.Symbol is Multiplication))
@@ -155 +155 @@
 
       var targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, rows);
-      OnlineLinearScalingParameterCalculator.Calculate(estimatedValues, targetValues, out var alpha, out var beta,
-        out var errorState);
+      OnlineLinearScalingParameterCalculator.Calculate(estimatedValues, targetValues, out var alpha, out var beta, out var errorState);
       if (errorState == OnlineCalculatorError.None) {
         //Set alpha and beta to the scaling nodes from ia grammar
@@ -249 +248 @@
           interpreter, tree, 
           problemData, rows,
-          applyLinearScaling: false, // OptimizeConstants deletes the scaling terms -> wrong estimations
+          applyLinearScaling: false, // Tree already contains scaling terms
           ConstantOptimizationIterations, 
           updateVariableWeights: true,
@@ -255 +254 @@
           upperEstimationLimit);
       
-      if (applyLinearScaling) // extra scaling terms, which are included in tree
-        CalcLinearScalingTerms(tree, problemData, rows, interpreter);
-
+      else if (applyLinearScaling) // extra scaling terms, which are included in tree
+        CalcLinearScalingTerms(tree, problemData, rows, interpreter); 
+      
       return Calculate(
         tree, problemData,