Changeset 13497 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes

Timestamp:

01/12/16 10:42:58 (8 years ago)

Author:

gkronber

Message:

#1966: fixed various problems: bugs in cloning, bugs in persistence, method names, various minor improvements of source code for readability.

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes

Files:

• CuboidPackingShape.cs (modified) (2 diffs)
• PackingShape.cs (modified) (2 diffs)
• RectangularPackingShape.cs (modified) (8 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs

@@ -21 +21 @@
 
 using System;
+using System.Diagnostics;
 using HeuristicLab.Problems.BinPacking.Interfaces;
 using HeuristicLab.Core;
@@ -148 +149 @@
 
     public int CompareTo(object obj) {
-      if (obj.GetType() == this.GetType())
-        return this.CompareTo((CuboidPackingShape)obj);
-      else return 0;
+      var other = (CuboidPackingShape)obj;
+      if (other != null) return CompareTo(other);
+      else throw new ArgumentException(string.Format("Cannot compare with object {0}", obj), "obj");
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/PackingShape.cs

@@ -30 +30 @@
   [Item("PackingShape", "Represents an abstract shape to describe the measures and the positioning of objects related to bin-packing problems.")]
   [StorableClass]
-  public abstract class PackingShape<D> : Item, IPackingShape
-    where D : class, IPackingDimensions {
+  public abstract class PackingShape<T> : Item, IPackingShape
+    where T : class, IPackingDimensions {
     public static Type PositionType {
-      get { return typeof(D); }
+      get { return typeof(T); }
     }
 
-    public abstract bool EnclosesPoint(D myPosition, D checkedPoint);
-    public abstract bool Encloses(D checkedPosition, PackingShape<D> checkedShape);
-    public abstract bool Overlaps(D myPosition, D checkedPosition, PackingShape<D> checkedShape);
+    public abstract bool EnclosesPoint(T myPosition, T checkedPoint);
+    public abstract bool Encloses(T checkedPosition, PackingShape<T> checkedShape);
+    public abstract bool Overlaps(T myPosition, T checkedPosition, PackingShape<T> checkedShape);
     public abstract void InitializeFromMeasures(int[] measures);
     public abstract int[] ToArray();
     public abstract int MultipliedMeasures { get; }
-    public abstract D Origin { get; }
+    public abstract T Origin { get; }
 
     protected PackingShape(int[] measures) {
@@ -53 +53 @@
     [StorableConstructor]
     protected PackingShape(bool deserializing) : base(deserializing) { }
-    protected PackingShape(PackingShape<D> original, Cloner cloner)
+    protected PackingShape(PackingShape<T> original, Cloner cloner)
       : base(original, cloner) {
     }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/RectangularPackingShape.cs

@@ -33 +33 @@
   public abstract class RectangularPackingShape : PackingShape<TwoDimensionalPacking>, IRegularPackingShape, IComparable<RectangularPackingShape> {
     #region Properties
-    /// <summary>
-    /// Describes the size on the Y-axis
-    /// </summary> 
     [Storable]
     public int Height { get; set; }
-    /// <summary>
-    /// Describes the size on the X-axis
-    /// </summary>  
+
     [Storable]
     public int Width { get; set; }
@@ -60 +55 @@
     private bool Encloses(TwoDimensionalPacking checkedPosition, RectangularPackingShape checkedShape) {
       return Encloses(new RectangleDiagonal(this), new RectangleDiagonal(checkedPosition, checkedShape));
-    }       
+    }
     private bool Encloses(RectangleDiagonal r1, RectangleDiagonal r2) {
-      return  ( r1.x1 <= r2.x1 &&
+      return (r1.x1 <= r2.x1 &&
                 r1.x2 >= r2.x2 &&
                 r1.y1 <= r2.y1 &&
@@ -71 +66 @@
       return Overlaps(myPosition, checkedPosition, (RectangularPackingShape)checkedShape);
     }
-    private bool Overlaps(TwoDimensionalPacking myPosition, TwoDimensionalPacking checkedPosition, RectangularPackingShape checkedShape) {    
-      return Overlaps(new RectangleDiagonal (myPosition, this),new RectangleDiagonal (checkedPosition, checkedShape));
+    private bool Overlaps(TwoDimensionalPacking myPosition, TwoDimensionalPacking checkedPosition, RectangularPackingShape checkedShape) {
+      return Overlaps(new RectangleDiagonal(myPosition, this), new RectangleDiagonal(checkedPosition, checkedShape));
     }
     private bool Overlaps(RectangleDiagonal r1, RectangleDiagonal r2) {
@@ -90 +85 @@
     #endregion
 
-    public RectangularPackingShape(int width, int height) : base () {
+    protected RectangularPackingShape() : base() { }
+    protected RectangularPackingShape(int width, int height)
+      : base() {
       this.Height = height;
       this.Width = width;
@@ -101 +98 @@
       this.Height = measures[1];
     }
-    public override int[] ToArray() {
-      return new int[] { Width, Height };
-    }
+
 
     [StorableConstructor]
@@ -112 +107 @@
       this.Height = original.Height;
     }
-    public RectangularPackingShape() : base() {}
 
     public override string ToString() {
@@ -124 +118 @@
       if (result == 0) {
         result = this.Width.CompareTo(other.Width);
-        if (result == 0) 
+        if (result == 0)
           result = this.Height.CompareTo(other.Height);
       }
@@ -131 +125 @@
 
     public int CompareTo(object obj) {
-      if (obj.GetType().Equals(this.GetType()))
-        return this.CompareTo((RectangularPackingShape)obj);
-      else return 0;
+      var other = obj as RectangularPackingShape;
+      if (other != null) return CompareTo(other);
+      else throw new ArgumentException(string.Format("Cannot compare to object {0}", obj), "obj");
     }
 
     #endregion
+
+    public override int[] ToArray() {
+      return new int[] { Width, Height };
+    }
 
     private struct RectangleDiagonal {