Changeset 14054 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem.cs

Timestamp:

07/13/16 08:29:03 (8 years ago)

Author:

gkronber

Message:

#1966: renamed *EvaluationAlgorithm to *DecodingEvaluator

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem.cs

@@ -36 +36 @@
 namespace HeuristicLab.Problems.BinPacking {
   [StorableClass]
-  public abstract class Problem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IPackingPlanEvaluationAlgorithm, IPackingSolutionCreator> 
-    where D : class, IPackingPosition 
+  public abstract class Problem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IDecodingEvaluator, IPackingSolutionCreator>
+    where D : class, IPackingPosition
     where B : PackingShape<D>, new()
-    where I : PackingShape<D>, IPackingItem, new () {
+    where I : PackingShape<D>, IPackingItem, new() {
 
 
     #region Parameter Properties
-    public OptionalValueParameter<PackingPlan<D,B,I>> BestKnownSolutionParameter {
+    public OptionalValueParameter<PackingPlan<D, B, I>> BestKnownSolutionParameter {
       get { return (OptionalValueParameter<PackingPlan<D, B, I>>)Parameters["BestKnownSolution"]; }
     }
@@ -73 +73 @@
     public ItemList<I> PackingItemMeasures {
       get { return PackingItemMeasuresParameter.Value; }
-      set { PackingItemMeasuresParameter.Value = value; } 
+      set { PackingItemMeasuresParameter.Value = value; }
     }
     public IEvaluator PackingPlanEvaluator {
@@ -92 +92 @@
     [StorableConstructor]
     protected Problem(bool deserializing) : base(deserializing) { }
-    protected Problem(Problem<D,B,I> original, Cloner cloner)
+    protected Problem(Problem<D, B, I> original, Cloner cloner)
       : base(original, cloner) {
       InitializeEventHandlers();
     }
 
-    protected Problem(IPackingPlanEvaluationAlgorithm e) : this(e, new MultiComponentVectorRandomCreator()) { }
-
-    protected Problem(IPackingPlanEvaluationAlgorithm e, IPackingSolutionCreator c) : base (e, c){
+    protected Problem(IDecodingEvaluator e) : this(e, new MultiComponentVectorRandomCreator()) { }
+
+    protected Problem(IDecodingEvaluator e, IPackingSolutionCreator c) : base(e, c) {
       Parameters.Add(new OptionalValueParameter<PackingPlan<D, B, I>>("BestKnownSolution", "The best known solution of this bin-packing instance."));
       Parameters.Add(new ValueParameter<ItemList<I>>("PackingItemMeasures", "Packing-item data defining the measures of the different items that need to be packed.", new ItemList<I>()));