Changeset 14045 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingPlan2D.cs

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

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingPlan2D.cs (modified) (2 diffs)

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

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.BinPacking.Dimensions;
-using HeuristicLab.Problems.BinPacking.PackingBin;
+
 using HeuristicLab.Problems.BinPacking.PackingItem;
+using HeuristicLab.Problems.BinPacking.Shapes;
 
 namespace HeuristicLab.Problems.BinPacking2D {
   [Item("PackingPlan2D", "Represents a solution for a 2D bin packing problem.")]
   [StorableClass]
-  public class PackingPlan2D : PackingPlan<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> {
-    public PackingPlan2D(RectangularPackingBin binMeasures) : this(binMeasures, false, false) { }
-    public PackingPlan2D(RectangularPackingBin binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
+  public class PackingPlan2D : PackingPlan<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> {
+    public PackingPlan2D(RectangularPackingShape binMeasures) : this(binMeasures, false, false) { }
+    public PackingPlan2D(RectangularPackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
     [StorableConstructor]
     protected PackingPlan2D(bool deserializing) : base(deserializing) { }
@@ -42 +43 @@
       return new PackingPlan2D(this, cloner);
     }
-    public override BinPacking<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> NewBinPacking() {
+    public override BinPacking<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> NewBinPacking() {
       return new Encodings.PackingEncoding.PackingPlan.BinPacking2D(BinMeasures);
     }