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

Timestamp:

07/25/10 01:04:14 (14 years ago)

Author:

abeham

Message:

#1090

• Fixed initialization of operators and made operator list storable

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionProblem.cs

@@ -147 +147 @@
       get { return BestKnownQualityParameter.Value; }
     }
-    private List<IOperator> operators;
     public override IEnumerable<IOperator> Operators {
       get { return operators; }
@@ -180 +179 @@
     #endregion
 
+    [Storable]
+    private List<IOperator> operators;
+
+    [StorableConstructor]
+    private SymbolicRegressionProblem(bool deserializing) : base() { }
     public SymbolicRegressionProblem()
       : base() {
@@ -208 +212 @@
       UpdateGrammar();
       UpdateEstimationLimits();
-      Initialize();
-    }
-
-    [StorableConstructor]
-    private SymbolicRegressionProblem(bool deserializing) : base() { }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
-      RegisterParameterEvents();
-      RegisterParameterValueEvents();
+      InitializeOperators();
+      AttachEventHandlers();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       SymbolicRegressionProblem clone = (SymbolicRegressionProblem)base.Clone(cloner);
-      clone.Initialize();
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      clone.AttachEventHandlers();
       return clone;
     }
@@ -305 +302 @@
 
     #region Helpers
-    private void Initialize() {
-      InitializeOperators();
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AttachEventHandlers() {
+      // Start BackwardsCompatibility3.3 (remove with 3.4)
+      if (operators == null) InitializeOperators();
+      // End BackwardsCompatibility3.3
       RegisterParameterEvents();
       RegisterParameterValueEvents();