Changeset 4118 for trunk/sources/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic

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.MultiVariate.Regression/3.3/Symbolic

Files:

• MultiObjectiveSymbolicVectorRegressionProblem.cs (modified) (2 diffs)
• SymbolicVectorRegressionProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/MultiObjectiveSymbolicVectorRegressionProblem.cs

@@ -66 +66 @@
     #endregion
 
+    [StorableConstructor]
+    protected MultiObjectiveSymbolicVectorRegressionProblem(bool deserializing) : base(deserializing) { }
     public MultiObjectiveSymbolicVectorRegressionProblem()
       : base() {
@@ -75 +77 @@
       Initialize();
     }
-
-    [StorableConstructor]
-    private MultiObjectiveSymbolicVectorRegressionProblem(bool deserializing) : base() { }
-
+    
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {

trunk/sources/HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression/3.3/Symbolic/SymbolicVectorRegressionProblem.cs

@@ -119 +119 @@
     }
 
-    private List<IOperator> operators;
     public override IEnumerable<IOperator> Operators {
       get { return operators; }
@@ -154 +153 @@
     [Storable]
     private SymbolicVectorRegressionGrammar grammar;
-
+    [Storable]
+    private List<IOperator> operators;
+
+    [StorableConstructor]
+    protected SymbolicVectorRegressionProblem(bool deserializing) : base(deserializing) { }
     public SymbolicVectorRegressionProblem()
       : base() {
@@ -175 +178 @@
       UpdateGrammar();
       UpdateEstimationLimits();
-      Initialize();
-    }
-
-    [StorableConstructor]
-    private SymbolicVectorRegressionProblem(bool deserializing) : base() { }
+      InitializeOperators();
+      RegisterParameterEvents();
+      RegisterParameterValueEvents();
+    }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {
-      Initialize();
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      if (operators == null) InitializeOperators();
+      #endregion
+      RegisterParameterEvents();
+      RegisterParameterValueEvents();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       SymbolicVectorRegressionProblem clone = (SymbolicVectorRegressionProblem)base.Clone(cloner);
-      clone.Initialize();
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      clone.RegisterParameterEvents();
+      clone.RegisterParameterValueEvents();
       return clone;
     }
@@ -254 +263 @@
     protected void AddOperator(IOperator op) {
       operators.Add(op);
-    }
-
-    private void Initialize() {
-      InitializeOperators();
-      RegisterParameterEvents();
-      RegisterParameterValueEvents();
     }