Changeset 4722 for trunk/sources/HeuristicLab.Problems.OneMax

Timestamp:

11/06/10 01:56:04 (13 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.OneMax/3.3/Analyzers/BestOneMaxSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.OneMax/3.3/Evaluators/OneMaxEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.OneMax/3.3/MoveEvaluators/OneMaxMoveEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.OneMax/3.3/MoveEvaluators/OneMaxOneBitflipMoveEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.OneMax/3.3/OneMaxSolution.cs (modified) (3 diffs)
• HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.OneMax/3.3/Analyzers/BestOneMaxSolutionAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -35 +36 @@
   [Item("BestOneMaxSolutionAnalyzer", "An operator for analyzing the best solution for a OneMax problem.")]
   [StorableClass]
-  class BestOneMaxSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+  public class BestOneMaxSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     public LookupParameter<BoolValue> MaximizationParameter {
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
@@ -55 +56 @@
     }
 
+    [StorableConstructor]
+    protected BestOneMaxSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected BestOneMaxSolutionAnalyzer(BestOneMaxSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public BestOneMaxSolutionAnalyzer()
       : base() {
@@ -63 +67 @@
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the Onemax solution should be stored."));
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new BestOneMaxSolutionAnalyzer(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.OneMax/3.3/Evaluators/OneMaxEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -42 +43 @@
     }
 
+    [StorableConstructor]
+    protected OneMaxEvaluator(bool deserializing) : base(deserializing) { }
+    protected OneMaxEvaluator(OneMaxEvaluator original, Cloner cloner) : base(original, cloner) { }
     public OneMaxEvaluator()
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The evaluated quality of the OneMax solution."));
       Parameters.Add(new LookupParameter<BinaryVector>("BinaryVector", "The OneMax solution given in path representation which should be evaluated."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneMaxEvaluator(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.OneMax/3.3/MoveEvaluators/OneMaxMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -45 +46 @@
     }
 
+    [StorableConstructor]
+    protected OneMaxMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected OneMaxMoveEvaluator(OneMaxMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     protected OneMaxMoveEvaluator()
       : base() {

trunk/sources/HeuristicLab.Problems.OneMax/3.3/MoveEvaluators/OneMaxOneBitflipMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -37 +38 @@
     }
 
+    [StorableConstructor]
+    protected OneMaxOneBitflipMoveEvaluator(bool deserializing) : base(deserializing) { }
+    protected OneMaxOneBitflipMoveEvaluator(OneMaxOneBitflipMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
     public OneMaxOneBitflipMoveEvaluator()
       : base() {
       Parameters.Add(new LookupParameter<OneBitflipMove>("OneBitflipMove", "The move to evaluate."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneMaxOneBitflipMoveEvaluator(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.OneMax/3.3/OneMaxSolution.cs

@@ -34 +34 @@
   [Item("OneMaxSolution", "Represents a OneMax solution.")]
   [StorableClass]
-  public class OneMaxSolution : Item {
+  public sealed class OneMaxSolution : Item {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Image; }
@@ -67 +67 @@
     }
 
+    [StorableConstructor]
+    private OneMaxSolution(bool deserializing) : base(deserializing) { }
+    private OneMaxSolution(OneMaxSolution original, Cloner cloner)
+      : base(original, cloner) {
+      binaryVector = cloner.Clone(original.binaryVector);
+      quality = cloner.Clone(original.quality);
+      Initialize();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OneMaxSolution(this, cloner);
+    }
     public OneMaxSolution() : base() { }
     public OneMaxSolution(BinaryVector binaryVector, DoubleValue quality)
@@ -74 +85 @@
       Initialize();
     }
-    [StorableConstructor]
-    private OneMaxSolution(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     private void Initialize() {
       if (binaryVector != null) RegisterBinaryVectorEvents();
       if (quality != null) RegisterQualityEvents();
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      OneMaxSolution clone = new OneMaxSolution();
-      cloner.RegisterClonedObject(this, clone);
-      clone.binaryVector = (BinaryVector)cloner.Clone(binaryVector);
-      clone.quality = (DoubleValue)cloner.Clone(quality);
-      clone.Initialize();
-      return clone;
     }
 

trunk/sources/HeuristicLab.Problems.OneMax/3.3/OnemaxProblem.cs

@@ -112 +112 @@
     [StorableConstructor]
     private OneMaxProblem(bool deserializing) : base(deserializing) { }
+    private OneMaxProblem(OneMaxProblem original, Cloner cloner)
+      : base(original, cloner) {
+      operators = original.operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      AttachEventHandlers();
+    }
     public OneMaxProblem()
       : base() {
@@ -133 +138 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      OneMaxProblem clone = (OneMaxProblem)base.Clone(cloner);
-      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
-      clone.AttachEventHandlers();
-      return clone;
+      return new OneMaxProblem(this, cloner);
     }
 
@@ -200 +202 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
+    private void AfterDeserialization() {
       // BackwardsCompatibility3.3
       #region Backwards compatible code (remove with 3.4)