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

Timestamp:

01/14/22 12:06:18 (3 years ago)

Author:

mkommend

Message:

#3136: Ommited parameter optimization of variable weights in the template part of the tree.

File:

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

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -279 +280 @@
         throw new ArgumentException("No structure template defined!");
 
-      var tree = BuildTreeFromIndividual(templateTree, individual, updateNumericParameters: StructureTemplate.ContainsNumericParameters);
+      var tree = BuildTreeFromIndividual(templateTree, individual, containsNumericParameters: StructureTemplate.ContainsNumericParameters);
       individual[SymbolicExpressionTreeName] = tree;
 
       if (OptimizeParameters) {
-        ParameterOptimization.OptimizeTreeParameters(ProblemData, tree, interpreter: Interpreter);
+        var excludeNodes = GetTemplateTreeNodes(tree.Root).OfType<IVariableTreeNode>();
+        ParameterOptimization.OptimizeTreeParameters(ProblemData, tree, interpreter: Interpreter, excludeNodes: excludeNodes);
       } else if (ApplyLinearScaling) {
         LinearScaling.AdjustLinearScalingParams(ProblemData, tree, Interpreter);
       }
 
-      UpdateIndividualFromTree(tree, individual, updateNumericParameters: StructureTemplate.ContainsNumericParameters);
+      UpdateIndividualFromTree(tree, individual, containsNumericParameters: StructureTemplate.ContainsNumericParameters);
 
       //calculate NMSE
@@ -317 +319 @@
     }
 
-    private static ISymbolicExpressionTree BuildTreeFromIndividual(ISymbolicExpressionTree template, Individual individual, bool updateNumericParameters) {
+    private static IEnumerable<ISymbolicExpressionTreeNode> GetTemplateTreeNodes(ISymbolicExpressionTreeNode rootNode) {
+      yield return rootNode;
+      foreach (var node in rootNode.Subtrees) {
+        if (node is SubFunctionTreeNode) {
+          yield return node;
+          continue;
+        }
+
+        foreach (var subNode in GetTemplateTreeNodes(node))
+          yield return subNode;
+      }
+    }
+
+    private static ISymbolicExpressionTree BuildTreeFromIndividual(ISymbolicExpressionTree template, Individual individual, bool containsNumericParameters) {
       var resolvedTree = (ISymbolicExpressionTree)template.Clone();
 
       //set numeric parameter values
-      if (updateNumericParameters) {
+      if (containsNumericParameters) {
         var realVector = individual.RealVector(NumericParametersEncoding);
         var numberTreeNodes = resolvedTree.IterateNodesPrefix().OfType<NumberTreeNode>().ToArray();
@@ -345 +360 @@
     }
 
-    private static void UpdateIndividualFromTree(ISymbolicExpressionTree tree, Individual individual, bool updateNumericParameters) {
+    private static void UpdateIndividualFromTree(ISymbolicExpressionTree tree, Individual individual, bool containsNumericParameters) {
       var clonedTree = (ISymbolicExpressionTree)tree.Clone();
 
@@ -357 +372 @@
         var rootNode = (SymbolicExpressionTreeTopLevelNode)new ProgramRootSymbol().CreateTreeNode();
         rootNode.SetGrammar(grammar);
-
         var startNode = (SymbolicExpressionTreeTopLevelNode)new StartSymbol().CreateTreeNode();
         startNode.SetGrammar(grammar);
@@ -368 +382 @@
 
       //set numeric parameter values
-      if (updateNumericParameters) {
+      if (containsNumericParameters) {
         var realVector = individual.RealVector(NumericParametersEncoding);
         var numberTreeNodes = clonedTree.IterateNodesPrefix().OfType<NumberTreeNode>().ToArray();