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

Timestamp:

10/20/21 14:39:46 (2 years ago)

Author:

dpiringe

Message:

#3136

• added linear scaling logic in Evaluate and (for UI reasons) Analyze
• added logic forSubFunctionSymbol (modified OpCodes) -> the SubFunctionTreeNode is display in the tree but has no effect on evaluation (works like a flag)
  • works now with SymbolicDataAnalysisExpressionTreeInterpreter
• default grammar for SubFunction is now ArithmeticExpressionGrammar instead of LinearScalingGrammar

File:

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

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

@@ -49 +49 @@
     }
 
+    public ISymbolicDataAnalysisExpressionTreeInterpreter Interpreter { get; } = new SymbolicDataAnalysisExpressionTreeInterpreter();
+
     IParameter IDataAnalysisProblem.ProblemDataParameter => ProblemDataParameter;
     IDataAnalysisProblemData IDataAnalysisProblem.ProblemData => ProblemData;
@@ -110 +112 @@
       }
 
-      if (results.TryGetValue("Best Tree", out IResult result))
-        result.Value = BuildTree(individuals[bestIdx]);
-      else
-        results.Add(new Result("Best Tree", BuildTree(individuals[bestIdx])));
+      if (results.TryGetValue("Best Tree", out IResult result)) {
+        var tree = BuildTree(individuals[bestIdx]);
+        AdjustLinearScalingParams(tree, Interpreter);
+        result.Value = tree;
+      }
+      else {
+        var tree = BuildTree(individuals[bestIdx]);
+        AdjustLinearScalingParams(tree, Interpreter);
+        results.Add(new Result("Best Tree", tree));
+      }
+        
     }
 
     public override double Evaluate(Individual individual, IRandom random) {
       var tree = BuildTree(individual);
-      var interpreter = new SymbolicDataAnalysisExpressionTreeInterpreter();
+
+      AdjustLinearScalingParams(tree, Interpreter);
       var estimationInterval = ProblemData.VariableRanges.GetInterval(ProblemData.TargetVariable);
       var quality = SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.Calculate(
-        interpreter, tree, 
+        Interpreter, tree, 
         estimationInterval.LowerBound, estimationInterval.UpperBound, 
         ProblemData, ProblemData.TrainingIndices, false);
      
       return quality;
+    }
+
+    private void AdjustLinearScalingParams(ISymbolicExpressionTree tree, ISymbolicDataAnalysisExpressionTreeInterpreter interpreter) {
+      var offsetNode = tree.Root.GetSubtree(0).GetSubtree(0);
+      var scalingNode = offsetNode.Subtrees.Where(x => !(x is ConstantTreeNode)).First();
+
+      var offsetConstantNode = (ConstantTreeNode)offsetNode.Subtrees.Where(x => x is ConstantTreeNode).First();
+      var scalingConstantNode = (ConstantTreeNode)scalingNode.Subtrees.Where(x => x is ConstantTreeNode).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) {
+        offsetConstantNode.Value = a;
+        scalingConstantNode.Value = b;
+      }
     }
 
@@ -136 +163 @@
           var subFunctionTreeNode = n as SubFunctionTreeNode;
           var subFunctionTree = individual.SymbolicExpressionTree(subFunctionTreeNode.Name);
-          var parent = n.Parent;
+          //var parent = n.Parent;
 
           // remove SubFunctionTreeNode
-          parent.RemoveSubtree(parent.IndexOfSubtree(subFunctionTreeNode));
+          //parent.RemoveSubtree(parent.IndexOfSubtree(subFunctionTreeNode));
 
           // add new tree
           var subTree = subFunctionTree.Root.GetSubtree(0)  // Start
                                             .GetSubtree(0); // Offset
-          parent.AddSubtree(subTree);
+          //parent.AddSubtree(subTree);
+          subFunctionTreeNode.AddSubtree(subTree);
         }
       }