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

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

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

Files:

• DataAnalysisProblem.cs (modified) (2 diffs)
• SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/DataAnalysisProblem.cs

@@ -50 +50 @@
     #endregion
 
+    [StorableConstructor]
+    protected DataAnalysisProblem(bool deserializing) : base(deserializing) { }
     public DataAnalysisProblem()
       : base() {
@@ -56 +58 @@
       RegisterParameterValueEvents();
     }
-
-    [StorableConstructor]
-    private DataAnalysisProblem(bool deserializing) : base() { }
 
     [StorableHook(HookType.AfterDeserialization)]

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/ParameterAdjustmentProblem/SupportVectorMachineParameterAdjustmentProblem.cs

@@ -129 +129 @@
 
     [StorableConstructor]
-    private SupportVectorMachineParameterAdjustmentProblem(bool deserializing) : base() { }
+    private SupportVectorMachineParameterAdjustmentProblem(bool deserializing) : base(deserializing) { }
     public SupportVectorMachineParameterAdjustmentProblem()
       : base() {
@@ -216 +216 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      if (operators == null) InitializeOperators();
+      #endregion
+      AttachEventHandlers();
+    }
+
     private void AttachEventHandlers() {
-      // Start BackwardsCompatibility3.3 (remove with 3.4)
-      if (operators == null) InitializeOperators();
-      // End BackwardsCompatibility3.3
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
       SolutionCreator.RealVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_RealVectorParameter_ActualNameChanged);