Changeset 14054


Ignore:
Timestamp:
07/13/16 08:29:03 (10 months ago)
Author:
gkronber
Message:

#1966: renamed *EvaluationAlgorithm to *DecodingEvaluator

Location:
branches/HeuristicLab.BinPacking
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Problem.cs

    r14050 r14054  
    9797    }
    9898    public Problem() : base(
    99       new PackingPlanEvaluationAlgorithm<Permutation, PackingPosition, PackingShape, PackingItem>()) {
     99      new DecodingEvaluator<Permutation, PackingPosition, PackingShape, PackingItem>()) {
    100100    }
    101101
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Problem.cs

    r14050 r14054  
    102102    }
    103103    public Problem() : base(
    104       new PackingPlanEvaluationAlgorithm<Permutation, PackingPosition, PackingShape, PackingItem>()) {
     104      new DecodingEvaluator<Permutation, PackingPosition, PackingShape, PackingItem>()) {
    105105    }
    106106
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/DecodingEvaluator.cs

    r14053 r14054  
    3030
    3131namespace HeuristicLab.Problems.BinPacking {
    32   [Item("Packingplan Evaluation Algorithm", "Represents a composition of a decoder and an evaluator for bin-packing problems.")]
     32  [Item("Bin Packing Evaluator (with decoder)", "Represents a composition of a decoder and an evaluator for bin-packing problems.")]
    3333  [StorableClass]
    34   public class PackingPlanEvaluationAlgorithm<E, D, B, I> : SingleSuccessorOperator, IPackingPlanEvaluationAlgorithm
     34  public class DecodingEvaluator<E, D, B, I> : SingleSuccessorOperator, IDecodingEvaluator
    3535    where E : Item //E defines the used Encoding
    3636    where D : class, IPackingPosition
     
    4141      get { return (IValueLookupParameter<IPackingSolutionDecoder>)Parameters["PackingSolutionDecoder"]; }
    4242    }
    43     ILookupParameter<IPackingSolutionDecoder> IPackingPlanEvaluationAlgorithm.PackingSolutionDecoderParameter {
     43    ILookupParameter<IPackingSolutionDecoder> IDecodingEvaluator.PackingSolutionDecoderParameter {
    4444      get { return PackingSolutionDecoderParameter; }
    4545    }
     
    4747      get { return (IValueLookupParameter<IEvaluator>)Parameters["PackingPlanEvaluator"]; }
    4848    }
    49     ILookupParameter<IEvaluator> IPackingPlanEvaluationAlgorithm.PackingPlanEvaluatorParameter {
     49    ILookupParameter<IEvaluator> IDecodingEvaluator.PackingPlanEvaluatorParameter {
    5050      get { return PackingPlanEvaluatorParameter; }
    5151    }
     
    5555
    5656    [StorableConstructor]
    57     protected PackingPlanEvaluationAlgorithm(bool deserializing) : base(deserializing) { }
    58     protected PackingPlanEvaluationAlgorithm(PackingPlanEvaluationAlgorithm<E, D, B, I> original, Cloner cloner)
     57    protected DecodingEvaluator(bool deserializing) : base(deserializing) { }
     58    protected DecodingEvaluator(DecodingEvaluator<E, D, B, I> original, Cloner cloner)
    5959      : base(original, cloner) {
    6060    }
    61     public PackingPlanEvaluationAlgorithm ()
     61    public DecodingEvaluator ()
    6262      : base() {
    6363        Parameters.Add(new ValueLookupParameter<IPackingSolutionDecoder>("PackingSolutionDecoder", "The decoding operator that is used to calculate a packing plan from the used representation."));
     
    6767    }
    6868    public override IDeepCloneable Clone(Cloner cloner) {
    69       return new PackingPlanEvaluationAlgorithm<E, D, B, I>(this, cloner);
     69      return new DecodingEvaluator<E, D, B, I>(this, cloner);
    7070    }
    7171
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r14053 r14054  
    252252    <Compile Include="Encodings\PackingSolutionManipulator.cs" />
    253253    <Compile Include="Evaluators\BinUtilizationEvaluator.cs" />
     254    <Compile Include="Evaluators\DecodingEvaluator.cs" />
    254255    <Compile Include="Evaluators\EvaluatorBase.cs" />
    255     <Compile Include="Evaluators\PackingPlanEvaluationAlgorithm.cs" />
    256256    <Compile Include="Evaluators\PackingRatioEvaluator.cs" />
     257    <Compile Include="Interfaces\IDecodingEvaluator.cs" />
    257258    <Compile Include="Interfaces\IEvaluator.cs" />
    258259    <Compile Include="Interfaces\IPackingPosition.cs" />
     
    271272    <Compile Include="Interfaces\IPackingSolutionCreator.cs" />
    272273    <Compile Include="Interfaces\IPackingSolutionDecoder.cs" />
    273     <Compile Include="Interfaces\IPackingPlanEvaluationAlgorithm.cs" />
    274274    <Compile Include="Interfaces\IPackingShape.cs" />
    275275    <Compile Include="PackingDimensions.cs" />
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IDecodingEvaluator.cs

    r14053 r14054  
    2424
    2525namespace HeuristicLab.Problems.BinPacking {
    26   public interface IPackingPlanEvaluationAlgorithm : ISingleObjectiveEvaluator {
     26  public interface IDecodingEvaluator : ISingleObjectiveEvaluator {
    2727    ILookupParameter<IPackingSolutionDecoder> PackingSolutionDecoderParameter { get; }
    2828    ILookupParameter<IEvaluator> PackingPlanEvaluatorParameter { get; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem.cs

    r14050 r14054  
    3636namespace HeuristicLab.Problems.BinPacking {
    3737  [StorableClass]
    38   public abstract class Problem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IPackingPlanEvaluationAlgorithm, IPackingSolutionCreator>
    39     where D : class, IPackingPosition 
     38  public abstract class Problem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IDecodingEvaluator, IPackingSolutionCreator>
     39    where D : class, IPackingPosition
    4040    where B : PackingShape<D>, new()
    41     where I : PackingShape<D>, IPackingItem, new () {
     41    where I : PackingShape<D>, IPackingItem, new() {
    4242
    4343
    4444    #region Parameter Properties
    45     public OptionalValueParameter<PackingPlan<D,B,I>> BestKnownSolutionParameter {
     45    public OptionalValueParameter<PackingPlan<D, B, I>> BestKnownSolutionParameter {
    4646      get { return (OptionalValueParameter<PackingPlan<D, B, I>>)Parameters["BestKnownSolution"]; }
    4747    }
     
    7373    public ItemList<I> PackingItemMeasures {
    7474      get { return PackingItemMeasuresParameter.Value; }
    75       set { PackingItemMeasuresParameter.Value = value; } 
     75      set { PackingItemMeasuresParameter.Value = value; }
    7676    }
    7777    public IEvaluator PackingPlanEvaluator {
     
    9292    [StorableConstructor]
    9393    protected Problem(bool deserializing) : base(deserializing) { }
    94     protected Problem(Problem<D,B,I> original, Cloner cloner)
     94    protected Problem(Problem<D, B, I> original, Cloner cloner)
    9595      : base(original, cloner) {
    9696      InitializeEventHandlers();
    9797    }
    9898
    99     protected Problem(IPackingPlanEvaluationAlgorithm e) : this(e, new MultiComponentVectorRandomCreator()) { }
    100 
    101     protected Problem(IPackingPlanEvaluationAlgorithm e, IPackingSolutionCreator c) : base (e, c){
     99    protected Problem(IDecodingEvaluator e) : this(e, new MultiComponentVectorRandomCreator()) { }
     100
     101    protected Problem(IDecodingEvaluator e, IPackingSolutionCreator c) : base(e, c) {
    102102      Parameters.Add(new OptionalValueParameter<PackingPlan<D, B, I>>("BestKnownSolution", "The best known solution of this bin-packing instance."));
    103103      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>()));
Note: See TracChangeset for help on using the changeset viewer.