Changeset 14047
- Timestamp:
- 07/12/16 19:44:08 (8 years ago)
- Location:
- branches/HeuristicLab.BinPacking
- Files:
-
- 1 added
- 1 deleted
- 14 edited
- 1 moved
-
HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftGroupingVectorDecoder.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftMultiComponentVectorDecoder.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftPackingSequenceDecoder.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder2D.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder2D.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder2D.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.2D/3.3/HeuristicLab.Problems.BinPacking2D-3.3.csproj (modified) (2 diffs)
-
HeuristicLab.Problems.BinPacking.2D/3.3/PackingPlan2D.cs (deleted)
-
HeuristicLab.Problems.BinPacking.2D/3.3/Solution.cs (added)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftGroupingVectorDecoder.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftMultiComponentVectorDecoder.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftPackingSequenceDecoder.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder3D.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder3D.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder3D.cs (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/HeuristicLab.Problems.BinPacking3D-3.3.csproj (modified) (1 diff)
-
HeuristicLab.Problems.BinPacking.3D/3.3/Solution.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/PackingPlan3D.cs) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftGroupingVectorDecoder.cs
r14046 r14047 45 45 var solution = encodedSolution as GroupingVectorEncoding; 46 46 if (solution == null) throw new InvalidOperationException("Encoding is not of type GroupingVector"); 47 PackingPlan2D result = new PackingPlan2D(binMeasures);47 Solution result = new Solution(binMeasures); 48 48 result.Pack(solution, itemMeasures); 49 49 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftMultiComponentVectorDecoder.cs
r14046 r14047 45 45 var solution = encodedSolution as MultiComponentVectorEncoding; 46 46 if (solution == null) throw new InvalidOperationException("Encoding is not of type MultiComponent Vector"); 47 PackingPlan2D result = new PackingPlan2D(binMeasures);47 Solution result = new Solution(binMeasures); 48 48 result.Pack(solution, itemMeasures); 49 49 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftPackingSequenceDecoder.cs
r14046 r14047 47 47 var solution = encodedSolution as PackingSequenceEncoding; 48 48 if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence"); 49 PackingPlan2D result = new PackingPlan2D(binMeasures);49 Solution result = new Solution(binMeasures); 50 50 result.Pack(solution, itemMeasures); 51 51 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder2D.cs
r14046 r14047 44 44 45 45 public static PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> Decode(GroupingVectorEncoding solution, RectangularPackingShape binMeasures, ItemList<RectangularPackingItem> itemMeasures) { 46 PackingPlan2D result = new PackingPlan2D(binMeasures, true, false);46 Solution result = new Solution(binMeasures, true, false); 47 47 result.Pack(solution, itemMeasures); 48 48 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder2D.cs
r14046 r14047 43 43 44 44 public static PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> Decode(MultiComponentVectorEncoding solution, RectangularPackingShape binMeasures, ItemList<RectangularPackingItem> itemMeasures) { 45 PackingPlan2D result = new PackingPlan2D(binMeasures, true, false);45 Solution result = new Solution(binMeasures, true, false); 46 46 result.Pack(solution, itemMeasures); 47 47 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder2D.cs
r14046 r14047 47 47 var solution = encodedSolution as PackingSequenceEncoding; 48 48 if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence"); 49 PackingPlan2D result = new PackingPlan2D(binMeasures, true, false);49 Solution result = new Solution(binMeasures, true, false); 50 50 result.Pack(solution, itemMeasures); 51 51 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/HeuristicLab.Problems.BinPacking2D-3.3.csproj
r14045 r14047 172 172 <Compile Include="MoveEvaluators\PackingMoveEvaluator2DMCV.cs" /> 173 173 <Compile Include="MoveEvaluators\PackingMoveEvaluator2DPS.cs" /> 174 <Compile Include="PackingPlan2D.cs" />175 174 <Compile Include="PackingRatioRectangularIdenticalBinEvaluator.cs" /> 176 175 <Compile Include="Plugin.cs" /> … … 179 178 <Compile Include="RectangularPackingItem.cs" /> 180 179 <Compile Include="RectangularPackingShape.cs" /> 180 <Compile Include="Solution.cs" /> 181 181 <Compile Include="TwoDimensionalPacking.cs" /> 182 182 </ItemGroup> -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftGroupingVectorDecoder.cs
r14046 r14047 45 45 var solution = encodedSolution as GroupingVectorEncoding; 46 46 if (solution == null) throw new InvalidOperationException("Encoding is not of type GroupingVector"); 47 PackingPlan3D result = new PackingPlan3D(binMeasures);47 Solution result = new Solution(binMeasures); 48 48 result.Pack(solution, itemMeasures); 49 49 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftMultiComponentVectorDecoder.cs
r14046 r14047 45 45 var solution = encodedSolution as MultiComponentVectorEncoding; 46 46 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); 48 48 result.Pack(solution, itemMeasures); 49 49 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftPackingSequenceDecoder.cs
r14046 r14047 45 45 var solution = encodedSolution as PackingSequenceEncoding; 46 46 if (solution == null) throw new InvalidOperationException("Encoding is not of type PackingSequence"); 47 PackingPlan3D result = new PackingPlan3D(binMeasures);47 Solution result = new Solution(binMeasures); 48 48 result.Pack(solution, itemMeasures); 49 49 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder3D.cs
r14046 r14047 43 43 44 44 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); 46 46 result.Pack(solution, itemMeasures); 47 47 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder3D.cs
r14046 r14047 43 43 44 44 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); 46 46 result.Pack(solution, itemMeasures); 47 47 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder3D.cs
r14046 r14047 47 47 var solution = encodedSolution as PackingSequenceEncoding; 48 48 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); 50 50 result.Pack(solution, itemMeasures); 51 51 return result; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/HeuristicLab.Problems.BinPacking3D-3.3.csproj
r14045 r14047 175 175 <Compile Include="MoveEvaluators\PackingMoveEvaluator3DMCV.cs" /> 176 176 <Compile Include="MoveEvaluators\PackingMoveEvaluator3DPS.cs" /> 177 <Compile Include="PackingPlan3D.cs" />178 177 <Compile Include="PackingRatioCuboidIdenticalBinEvaluator.cs" /> 179 178 <Compile Include="Plugin.cs" /> 180 179 <Compile Include="Properties\AssemblyInfo.cs" /> 180 <Compile Include="Solution.cs" /> 181 181 <Compile Include="ThreeDimensionalPacking.cs" /> 182 182 </ItemGroup> -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Solution.cs
r14046 r14047 5 5 6 6 namespace 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.")] 8 8 [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) { } 12 12 [StorableConstructor] 13 protected PackingPlan3D(bool deserializing) : base(deserializing) { }14 protected PackingPlan3D(PackingPlan3Doriginal, Cloner cloner)13 protected Solution(bool deserializing) : base(deserializing) { } 14 protected Solution(Solution original, Cloner cloner) 15 15 : base(original, cloner) { 16 16 } 17 17 public override IDeepCloneable Clone(Cloner cloner) { 18 return new PackingPlan3D(this, cloner);18 return new Solution(this, cloner); 19 19 } 20 20 public override BinPacking<ThreeDimensionalPacking, CuboidPackingShape, CuboidPackingItem> NewBinPacking() {
Note: See TracChangeset
for help on using the changeset viewer.
