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

Timestamp:

12/16/21 14:23:48 (2 years ago)

Author:

mkommend

Message:

#3136: Merged trunk changes into branch.

Location:

branches/3136_Structural_GP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NMSESingleObjectiveConstraintsEvaluator.cs (modified) (9 diffs)

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

@@ -46 +46 @@
       (IFixedValueParameter<BoolValue>)Parameters[OptimizeParametersParameterName];
 
-    public IFixedValueParameter<IntValue> ConstantOptimizationIterationsParameter =>
+    public IFixedValueParameter<IntValue> ParameterOptimizationIterationsParameter =>
       (IFixedValueParameter<IntValue>)Parameters[ParameterOptimizationIterationsParameterName];
 
@@ -62 +62 @@
     }
 
-    public int ConstantOptimizationIterations {
-      get => ConstantOptimizationIterationsParameter.Value.Value;
-      set => ConstantOptimizationIterationsParameter.Value.Value = value;
+    public int ParameterOptimizationIterations {
+      get => ParameterOptimizationIterationsParameter.Value.Value;
+      set => ParameterOptimizationIterationsParameter.Value.Value = value;
     }
 
@@ -97 +97 @@
     public NMSESingleObjectiveConstraintsEvaluator() {
       Parameters.Add(new FixedValueParameter<BoolValue>(OptimizeParametersParameterName,
-        "Define whether optimization of numeric parameters is active or not (default: false).", new BoolValue(false)));
+        "Define whether optimization of parameters is active or not (default: false).", new BoolValue(false)));
       Parameters.Add(new FixedValueParameter<IntValue>(ParameterOptimizationIterationsParameterName,
         "Define how many parameter optimization steps should be performed (default: 10).", new IntValue(10)));
@@ -132 +132 @@
 
     private static void CalcLinearScalingTerms(
-      ISymbolicExpressionTree tree, 
+      ISymbolicExpressionTree tree,
       IRegressionProblemData problemData,
-      IEnumerable<int> rows, 
+      IEnumerable<int> rows,
       ISymbolicDataAnalysisExpressionTreeInterpreter interpreter) {
       var rootNode = new ProgramRootSymbol().CreateTreeNode();
@@ -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))
-        throw new ArgumentException($"Shape Constraints Evaluation can only be used with LinearScalingGrammar.");
+        throw new ArgumentException($"Scaling can only be used with LinearScalingGrammar.");
 
       var t = (ISymbolicExpressionTreeNode)scaling.GetSubtree(0).Clone();
@@ -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
-        var offsetParameter = offset.GetSubtree(1) as ConstantTreeNode;
+        //Set alpha and beta to the scaling nodes from grammar
+        var offsetParameter = offset.GetSubtree(1) as NumberTreeNode;
         offsetParameter.Value = alpha;
-        var scalingParameter = scaling.GetSubtree(1) as ConstantTreeNode;
+        var scalingParameter = scaling.GetSubtree(1) as NumberTreeNode;
         scalingParameter.Value = beta;
       }
@@ -193 +195 @@
       if (constraintViolations.Any(x => double.IsNaN(x) || double.IsInfinity(x)))
         return 1.0;
-      
+
       // hard constraints
       if (!useSoftConstraints) {
@@ -220 +222 @@
 
       var nmse = Calculate(
-        tree, problemData, rows, 
+        tree, problemData, rows,
         SymbolicDataAnalysisTreeInterpreterParameter.ActualValue,
-        EstimationLimitsParameter.ActualValue.Lower, 
+        EstimationLimitsParameter.ActualValue.Lower,
         EstimationLimitsParameter.ActualValue.Upper,
-        BoundsEstimator, 
-        UseSoftConstraints, 
+        BoundsEstimator,
+        UseSoftConstraints,
         PenalityFactor);
 
@@ -245 +247 @@
 
       if (OptimizeParameters)
-        SymbolicRegressionConstantOptimizationEvaluator.OptimizeConstants(
-          interpreter, tree, 
+        SymbolicRegressionParameterOptimizationEvaluator.OptimizeParameters(
+          interpreter, tree,
           problemData, rows,
           applyLinearScaling: false, // Tree already contains scaling terms
-          ConstantOptimizationIterations, 
+          ParameterOptimizationIterations,
           updateVariableWeights: true,
-          lowerEstimationLimit, 
+          lowerEstimationLimit,
           upperEstimationLimit);
-      
+
       else if (applyLinearScaling) // extra scaling terms, which are included in tree
-        CalcLinearScalingTerms(tree, problemData, rows, interpreter); 
-      
+        CalcLinearScalingTerms(tree, problemData, rows, interpreter);
+
       return Calculate(
         tree, problemData,
-        rows, interpreter, 
-        lowerEstimationLimit, 
-        upperEstimationLimit, 
+        rows, interpreter,
+        lowerEstimationLimit,
+        upperEstimationLimit,
         BoundsEstimator,
         UseSoftConstraints,