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

Timestamp:

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

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.Knapsack/3.3/Evaluators/KnapsackEvaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs (modified) (3 diffs)
• HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackMoveEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs

@@ -21 +21 @@
 
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -35 +36 @@
   [Item("BestKnapsackSolutionAnalyzer", "An operator for analyzing the best solution for a Knapsack problem.")]
   [StorableClass]
-  class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+  public class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     public LookupParameter<BoolValue> MaximizationParameter {
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }
@@ -67 +68 @@
     }
 
+    [StorableConstructor]
+    protected BestKnapsackSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected BestKnapsackSolutionAnalyzer(BestKnapsackSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public BestKnapsackSolutionAnalyzer()
       : base() {
@@ -80 +84 @@
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution."));
       Parameters.Add(new LookupParameter<BinaryVector>("BestKnownSolution", "The best known solution."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new BestKnapsackSolutionAnalyzer(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Evaluators/KnapsackEvaluator.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -68 +69 @@
     }
 
+    [StorableConstructor]
+    protected KnapsackEvaluator(bool deserializing) : base(deserializing) { }
+    protected KnapsackEvaluator(KnapsackEvaluator original, Cloner cloner) : base(original, cloner) { }
     public KnapsackEvaluator()
       : base() {
@@ -79 +83 @@
       Parameters.Add(new LookupParameter<IntArray>("Values", "The values of the items."));
       Parameters.Add(new LookupParameter<DoubleValue>("Penalty", "The penalty value for each unit of overweight."));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new KnapsackEvaluator(this, cloner);
     }
 

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -141 +141 @@
     [StorableConstructor]
     private KnapsackProblem(bool deserializing) : base(deserializing) { }
+    private KnapsackProblem(KnapsackProblem original, Cloner cloner)
+      : base(original, cloner) {
+      this.operators = original.operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      AttachEventHandlers();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new KnapsackProblem(this, cloner);
+    }
     public KnapsackProblem()
       : base() {
@@ -167 +175 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      KnapsackProblem clone = (KnapsackProblem)base.Clone(cloner);
-      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
-      clone.AttachEventHandlers();
-      return clone;
-    }
-
     #region Events
     public event EventHandler SolutionCreatorChanged;
@@ -257 +258 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserializationHook() {
+    private void AfterDeserialization() {
       // BackwardsCompatibility3.3
       #region Backwards compatible code (remove with 3.4)

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs

@@ -109 +109 @@
     }
 
+    [StorableConstructor]
+    protected KnapsackSolution(bool deserializing) : base(deserializing) { }
+    protected KnapsackSolution(KnapsackSolution original, Cloner cloner)
+      : base(original, cloner) {
+      this.binaryVector = cloner.Clone(original.binaryVector);
+      this.quality = cloner.Clone(original.quality);
+      this.capacity = cloner.Clone(original.capacity);
+      this.weights = cloner.Clone(original.weights);
+      this.values = cloner.Clone(original.values);
+      Initialize();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new KnapsackSolution(this, cloner);
+    }
     public KnapsackSolution() : base() { }
     public KnapsackSolution(BinaryVector binaryVector, DoubleValue quality, IntValue capacity, IntArray weights, IntArray values)
@@ -119 +133 @@
       Initialize();
     }
-    [StorableConstructor]
-    private KnapsackSolution(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
     private void Initialize() {
       if (binaryVector != null) RegisterBinaryVectorEvents();
@@ -131 +147 @@
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      KnapsackSolution clone = new KnapsackSolution();
-      cloner.RegisterClonedObject(this, clone);
-      clone.binaryVector = (BinaryVector)cloner.Clone(binaryVector);
-      clone.quality = (DoubleValue)cloner.Clone(quality);
-      clone.capacity = (IntValue)cloner.Clone(capacity);
-      clone.weights = (IntArray)cloner.Clone(weights);
-      clone.values = (IntArray)cloner.Clone(values);
-      clone.Initialize();
-      return clone;
-    }
-
     #region Events
     public event EventHandler BinaryVectorChanged;

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackMoveEvaluator.cs

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

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs

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