Changeset 4098 for trunk/sources/HeuristicLab.Problems.TestFunctions

Timestamp:

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

Author:

abeham

Message:

#1090

• Fixed initialization of operators and made operator list storable

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (1 diff)
• SingleObjectiveTestFunctionProblem.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -90 +90 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void CompatibilityMethod() {
+      // BackwardsCompatibility3.3
       // Bounds are introduced in 3.3.0.3894
       if (!Parameters.ContainsKey("Bounds"))

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -119 +119 @@
       set { BestKnownQualityParameter.Value = value; }
     }
-    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
       get { return operators; }
@@ -127 +126 @@
     }
     #endregion
+
+    [Storable]
+    private List<IOperator> operators;
 
     [StorableConstructor]
@@ -154 +156 @@
       ParameterizeEvaluator();
 
-      Initialize();
+      InitializeOperators();
+      AttachEventHandlers();
       UpdateStrategyVectorBounds();
     }
@@ -160 +163 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       SingleObjectiveTestFunctionProblem clone = (SingleObjectiveTestFunctionProblem)base.Clone(cloner);
+      clone.operators = operators.Where(x => IsNotFieldReferenced(x)).Select(x => (IOperator)cloner.Clone(x)).ToList();
       clone.strategyVectorCreator = (StdDevStrategyVectorCreator)cloner.Clone(strategyVectorCreator);
+      clone.operators.Add(clone.strategyVectorCreator);
       clone.strategyVectorCrossover = (StdDevStrategyVectorCrossover)cloner.Clone(strategyVectorCrossover);
+      clone.operators.Add(strategyVectorCrossover);
       clone.strategyVectorManipulator = (StdDevStrategyVectorManipulator)cloner.Clone(strategyVectorManipulator);
-      clone.Initialize();
+      clone.operators.Add(strategyVectorManipulator);
+      clone.AttachEventHandlers();
       return clone;
+    }
+
+    private bool IsNotFieldReferenced(IOperator x) {
+      return !(x == strategyVectorCreator
+        || x == strategyVectorCrossover
+        || x == strategyVectorManipulator);
     }
 
@@ -284 +297 @@
     #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
       ProblemSizeParameter.ValueChanged += new EventHandler(ProblemSizeParameter_ValueChanged);
       ProblemSize.ValueChanged += new EventHandler(ProblemSize_ValueChanged);