Changeset 18191

Timestamp:

01/13/22 14:01:39 (15 months ago)

Author:

mkommend

Message:

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

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/LinearScaling.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (4 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;

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -188 +188 @@
     <Compile Include="Interpreter\SymbolicDataAnalysisExpressionTreeNativeInterpreter.cs" />
     <Compile Include="IntervalUtil.cs" />
+    <Compile Include="LinearScaling.cs" />
     <Compile Include="Selectors\DiversitySelector.cs" />
     <Compile Include="StructureTemplate\StructureTemplate.cs" />

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs

@@ -44 +44 @@
         var parsedTree = Parser.Parse(template);
         if (applyLinearScaling)
-          parsedTree = AddLinearScalingTerms(parsedTree);
+          parsedTree = LinearScaling.AddLinearScalingTerms(parsedTree);
         Tree = parsedTree;
         OnChanged();
@@ -83 +83 @@
 
         applyLinearScaling = value;
-        if (applyLinearScaling) Tree = AddLinearScalingTerms(Tree);
-        else Tree = RemoveLinearScalingTerms(Tree);
+        if (applyLinearScaling) LinearScaling.AddLinearScalingTerms(Tree);
+        else LinearScaling.RemoveLinearScalingTerms(Tree);
 
         OnChanged();
@@ -120 +120 @@
     private void AfterDeserialization() {
       if (Tree == null && _oldTree != null) {
-        if (ApplyLinearScaling) _oldTree = AddLinearScalingTerms(_oldTree);
+        if (ApplyLinearScaling) _oldTree = LinearScaling.AddLinearScalingTerms(_oldTree);
         Tree = _oldTree;
         _oldTree = null;
@@ -172 +172 @@
       }
     }
-
-    private static ISymbolicExpressionTree AddLinearScalingTerms(ISymbolicExpressionTree tree) {
-      var clonedTree = (ISymbolicExpressionTree)tree.Clone();
-      var startNode = clonedTree.Root.Subtrees.First();
-      var template = startNode.Subtrees.First();
-
-      var addNode = new Addition().CreateTreeNode();
-      var mulNode = new Multiplication().CreateTreeNode();
-      var offsetNode = new NumberTreeNode(0.0);
-      var scaleNode = new NumberTreeNode(1.0);
-
-      addNode.AddSubtree(offsetNode);
-      addNode.AddSubtree(mulNode);
-      mulNode.AddSubtree(scaleNode);
-
-      startNode.RemoveSubtree(0);
-      startNode.AddSubtree(addNode);
-      mulNode.AddSubtree(template);
-      return clonedTree;
-    }
-
-    private static ISymbolicExpressionTree RemoveLinearScalingTerms(ISymbolicExpressionTree tree) {
-      var clonedTree = (ISymbolicExpressionTree)tree.Clone();
-      var startNode = clonedTree.Root.Subtrees.First();
-
-      //check for scaling terms
-      var addNode = startNode.GetSubtree(0);
-      var offsetNode = addNode.GetSubtree(0);
-      var mulNode = addNode.GetSubtree(1);
-      var scaleNode = mulNode.GetSubtree(0);
-      var templateNode = mulNode.GetSubtree(1);
-
-      var error = false;
-      if (addNode.Symbol is not Addition) error = true;
-      if (mulNode.Symbol is not Multiplication) error = true;
-      if (offsetNode is not NumberTreeNode offset || offset.Value != 0.0) error = true;
-      if (scaleNode is not NumberTreeNode scale || scale.Value != 1.0) error = true;
-      if (error) throw new ArgumentException("Scaling terms cannot be found.");
-
-      startNode.RemoveSubtree(0);
-      startNode.AddSubtree(templateNode);
-
-      return clonedTree;
-    }
-
     private void OnSubFunctionChanged(object sender, EventArgs e) => OnChanged();
   }