Changeset 18151 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

12/16/21 16:47:07 (3 years ago)

Author:

dpiringe

Message:

#3136

• fixed eventhandler reregister after deserialisazion/cloning
• added a test case for StructuredSymbolicRegressionSingleObjectiveProblem
• changed the usage of a Dictionary to List

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

@@ -80 +80 @@
       var shapeConstraintProblemData = new ShapeConstrainedRegressionProblemData(problemData);
 
-
       var targetInterval = shapeConstraintProblemData.VariableRanges.GetInterval(shapeConstraintProblemData.TargetVariable);
       var estimationWidth = targetInterval.Width * 10;
 
-
       var structureTemplate = new StructureTemplate();
-      structureTemplate.Changed += OnTemplateChanged;
 
       var evaluators = new ItemSet<SymbolicRegressionSingleObjectiveEvaluator>(
@@ -100 +97 @@
         ProblemDataParameterName,
         shapeConstraintProblemData));
-      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
 
       Parameters.Add(new FixedValueParameter<StructureTemplate>(
@@ -123 +119 @@
       Operators.Add(new SymbolicExpressionSymbolFrequencyAnalyzer());
 
+      RegisterEventHandlers();
       StructureTemplate.Template =
         "(" +
@@ -132 +129 @@
 
     public StructuredSymbolicRegressionSingleObjectiveProblem(StructuredSymbolicRegressionSingleObjectiveProblem original,
-      Cloner cloner) : base(original, cloner) { }
+      Cloner cloner) : base(original, cloner) {
+      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
+      RegisterEventHandlers();
+    }
 
     [StorableConstructor]
     protected StructuredSymbolicRegressionSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
+
     #endregion
 
@@ -148 +155 @@
     }
 
+    private void RegisterEventHandlers() {
+      if (StructureTemplate != null) {
+        StructureTemplate.Changed += OnTemplateChanged;
+      }
+
+      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
+    }
+
     private void OnTemplateChanged(object sender, EventArgs args) {
       SetupStructureTemplate();
@@ -156 +171 @@
         Encoding.Remove(e);
 
-      foreach (var f in StructureTemplate.SubFunctions.Values) {
+      foreach (var f in StructureTemplate.SubFunctions) {
         SetupVariables(f);
         if (!Encoding.Encodings.Any(x => x.Name == f.Name)) // to prevent the same encoding twice