Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/16 18:23:13 (8 years ago)
Author:
gkronber
Message:

#1966: removed types for *PackingBin because PackingBins and PackingShapes have the same capabilities

Location:
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftGroupingVectorDecoder.cs

    r13032 r14045  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Problems.BinPacking.Dimensions;
    26 using HeuristicLab.Problems.BinPacking.PackingBin;
     26
    2727using HeuristicLab.Problems.BinPacking.PackingItem;
    2828using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    … …  
    3030using HeuristicLab.Problems.BinPacking.Interfaces;
    3131using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
     32using HeuristicLab.Problems.BinPacking.Shapes;
    3233
    3334namespace HeuristicLab.Problems.BinPacking.Decoders {
    3435  [Item("Identical bin, three dimensional, GroupingVector-decoder", "<Description missing...>")]
    3536  [StorableClass]
    36   public class DeepestBottomLeftGroupingVectorDecoder : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, I3DGVDecoder {
     37  public class DeepestBottomLeftGroupingVectorDecoder : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem>, I3DGVDecoder {
    3738    public DeepestBottomLeftGroupingVectorDecoder() : base() {}
    3839    [StorableConstructor]
    … …  
    4546    }
    4647
    47     public override PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
     48    public override PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
    4849      var solution = encodedSolution as GroupingVectorEncoding;
    4950      if (solution == null) throw new InvalidOperationException("Encoding is not of type GroupingVector");

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftMultiComponentVectorDecoder.cs

    r13032 r14045  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Problems.BinPacking.Dimensions;
    26 using HeuristicLab.Problems.BinPacking.PackingBin;
     26
    2727using HeuristicLab.Problems.BinPacking.PackingItem;
    2828using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    … …  
    3030using HeuristicLab.Problems.BinPacking.Interfaces;
    3131using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
     32using HeuristicLab.Problems.BinPacking.Shapes;
    3233
    3334namespace HeuristicLab.Problems.BinPacking.Decoders {
    3435  [Item("Identical bin, three dimensional, MultiComponentVector-decoder", "<Description missing...>")]
    3536  [StorableClass]
    36   public class DeepestBottomLeftMultiComponentVectorDecoder : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, I3DMCVDecoder {
     37  public class DeepestBottomLeftMultiComponentVectorDecoder : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem>, I3DMCVDecoder {
    3738    public DeepestBottomLeftMultiComponentVectorDecoder() : base() { }
    3839    [StorableConstructor]
    … …  
    4546    }
    4647
    47     public override PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
     48    public override PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
    4849      var solution = encodedSolution as MultiComponentVectorEncoding;
    4950      if (solution == null) throw new InvalidOperationException("Encoding is not of type MultiComponent Vector");

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftPackingSequenceDecoder.cs

    r13032 r14045  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Problems.BinPacking.Dimensions;
    26 using HeuristicLab.Problems.BinPacking.PackingBin;
     26
    2727using HeuristicLab.Problems.BinPacking.PackingItem;
    2828using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    … …  
    3030using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    3131using HeuristicLab.Problems.BinPacking.Interfaces;
     32using HeuristicLab.Problems.BinPacking.Shapes;
    3233
    3334namespace HeuristicLab.Problems.BinPacking.Decoders {
    3435  [Item("Identical bin, three dimensional, PackingSequence-decoder", "<Description missing...>")]
    3536  [StorableClass]
    36   public class DeepestBottomLeftPackingSequenceDecoder : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, I3DPSDecoder {
     37  public class DeepestBottomLeftPackingSequenceDecoder : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem>, I3DPSDecoder {
    3738    public DeepestBottomLeftPackingSequenceDecoder(): base() {}
    3839    [StorableConstructor]
    … …  
    4546    }
    4647
    47     public override PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
     48    public override PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
    4849      var solution = encodedSolution as PackingSequenceEncoding;
    4950      if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence");

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder3D.cs

    r13032 r14045  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Problems.BinPacking.Dimensions;
    26 using HeuristicLab.Problems.BinPacking.PackingBin;
     26
    2727using HeuristicLab.Problems.BinPacking.PackingItem;
    2828using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    … …  
    3030using HeuristicLab.Problems.BinPacking.Interfaces;
    3131using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
     32using HeuristicLab.Problems.BinPacking.Shapes;
    3233
    3334namespace HeuristicLab.Problems.BinPacking.Decoders {
    3435  [Item("Identical bin, three dimensional, extreme points based decoder for the GroupingVector encoding.", "<Description missing...>")]
    3536  [StorableClass]
    36   public class ExtremePointGroupingVectorDecoder3D : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, I3DGVDecoder {
     37  public class ExtremePointGroupingVectorDecoder3D : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem>, I3DGVDecoder {
    3738    public ExtremePointGroupingVectorDecoder3D() : base() { }
    3839    [StorableConstructor]
    … …  
    4546    }
    4647
    47     public static PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> Decode(GroupingVectorEncoding solution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures, bool stackingConstraints) {
     48    public static PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> Decode(GroupingVectorEncoding solution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures, bool stackingConstraints) {
    4849      PackingPlan3D result = new PackingPlan3D(binMeasures, true, stackingConstraints);
    4950      result.Pack(solution, itemMeasures);
    … …  
    5152    }
    5253
    53     public override PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
     54    public override PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
    5455      var solution = encodedSolution as GroupingVectorEncoding;
    5556      if (solution == null) throw new InvalidOperationException("Encoding is not of type GroupingVector");

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder3D.cs

    r13032 r14045  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Problems.BinPacking.Dimensions;
    26 using HeuristicLab.Problems.BinPacking.PackingBin;
     26
    2727using HeuristicLab.Problems.BinPacking.PackingItem;
    2828using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    … …  
    3030using HeuristicLab.Problems.BinPacking.Interfaces;
    3131using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
     32using HeuristicLab.Problems.BinPacking.Shapes;
    3233
    3334namespace HeuristicLab.Problems.BinPacking.Decoders {
    3435  [Item("Identical bin, three dimensional, extreme points based decoder for the MultiComponentVector encoding.", "<Description missing...>")]
    3536  [StorableClass]
    36   public class ExtremePointMultiComponentVectorDecoder3D : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, I3DMCVDecoder {
     37  public class ExtremePointMultiComponentVectorDecoder3D : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem>, I3DMCVDecoder {
    3738    public ExtremePointMultiComponentVectorDecoder3D () : base() { }
    3839    [StorableConstructor]
    … …  
    4546    }
    4647
    47     public static PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> Decode(MultiComponentVectorEncoding solution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures, bool stackingConstraints) {
     48    public static PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> Decode(MultiComponentVectorEncoding solution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures, bool stackingConstraints) {
    4849      PackingPlan3D result = new PackingPlan3D(binMeasures, true, stackingConstraints);
    4950      result.Pack(solution, itemMeasures);
    … …  
    5152    }
    5253
    53     public override PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
     54    public override PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
    5455      var solution = encodedSolution as MultiComponentVectorEncoding;
    5556      if (solution == null) throw new InvalidOperationException("Encoding is not of type MultiComponentVector");

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder3D.cs

    r13032 r14045  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.PackingBin;
     27
    2828using HeuristicLab.Problems.BinPacking.PackingItem;
    2929using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    … …  
    3131using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    3232using HeuristicLab.Problems.BinPacking.Interfaces;
     33using HeuristicLab.Problems.BinPacking.Shapes;
    3334
    3435namespace HeuristicLab.Problems.BinPacking.Decoders {
    3536  [Item("Identical bin, three dimensional, extreme points based decoder for the PackingSequence encoding.", "<Description missing...>")]
    3637  [StorableClass]
    37   public class ExtremePointPackingSequenceDecoder3D : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, I3DPSDecoder {
     38  public class ExtremePointPackingSequenceDecoder3D : PackingSolutionDecoder<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem>, I3DPSDecoder {
    3839    public ExtremePointPackingSequenceDecoder3D () : base() {}
    3940    [StorableConstructor]
    … …  
    4748
    4849
    49     public override PackingPlan<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingBin binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
     50    public override PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> CreatePackingPlanFromEncoding(IItem encodedSolution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures) {
    5051      var solution = encodedSolution as PackingSequenceEncoding;
    5152      if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence");
Note: See TracChangeset for help on using the changeset viewer.