Changeset 4098 for trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3

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.ArtificialAnt/3.3/ArtificialAntProblem.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.ArtificialAnt/3.3/ArtificialAntProblem.cs

@@ -42 +42 @@
   [StorableClass]
   public sealed class ArtificialAntProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
+
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
@@ -180 +181 @@
       get { return BestKnownQualityParameter.Value; }
     }
-    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
       get { return operators; }
@@ -190 +190 @@
     #endregion
 
+    [Storable]
+    private List<IOperator> operators;
+
+    [StorableConstructor]
+    private ArtificialAntProblem(bool deserializing) : base() { }
     public ArtificialAntProblem()
       : base() {
@@ -212 +217 @@
       ParameterizeSolutionCreator();
       ParameterizeEvaluator();
-      Initialize();
-    }
-
-    [StorableConstructor]
-    private ArtificialAntProblem(bool deserializing) : base() { }
+      InitializeOperators();
+      AttachEventHandlers();
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       ArtificialAntProblem clone = (ArtificialAntProblem)base.Clone(cloner);
-      clone.Initialize();
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      clone.AttachEventHandlers();
       return clone;
     }
@@ -274 +278 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void Initialize() {
-      InitializeOperators();
+    private void AttachEventHandlers() {
+      // Start BackwardsCompatibility3.3 (remove with 3.4)
+      if (operators == null) InitializeOperators();
+      // End BackwardsCompatibility3.3
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
       SolutionCreator.SymbolicExpressionTreeParameter.ActualNameChanged += new EventHandler(SolutionCreator_SymbolicExpressionTreeParameter_ActualNameChanged);