Changeset 14054

Timestamp:

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

Author:

gkronber

Message:

#1966: renamed *EvaluationAlgorithm to *DecodingEvaluator

Location:

branches/HeuristicLab.BinPacking

Files:

• HeuristicLab.Problems.BinPacking.2D/3.3/Problem.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking.3D/3.3/Problem.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/Evaluators/DecodingEvaluator.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/PackingPlanEvaluationAlgorithm.cs) (5 diffs)
• HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking/3.3/Interfaces/IDecodingEvaluator.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPlanEvaluationAlgorithm.cs) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/Problem.cs (modified) (3 diffs)

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

@@ -97 +97 @@
     }
     public Problem() : base(
-      new PackingPlanEvaluationAlgorithm<Permutation, PackingPosition, PackingShape, PackingItem>()) {
+      new DecodingEvaluator<Permutation, PackingPosition, PackingShape, PackingItem>()) {
     }
 

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

@@ -102 +102 @@
     }
     public Problem() : base(
-      new PackingPlanEvaluationAlgorithm<Permutation, PackingPosition, PackingShape, PackingItem>()) {
+      new DecodingEvaluator<Permutation, PackingPosition, PackingShape, PackingItem>()) {
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/DecodingEvaluator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.BinPacking {
-  [Item("Packingplan Evaluation Algorithm", "Represents a composition of a decoder and an evaluator for bin-packing problems.")]
+  [Item("Bin Packing Evaluator (with decoder)", "Represents a composition of a decoder and an evaluator for bin-packing problems.")]
   [StorableClass]
-  public class PackingPlanEvaluationAlgorithm<E, D, B, I> : SingleSuccessorOperator, IPackingPlanEvaluationAlgorithm
+  public class DecodingEvaluator<E, D, B, I> : SingleSuccessorOperator, IDecodingEvaluator
     where E : Item //E defines the used Encoding
     where D : class, IPackingPosition
@@ -41 +41 @@
       get { return (IValueLookupParameter<IPackingSolutionDecoder>)Parameters["PackingSolutionDecoder"]; }
     }
-    ILookupParameter<IPackingSolutionDecoder> IPackingPlanEvaluationAlgorithm.PackingSolutionDecoderParameter {
+    ILookupParameter<IPackingSolutionDecoder> IDecodingEvaluator.PackingSolutionDecoderParameter {
       get { return PackingSolutionDecoderParameter; }
     }
@@ -47 +47 @@
       get { return (IValueLookupParameter<IEvaluator>)Parameters["PackingPlanEvaluator"]; }
     }
-    ILookupParameter<IEvaluator> IPackingPlanEvaluationAlgorithm.PackingPlanEvaluatorParameter {
+    ILookupParameter<IEvaluator> IDecodingEvaluator.PackingPlanEvaluatorParameter {
       get { return PackingPlanEvaluatorParameter; }
     }
@@ -55 +55 @@
 
     [StorableConstructor]
-    protected PackingPlanEvaluationAlgorithm(bool deserializing) : base(deserializing) { }
-    protected PackingPlanEvaluationAlgorithm(PackingPlanEvaluationAlgorithm<E, D, B, I> original, Cloner cloner)
+    protected DecodingEvaluator(bool deserializing) : base(deserializing) { }
+    protected DecodingEvaluator(DecodingEvaluator<E, D, B, I> original, Cloner cloner)
       : base(original, cloner) {
     }
-    public PackingPlanEvaluationAlgorithm ()
+    public DecodingEvaluator ()
       : base() {
         Parameters.Add(new ValueLookupParameter<IPackingSolutionDecoder>("PackingSolutionDecoder", "The decoding operator that is used to calculate a packing plan from the used representation."));
@@ -67 +67 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PackingPlanEvaluationAlgorithm<E, D, B, I>(this, cloner);
+      return new DecodingEvaluator<E, D, B, I>(this, cloner);
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

@@ -252 +252 @@
     <Compile Include="Encodings\PackingSolutionManipulator.cs" />
     <Compile Include="Evaluators\BinUtilizationEvaluator.cs" />
+    <Compile Include="Evaluators\DecodingEvaluator.cs" />
     <Compile Include="Evaluators\EvaluatorBase.cs" />
-    <Compile Include="Evaluators\PackingPlanEvaluationAlgorithm.cs" />
     <Compile Include="Evaluators\PackingRatioEvaluator.cs" />
+    <Compile Include="Interfaces\IDecodingEvaluator.cs" />
     <Compile Include="Interfaces\IEvaluator.cs" />
     <Compile Include="Interfaces\IPackingPosition.cs" />
@@ -271 +272 @@
     <Compile Include="Interfaces\IPackingSolutionCreator.cs" />
     <Compile Include="Interfaces\IPackingSolutionDecoder.cs" />
-    <Compile Include="Interfaces\IPackingPlanEvaluationAlgorithm.cs" />
     <Compile Include="Interfaces\IPackingShape.cs" />
     <Compile Include="PackingDimensions.cs" />

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IDecodingEvaluator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.BinPacking {
-  public interface IPackingPlanEvaluationAlgorithm : ISingleObjectiveEvaluator {
+  public interface IDecodingEvaluator : ISingleObjectiveEvaluator {
     ILookupParameter<IPackingSolutionDecoder> PackingSolutionDecoderParameter { get; }
     ILookupParameter<IEvaluator> PackingPlanEvaluatorParameter { get; }

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>()));