Changeset 15473 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Packer

Timestamp:

11/15/17 12:30:13 (7 years ago)

Author:

rhanghof

Message:

#2817:
-Added unit tests
-Refactoring of bp 3D

Location:

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Packer

Files:

• BinPacker.cs (modified) (1 diff)
• BinPackerFirstFit.cs (modified) (1 diff)
• BinPackerFreeVolumeBestFit.cs (modified) (2 diffs)
• BinPackerResidualSpaceBestFit.cs (modified) (2 diffs)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Packer/BinPacker.cs

@@ -54 +54 @@
     /// <param name="packingItem"></param>
     /// <param name="position"></param>
-    protected void PackItem(ref BinPacking3D packingBin, int itemId, PackingItem packingItem, PackingPosition position, bool useStackingConstraints) {
+    protected virtual void PackItem(BinPacking3D packingBin, int itemId, PackingItem packingItem, PackingPosition position, bool useStackingConstraints) {
 
       packingBin.PackItem(itemId, packingItem, position);

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Packer/BinPackerFirstFit.cs

@@ -67 +67 @@
         // if a valid packing position could be found, the current item can be added to the given bin
         if (position != null) {
-          PackItem(ref packingBin, itemId, items[itemId], position, useStackingConstraints);
+          PackItem(packingBin, itemId, items[itemId], position, useStackingConstraints);
           remainingIds.Remove(itemId);
         }

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Packer/BinPackerFreeVolumeBestFit.cs

@@ -64 +64 @@
           var bin = packingBin;
           if (positionFound) {
-            PackItem(ref bin, remainingId, item, position, useStackingConstraints);
+            PackItem(bin, remainingId, item, position, useStackingConstraints);
             break;
           }
@@ -77 +77 @@
           }
 
-          PackItem(ref packingBin, remainingId, item, position, useStackingConstraints);
+          PackItem(packingBin, remainingId, item, position, useStackingConstraints);
           packingList.Add(packingBin);
         }

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Packer/BinPackerResidualSpaceBestFit.cs

@@ -56 +56 @@
           if (point.Item1.IsPositionFeasible(item, point.Item2, useStackingConstraints)) {
             var binPacking = point.Item1;
-            PackItem(ref binPacking, remainingId, item, point.Item2, useStackingConstraints);
+            PackItem(binPacking, remainingId, item, point.Item2, useStackingConstraints);
             packed = true;
             break;
@@ -66 +66 @@
           var position = FindPackingPositionForItem(binPacking, item, useStackingConstraints, rotated);
           if (position != null) {
-            PackItem(ref binPacking, remainingId, item, position, useStackingConstraints);
+            PackItem(binPacking, remainingId, item, position, useStackingConstraints);
           } else {
             throw new InvalidOperationException("Item " + remainingId + " cannot be packed in an empty bin.");