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

Timestamp:

06/02/13 04:26:26 (12 years ago)

Author:

jhelm

Message:

#1966: Implemented additional Operator-Wrappers for PackingSequence and GroupingVector; Implemented additional problem-class for Rosenbauer-Problemstatement; Added marker-interfaces for decoder-types;

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs (modified) (1 diff)

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

@@ -130 +130 @@
       //Using "Clustered-Area-Height"-comparison as descr
 
-      int result = this.MultipliedMeasures.CompareTo(other.MultipliedMeasures);
+      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);
+    if (result == 0)               
+    result = this.Height.CompareTo(other.Height);
       //  }
       //}