Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/16 19:44:08 (8 years ago)
Author:
gkronber
Message:

#1966: renamed PackingPlan* -> Solution

Location:
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3
Files:
7 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r14046 r14047  
    4545      var solution = encodedSolution as GroupingVectorEncoding;
    4646      if (solution == null) throw new InvalidOperationException("Encoding is not of type GroupingVector");
    47       PackingPlan3D result = new PackingPlan3D(binMeasures);
     47      Solution result = new Solution(binMeasures);
    4848      result.Pack(solution, itemMeasures);
    4949      return result;

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

    r14046 r14047  
    4545      var solution = encodedSolution as MultiComponentVectorEncoding;
    4646      if (solution == null) throw new InvalidOperationException("Encoding is not of type MultiComponent Vector");
    47       PackingPlan3D result = new PackingPlan3D(binMeasures);
     47      Solution result = new Solution(binMeasures);
    4848      result.Pack(solution, itemMeasures);
    4949      return result;

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

    r14046 r14047  
    4545      var solution = encodedSolution as PackingSequenceEncoding;
    4646      if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence");
    47       PackingPlan3D result = new PackingPlan3D(binMeasures);
     47      Solution result = new Solution(binMeasures);
    4848      result.Pack(solution, itemMeasures);
    4949      return result;

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

    r14046 r14047  
    4343
    4444    public static PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> Decode(GroupingVectorEncoding solution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures, bool stackingConstraints) {
    45       PackingPlan3D result = new PackingPlan3D(binMeasures, true, stackingConstraints);
     45      Solution result = new Solution(binMeasures, true, stackingConstraints);
    4646      result.Pack(solution, itemMeasures);
    4747      return result;

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

    r14046 r14047  
    4343
    4444    public static PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> Decode(MultiComponentVectorEncoding solution, CuboidPackingShape binMeasures, ItemList<CuboidPackingItem> itemMeasures, bool stackingConstraints) {
    45       PackingPlan3D result = new PackingPlan3D(binMeasures, true, stackingConstraints);
     45      Solution result = new Solution(binMeasures, true, stackingConstraints);
    4646      result.Pack(solution, itemMeasures);
    4747      return result;

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

    r14046 r14047  
    4747      var solution = encodedSolution as PackingSequenceEncoding;
    4848      if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence");
    49       PackingPlan3D result = new PackingPlan3D(binMeasures, true, StackingConstraintsParameter.Value.Value);
     49      Solution result = new Solution(binMeasures, true, StackingConstraintsParameter.Value.Value);
    5050      result.Pack(solution, itemMeasures);
    5151      return result;

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/HeuristicLab.Problems.BinPacking3D-3.3.csproj

    r14045 r14047  
    175175    <Compile Include="MoveEvaluators\PackingMoveEvaluator3DMCV.cs" />
    176176    <Compile Include="MoveEvaluators\PackingMoveEvaluator3DPS.cs" />
    177     <Compile Include="PackingPlan3D.cs" />
    178177    <Compile Include="PackingRatioCuboidIdenticalBinEvaluator.cs" />
    179178    <Compile Include="Plugin.cs" />
    180179    <Compile Include="Properties\AssemblyInfo.cs" />
     180    <Compile Include="Solution.cs" />
    181181    <Compile Include="ThreeDimensionalPacking.cs" />
    182182  </ItemGroup>

  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Solution.cs

    r14046 r14047  
    55
    66namespace HeuristicLab.Problems.BinPacking3D {
    7   [Item("PackingPlan3D", "Represents a solution for a 3D bin packing problem.")]
     7  [Item("Bin Packing Solution (3d)", "Represents a solution for a 3D bin packing problem.")]
    88  [StorableClass]
    9   public class PackingPlan3D : PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> {
    10     public PackingPlan3D(CuboidPackingShape binMeasures) : this(binMeasures, false, false) { }
    11     public PackingPlan3D(CuboidPackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
     9  public class Solution : PackingPlan<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> {
     10    public Solution(CuboidPackingShape binMeasures) : this(binMeasures, false, false) { }
     11    public Solution(CuboidPackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
    1212    [StorableConstructor]
    13     protected PackingPlan3D(bool deserializing) : base(deserializing) { }
    14     protected PackingPlan3D(PackingPlan3D original, Cloner cloner)
     13    protected Solution(bool deserializing) : base(deserializing) { }
     14    protected Solution(Solution original, Cloner cloner)
    1515      : base(original, cloner) {
    1616    }
    1717    public override IDeepCloneable Clone(Cloner cloner) {
    18       return new PackingPlan3D(this, cloner);
     18      return new Solution(this, cloner);
    1919    }
    2020    public override BinPacking<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> NewBinPacking() {
Note: See TracChangeset for help on using the changeset viewer.