Changeset 18194 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

01/14/22 08:33:46 (2 years ago)

Author:

mkommend

Message:

#3136:

• Added handling of numeric parameters in structur GP problem by using a real vector encoding.
• Configured grammar in sub function.
• Added property for numeric parameters in structure template.

Location:

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

Files:

• StructureTemplate.cs (modified) (2 diffs)
• SubFunction.cs (modified) (1 diff)

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

@@ -61 +61 @@
       get => tree;
       private set {
+        containsNumericParameters = null;
         tree = value;
 
@@ -68 +69 @@
         // adds new functions and keeps the old ones (if they match)
         subFunctions = newFunctions.Except(oldFunctions).Concat(oldFunctions).ToList();
+      }
+    }
+
+    private bool? containsNumericParameters;
+    public bool ContainsNumericParameters {
+      get {
+        if (!containsNumericParameters.HasValue)
+          containsNumericParameters = Tree.IterateNodesPrefix().OfType<NumberTreeNode>().Any();
+
+        return containsNumericParameters.Value;
       }
     }

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

@@ -75 +75 @@
     #region Event Handling
     private void RegisterEventHandlers() {
-      GrammarParameter.ValueChanged += OnParameterValueChanged;
+      GrammarParameter.ValueChanged += (o, e) => {
+        if (Grammar is TypeCoherentExpressionGrammar tceg) tceg.ConfigureAsDefaultRegressionGrammar();
+        OnParameterValueChanged(o, e);
+      };
       MaximumSymbolicExpressionTreeDepthParameter.Value.ValueChanged += OnParameterValueChanged;
       MaximumSymbolicExpressionTreeLengthParameter.Value.ValueChanged += OnParameterValueChanged;