Changeset 13461 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs

Timestamp:

12/14/15 19:52:46 (8 years ago)

Author:

gkronber

Message:

#1966:

• used Items instead of NamedItems and adapted views (Names/Descriptions) were not set anyway
• fixed problems identified by Essential unit tests

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs (modified) (7 diffs)

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

@@ -31 +31 @@
   [StorableClass]
   public abstract class CuboidPackingShape : PackingShape<ThreeDimensionalPacking>, IRegularPackingShape, IComparable<CuboidPackingShape> {
-    #region Properties 
+    #region Properties
     /// <summary>
     /// Describes the size on the X-axis
@@ -62 +62 @@
     }
     public override bool Encloses(ThreeDimensionalPacking checkedPosition, PackingShape<ThreeDimensionalPacking> checkedShape) {
-      return Encloses(checkedPosition, (CuboidPackingShape) checkedShape);
+      return Encloses(checkedPosition, (CuboidPackingShape)checkedShape);
     }
     private bool Encloses(ThreeDimensionalPacking checkedPosition, CuboidPackingShape checkedShape) {
       return Encloses(new CuboidDiagonal(this), new CuboidDiagonal(checkedPosition, checkedShape));
-    }  
+    }
     private bool Encloses(CuboidDiagonal c1, CuboidDiagonal c2) {
       return (c1.x1 <= c2.x1 &&
@@ -84 +84 @@
     private bool Overlaps(CuboidDiagonal c1, CuboidDiagonal c2) {
       return !(c1.x1 > c2.x2 ||
-               c1.y1 > c2.y2 ||  
+               c1.y1 > c2.y2 ||
                c1.z1 > c2.z2 ||
                c1.x2 < c2.x1 ||
@@ -98 +98 @@
       }
     }
-    #endregion        
+    #endregion
 
-    public CuboidPackingShape(int width, int height, int depth) : base () {
+    protected CuboidPackingShape(int width, int height, int depth)
+      : base() {
       this.Width = width;
       this.Height = height;
@@ -108 +109 @@
     public override void InitializeFromMeasures(int[] measures) {
       if (measures.Length != 3)
-        throw new InvalidOperationException("Nr of measures does not fit shape-dimension.");        
+        throw new InvalidOperationException("Nr of measures does not fit shape-dimension.");
       this.Width = measures[0];
       this.Height = measures[1];
@@ -125 +126 @@
       this.Depth = original.Depth;
     }
-    public CuboidPackingShape() : base(){ }
+
+    protected CuboidPackingShape() : base() { }
 
     public override string ToString() {
@@ -136 +138 @@
       //Using "Clustered-Area-Height"-comparison as descr
 
-      int result = (this.Width * this.Depth).CompareTo (other.Width * other.Depth);
-    
-    if (result == 0)
-    result = this.MultipliedMeasures.CompareTo(other.MultipliedMeasures);
-      //if (result == 0) {
-      //  result = this.Depth.CompareTo(other.Depth) + this.Width.CompareTo(other.Width);
-      //  if (result == 0) {        
-      //    result = this.Width.CompareTo(other.Width);
-    if (result == 0)               
-    result = this.Height.CompareTo(other.Height);
-      //  }
-      //}
+      int result = (this.Width * this.Depth).CompareTo(other.Width * other.Depth);
+
+      if (result == 0)
+        result = this.MultipliedMeasures.CompareTo(other.MultipliedMeasures);
+      if (result == 0)
+        result = this.Height.CompareTo(other.Height);
       return result;
-    }        
+    }
 
     public int CompareTo(object obj) {
-      if (obj.GetType().Equals(this.GetType()))
+      if (obj.GetType() == this.GetType())
         return this.CompareTo((CuboidPackingShape)obj);
       else return 0;
     }
 
-    #endregion 
+    #endregion
 
     private struct CuboidDiagonal {