Changeset 18191 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs

Timestamp:

01/13/22 14:01:39 (2 years ago)

Author:

mkommend

Message:

#3136: Extracted linear scaling functionality in a dedicated helper class.

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)

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

@@ -270 +270 @@
 
       // NMSEConstraintsEvaluator sets linear scaling terms itself
-      if (StructureTemplate.ApplyLinearScaling && !(TreeEvaluator is NMSESingleObjectiveConstraintsEvaluator)) {
-        AdjustLinearScalingParams(ProblemData, tree, Interpreter);
+      if (ApplyLinearScaling && !(TreeEvaluator is NMSESingleObjectiveConstraintsEvaluator)) {
+        LinearScaling.AdjustLinearScalingParams(ProblemData, tree, Interpreter);
       }
 
@@ -300 +300 @@
     }
 
-    private static void AdjustLinearScalingParams(IRegressionProblemData problemData, ISymbolicExpressionTree tree, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter) {
-      var offsetNode = tree.Root.GetSubtree(0).GetSubtree(0);
-      var scalingNode = offsetNode.Subtrees.Where(x => !(x is NumberTreeNode)).First();
-
-      var offsetNumberNode = (NumberTreeNode)offsetNode.Subtrees.Where(x => x is NumberTreeNode).First();
-      var scalingNumberNode = (NumberTreeNode)scalingNode.Subtrees.Where(x => x is NumberTreeNode).First();
-
-      var estimatedValues = interpreter.GetSymbolicExpressionTreeValues(tree, problemData.Dataset, problemData.TrainingIndices);
-      var targetValues = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, problemData.TrainingIndices);
-
-      OnlineLinearScalingParameterCalculator.Calculate(estimatedValues, targetValues, out double a, out double b, out OnlineCalculatorError error);
-      if (error == OnlineCalculatorError.None) {
-        offsetNumberNode.Value = a;
-        scalingNumberNode.Value = b;
-      }
-    }
-
-
-
-
-
-
     public void Load(IRegressionProblemData data) {
       ProblemData = data;