Changeset 18182 for branches

Timestamp:

01/11/22 09:50:15 (2 years ago)

Author:

dpiringe

Message:

#3136

• fixed missing/wrong event registration for SubFunction and StructuredSymbolicRegressionSingleObjectiveProblem

Location:

branches/3136_Structural_GP

Files:

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

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

@@ -129 +129 @@
     public StructuredSymbolicRegressionSingleObjectiveProblem(StructuredSymbolicRegressionSingleObjectiveProblem original,
       Cloner cloner) : base(original, cloner) {
-      ProblemDataParameter.ValueChanged += ProblemDataParameterValueChanged;
       RegisterEventHandlers();
     }

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

@@ -55 +55 @@
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(8)));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(20)));
-
-      GrammarParameter.ValueChanged += OnParameterValueChanged;
-      MaximumSymbolicExpressionTreeDepthParameter.Value.ValueChanged += OnParameterValueChanged; 
-      MaximumSymbolicExpressionTreeLengthParameter.Value.ValueChanged += OnParameterValueChanged;
+      RegisterEventHandlers();
     }
-
-    private void OnParameterValueChanged(object sender, EventArgs e) => Changed?.Invoke(this, EventArgs.Empty);
 
     protected SubFunction(SubFunction original, Cloner cloner) : base(original, cloner) {
       Arguments = original.Arguments;
+      RegisterEventHandlers();
     }
 
     [StorableConstructor]
-    protected SubFunction(StorableConstructorFlag _) : base(_) {}
+    protected SubFunction(StorableConstructorFlag _) : base(_) { }
+
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
     #endregion
 
@@ -75 +77 @@
       new SubFunction(this, cloner);
     #endregion
+
+    #region Event Handling
+    private void RegisterEventHandlers() {
+      GrammarParameter.ValueChanged += OnParameterValueChanged;
+      MaximumSymbolicExpressionTreeDepthParameter.Value.ValueChanged += OnParameterValueChanged;
+      MaximumSymbolicExpressionTreeLengthParameter.Value.ValueChanged += OnParameterValueChanged;
+    }
+
+    private void OnParameterValueChanged(object sender, EventArgs e) =>
+      Changed?.Invoke(this, EventArgs.Empty);
+    #endregion
+
 
     public override string ToString() => $"{Name}({string.Join(",", Arguments)})";