Changeset 9598 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem

Timestamp:

06/07/13 15:35:12 (12 years ago)

Author:

jhelm

Message:

#1966: Fixed a bug which caused the stacking-contraint to be wrongly enforced; Did some cleanup;

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem

Files:

• CuboidIdenticalBinPackingProblem.cs (modified) (1 diff)
• RectangularIdenticalBinPackingProblem.cs (modified) (1 diff)
• RegularIdenticalBinPackingProblem.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/CuboidIdenticalBinPackingProblem.cs

@@ -145 +145 @@
       Load(DefaultInstance);
     }
+
+    protected override void RemoveTooBigItems() {
+      PackingItemMeasures.RemoveAll(pi => 
+        !PackingBinMeasures.Encloses (new ThreeDimensionalPacking(0, 0, 0, 0, false), pi) &&
+        !PackingBinMeasures.Encloses(new ThreeDimensionalPacking(0, 0, 0, 0, true), pi));
+    }
     #endregion
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RectangularIdenticalBinPackingProblem.cs

@@ -139 +139 @@
       Load(DefaultInstance);
     }
+
+    protected override void RemoveTooBigItems() {
+      PackingItemMeasures.RemoveAll(pi =>
+        !PackingBinMeasures.Encloses(new TwoDimensionalPacking(0, 0, 0, false), pi) &&
+        !PackingBinMeasures.Encloses(new TwoDimensionalPacking(0, 0, 0, true), pi));
+    }
     #endregion
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RegularIdenticalBinPackingProblem.cs

@@ -43 +43 @@
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
+using HeuristicLab.Problems.BinPacking.Dimensions;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -100 +101 @@
       ApplyHorizontalOrientation();
       SortItems();
+      RemoveTooBigItems();
       PackingItemsParameter.Value.Value = PackingItemMeasures.Count;
       LowerBoundParameter.Value.Value = CalculateLowerBound();
     }
+    protected abstract void RemoveTooBigItems();
     protected abstract void InitializeProblemData();
     protected abstract IPackingPlanEvaluator CreateDefaultEvaluator();