Changeset 14049 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingShape.cs

Timestamp:

07/12/16 20:03:45 (8 years ago)

Author:

gkronber

Message:

#1966: simplified class names

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingShape.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularPackingShape.cs) (8 diffs)

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.BinPacking2D {
-  [Item("RectangularPackingShape", "Represents the rectangular measures (width, height) of a two-dimensional bin-packing object.")]
+  [Item("PackingShape (2d)", "Represents the rectangular measures (width, height) of a two-dimensional bin-packing object.")]
   [StorableClass]
-  public class RectangularPackingShape : PackingShape<PackingPosition>, IComparable<RectangularPackingShape> {
+  public class PackingShape : PackingShape<PackingPosition>, IComparable<PackingShape> {
     public int Height {
       get { return ((IFixedValueParameter<IntValue>)Parameters["Height"]).Value.Value; }
@@ -44 +44 @@
 
     [StorableConstructor]
-    protected RectangularPackingShape(bool deserializing) : base(deserializing) { }
-    protected RectangularPackingShape(RectangularPackingShape original, Cloner cloner)
+    protected PackingShape(bool deserializing) : base(deserializing) { }
+    protected PackingShape(PackingShape original, Cloner cloner)
       : base(original, cloner) {
     }
-    public RectangularPackingShape()
+    public PackingShape()
       : base() {
       Parameters.Add(new FixedValueParameter<IntValue>("Width"));
       Parameters.Add(new FixedValueParameter<IntValue>("Height"));
     }
-    public RectangularPackingShape(int width, int height)
+    public PackingShape(int width, int height)
       : this() {
       this.Height = height;
@@ -60 +60 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new RectangularPackingShape(this, cloner);
+      return new PackingShape(this, cloner);
     }
 
@@ -69 +69 @@
     #region IComparable<RectangularPackingShape> Members
 
-    public int CompareTo(RectangularPackingShape other) {
+    public int CompareTo(PackingShape other) {
       int result = this.Width.CompareTo(other.Width);
       if (result == 0)
@@ -77 +77 @@
 
     public override int CompareTo(object obj) {
-      var other = obj as RectangularPackingShape;
+      var other = obj as PackingShape;
       if (other != null) return CompareTo(other);
       else throw new ArgumentException(string.Format("Cannot compare to object {0}", obj), "obj");
@@ -96 +96 @@
     }
     public override bool Encloses(PackingPosition checkedPosition, PackingShape<PackingPosition> checkedShape) {
-      return Encloses(checkedPosition, (RectangularPackingShape)checkedShape);
+      return Encloses(checkedPosition, (PackingShape)checkedShape);
     }
-    private bool Encloses(PackingPosition checkedPosition, RectangularPackingShape checkedShape) {
+    private bool Encloses(PackingPosition checkedPosition, PackingShape checkedShape) {
       return Encloses(new RectangleDiagonal(this), new RectangleDiagonal(checkedPosition, checkedShape));
     }
@@ -109 +109 @@
 
     public override bool Overlaps(PackingPosition myPosition, PackingPosition checkedPosition, PackingShape<PackingPosition> checkedShape) {
-      return Overlaps(myPosition, checkedPosition, (RectangularPackingShape)checkedShape);
+      return Overlaps(myPosition, checkedPosition, (PackingShape)checkedShape);
     }
-    private bool Overlaps(PackingPosition myPosition, PackingPosition checkedPosition, RectangularPackingShape checkedShape) {
+    private bool Overlaps(PackingPosition myPosition, PackingPosition checkedPosition, PackingShape checkedShape) {
       return Overlaps(new RectangleDiagonal(myPosition, this), new RectangleDiagonal(checkedPosition, checkedShape));
     }
@@ -136 +136 @@
       public int x2;
       public int y2;
-      public RectangleDiagonal(RectangularPackingShape myShape) : this(new PackingPosition(0, 0, 0), myShape) { }
-      public RectangleDiagonal(PackingPosition myPosition, RectangularPackingShape myShape) {
+      public RectangleDiagonal(PackingShape myShape) : this(new PackingPosition(0, 0, 0), myShape) { }
+      public RectangleDiagonal(PackingPosition myPosition, PackingShape myShape) {
         x1 = myPosition.X;
         y1 = myPosition.Y;