Changeset 18072 for branches

Timestamp:

10/28/21 14:31:33 (3 years ago)

Author:

chaider

Message:

#3136

• Added info text in StructureTemplateView
• Fixed cloning constructors
• Added check if linear scaling nodes are set

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/SubFunction.cs (modified) (1 diff)

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

@@ -23 +23 @@
     private const string StructureDefinitionParameterName = "Structure Definition";
     private const string StructureTemplateParameterName = "Structure Template";
-    #endregion
-
-    #region Parameter
+
+    private const string StructureTemplateDescriptionText = 
+      "Enter your expression as string in infix format into the empty input field.\n" +
+      "By checking the \"Apply Linear Scaling\" checkbox you can add the relevant scaling terms to your expression.\n" +
+      "After entering the expression click parse to build the tree.\n" +
+      "To edit the defined sub-functions, click on the coressponding colored node in the tree view.";
+    #endregion
+
+    #region Parameters
     public IValueParameter<IRegressionProblemData> ProblemDataParameter => (IValueParameter<IRegressionProblemData>)Parameters[ProblemDataParameterName];
     public IFixedValueParameter<StringValue> StructureDefinitionParameter => (IFixedValueParameter<StringValue>)Parameters[StructureDefinitionParameterName];
@@ -69 +75 @@
 
       Parameters.Add(new ValueParameter<IRegressionProblemData>(ProblemDataParameterName, problemData));
-      Parameters.Add(new FixedValueParameter<StructureTemplate>(StructureTemplateParameterName, structureTemplate));
-
-    }
-
-    public StructuredSymbolicRegressionSingleObjectiveProblem(StructuredSymbolicRegressionSingleObjectiveProblem original, Cloner cloner) { }
+      Parameters.Add(new FixedValueParameter<StructureTemplate>(StructureTemplateParameterName, 
+        StructureTemplateDescriptionText, structureTemplate));
+
+
+    }
+
+    public StructuredSymbolicRegressionSingleObjectiveProblem(StructuredSymbolicRegressionSingleObjectiveProblem original, 
+      Cloner cloner) : base(original, cloner){ }
 
     [StorableConstructor]
@@ -114 +123 @@
       if (results.TryGetValue("Best Tree", out IResult result)) {
         var tree = BuildTree(individuals[bestIdx]);
-        AdjustLinearScalingParams(tree, Interpreter);
+        if (StructureTemplate.ApplyLinearScaling)
+          AdjustLinearScalingParams(tree, Interpreter);
         result.Value = tree;
       }
       else {
         var tree = BuildTree(individuals[bestIdx]);
-        AdjustLinearScalingParams(tree, Interpreter);
+        if (StructureTemplate.ApplyLinearScaling)
+          AdjustLinearScalingParams(tree, Interpreter);
         results.Add(new Result("Best Tree", tree));
       }
@@ -128 +139 @@
       var tree = BuildTree(individual);
 
-      AdjustLinearScalingParams(tree, Interpreter);
+      if (StructureTemplate.ApplyLinearScaling)
+        AdjustLinearScalingParams(tree, Interpreter);
       var estimationInterval = ProblemData.VariableRanges.GetInterval(ProblemData.TargetVariable);
       var quality = SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.Calculate(

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

@@ -38 +38 @@
 
     [Storable]
-    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; }
+    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; } = new Dictionary<string, SubFunction>();
 
     [Storable]
@@ -66 +66 @@
     protected StructureTemplate(StorableConstructorFlag _) : base(_) { }
 
-    protected StructureTemplate(StructureTemplate original, Cloner cloner) { }
+    protected StructureTemplate(StructureTemplate original, Cloner cloner) : base(original, cloner) { }
     #endregion
 
@@ -73 +73 @@
       new StructureTemplate(this, cloner);
     #endregion
+
+    
 
     private Dictionary<string, SubFunction> GetSubFunctions() {

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

@@ -63 +63 @@
     private void OnParameterValueChanged(object sender, EventArgs e) => Changed?.Invoke(this, EventArgs.Empty);
 
-    protected SubFunction(SubFunction original, Cloner cloner) {
+    protected SubFunction(SubFunction original, Cloner cloner) : base(original, cloner) {
       Arguments = original.Arguments;
     }