Changeset 4118 for trunk/sources/HeuristicLab.Problems.DataAnalysis.FeatureSelection

Timestamp:

07/27/10 19:54:20 (14 years ago)

Author:

abeham

Message:

#1090

• Fixed problem plugins reloading their operators on deserialization in following problems (forgot on them in the first commit)
  • SupportVectorRegressionProblem
  • SymbolicTimeSeriesPrognosisProblem
• Fixed a bug in the FeatureSelectionProblem introduced in r4098
• Fixed the issues mentioned in the code review of mkommend

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.FeatureSelection/3.3/FeatureSelectionProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.FeatureSelection/3.3/FeatureSelectionProblem.cs

@@ -90 +90 @@
 
     [StorableConstructor]
-    private FeatureSelectionProblem(bool deserializing) : base() { }
+    protected FeatureSelectionProblem(bool deserializing) : base(deserializing) { }
     public FeatureSelectionProblem()
       : base() {
@@ -106 +106 @@
 
       InitializeOperators();
-      AttachEventHandlers();
+      RegisterParameterEvents();
+      RegisterParameterValueEvents();
     }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      if (operators == null) InitializeOperators();
+      #endregion
       RegisterParameterEvents();
       RegisterParameterValueEvents();
@@ -118 +123 @@
       FeatureSelectionProblem clone = (FeatureSelectionProblem)base.Clone(cloner);
       clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
-      clone.AttachEventHandlers();
+      clone.RegisterParameterEvents();
+      clone.RegisterParameterValueEvents();
       return clone;
     }
@@ -168 +174 @@
 
     #region Helpers
-    private void AttachEventHandlers() {
-      // Start BackwardsCompatibility3.3 (remove with 3.4)
-      if (operators == null) InitializeOperators();
-      // End BackwardsCompatibility3.3
-      RegisterParameterEvents();
-      RegisterParameterValueEvents();
-    }
-
     private void InitializeOperators() {
       operators = new List<IOperator>();