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

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

Files:

• SingleObjectiveSymbolicTimeSeriesPrognosisProblem.cs (modified) (3 diffs)
• SymbolicTimeSeriesPrognosisProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/SingleObjectiveSymbolicTimeSeriesPrognosisProblem.cs

@@ -85 +85 @@
     #endregion
 
-
+    [StorableConstructor]
+    protected SingleObjectiveSymbolicTimeSeriesPrognosisProblem(bool deserializing) : base(deserializing) { }
     public SingleObjectiveSymbolicTimeSeriesPrognosisProblem()
       : base() {
@@ -96 +97 @@
       ParameterizeEvaluator();
 
-      Initialize();
+      InitializeOperators();
+      AttachEventHandlers();
     }
-
-    [StorableConstructor]
-    protected SingleObjectiveSymbolicTimeSeriesPrognosisProblem(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {
-      Initialize();
+      AttachEventHandlers();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       SingleObjectiveSymbolicTimeSeriesPrognosisProblem clone = (SingleObjectiveSymbolicTimeSeriesPrognosisProblem)base.Clone(cloner);
-      clone.Initialize();
+      clone.AttachEventHandlers();
       return clone;
     }
@@ -135 +134 @@
 
     #region Helpers
-    private void Initialize() {
-      InitializeOperators();
+    private void AttachEventHandlers() {
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.MultiVariate.TimeSeriesPrognosis/3.3/Symbolic/SymbolicTimeSeriesPrognosisProblem.cs

@@ -122 +122 @@
       set { FunctionTreeGrammarParameter.Value = value; }
     }
-    private List<IOperator> operators;
     public override IEnumerable<IOperator> Operators {
       get { return operators; }
@@ -157 +156 @@
     [Storable]
     private SymbolicTimeSeriesPrognosisGrammar grammar;
-
+    [Storable]
+    private List<IOperator> operators;
+
+    [StorableConstructor]
+    protected SymbolicTimeSeriesPrognosisProblem(bool deserializing) : base(deserializing) { }
     public SymbolicTimeSeriesPrognosisProblem()
       : base() {
@@ -179 +182 @@
 
       UpdateGrammar();
-      Initialize();
-    }
-
-    [StorableConstructor]
-    protected SymbolicTimeSeriesPrognosisProblem(bool deserializing) : base(deserializing) { }
+      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) {
       SymbolicTimeSeriesPrognosisProblem clone = (SymbolicTimeSeriesPrognosisProblem)base.Clone(cloner);
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
       clone.grammar = (SymbolicTimeSeriesPrognosisGrammar)cloner.Clone(grammar);
-      clone.Initialize();
+      clone.RegisterParameterEvents();
+      clone.RegisterParameterValueEvents();
       return clone;
     }
@@ -253 +262 @@
     protected void AddOperator(IOperator op) {
       operators.Add(op);
-    }
-
-    private void Initialize() {
-      InitializeOperators();
-      RegisterParameterEvents();
-      RegisterParameterValueEvents();
     }