Changeset 14045 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularPackingItem.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/RectangularPackingItem.cs (modified) (3 diffs)

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

@@ -28 +28 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Problems.BinPacking.PackingBin;
+
 
 namespace HeuristicLab.Problems.BinPacking.PackingItem {
@@ -35 +35 @@
   public class RectangularPackingItem : RectangularPackingShape, IPackingItem {
 
-    public RectangularPackingBin TargetBin {
-      get { return ((IValueParameter<RectangularPackingBin>)Parameters["TargetBin"]).Value; }
-      set { ((IValueParameter<RectangularPackingBin>)Parameters["TargetBin"]).Value = value; }
+    public RectangularPackingShape TargetBin {
+      get { return ((IValueParameter<RectangularPackingShape>)Parameters["TargetBin"]).Value; }
+      set { ((IValueParameter<RectangularPackingShape>)Parameters["TargetBin"]).Value = value; }
     }
 
@@ -62 +62 @@
     public RectangularPackingItem()
       : base() {
-      Parameters.Add(new ValueParameter<RectangularPackingBin>("TargetBin"));
+      Parameters.Add(new ValueParameter<RectangularPackingShape>("TargetBin"));
       Parameters.Add(new FixedValueParameter<DoubleValue>("Weight"));
       Parameters.Add(new FixedValueParameter<IntValue>("Material"));
     }
 
-    public RectangularPackingItem(int width, int height, RectangularPackingBin targetBin)
+    public RectangularPackingItem(int width, int height, RectangularPackingShape targetBin)
       : this() {
       this.Width = width;
       this.Height = height;
-      this.TargetBin = (RectangularPackingBin)targetBin.Clone();
+      this.TargetBin = (RectangularPackingShape)targetBin.Clone();
     }