Changeset 14043 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularPackingShape.cs

Timestamp:

07/12/16 18:02:28 (9 years ago)

Author:

gkronber

Message:

#1966: removed interface IRegularPacking shape (=> all our packing shapes are regular)

File:

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

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

@@ -33 +33 @@
   [Item("RectangularPackingShape", "Represents the rectangular measures (width, height) of a two-dimensional bin-packing object.")]
   [StorableClass]
-  public abstract class RectangularPackingShape : PackingShape<TwoDimensionalPacking>, IRegularPackingShape, IComparable<RectangularPackingShape> {
+  public abstract class RectangularPackingShape : PackingShape<TwoDimensionalPacking>, IComparable<RectangularPackingShape> {
     public int Height {
       get { return ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value; }
@@ -73 +73 @@
     }
 
-    public int CompareTo(object obj) {
+    public override int CompareTo(object obj) {
       var other = obj as RectangularPackingShape;
       if (other != null) return CompareTo(other);
@@ -118 +118 @@
     }
 
-    public void ApplyHorizontalOrientation() {
+    public override void ApplyHorizontalOrientation() {
       if (Width < Height) {
         var aux = Width;