Changeset 15989 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Instances

Timestamp:

07/09/18 12:59:38 (6 years ago)

Author:

rhanghof

Message:

#2817:

• Adjusted the unit tests
• Refactoring of the sorter
• Bugfix on the BinPackerResidualSpaceBestFit packer

File:

• branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Instances/RandomInstanceProvider.cs (modified) (1 diff)

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/3D/Instances/RandomInstanceProvider.cs

@@ -198 +198 @@
     protected virtual void SampleItemParameters(IRandom rand, out int w, out int h, out int d) {
       Contract.Assert(@class >= 1 && @class <= 5);
-      /*var weights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
+      var weights = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
       weights[@class - 1] = 0.6;
       var type = Enumerable.Range(1, 5).SampleProportional(rand, 1, weights).First();
-      */
-
-      // as by Martello and Vigo
-      int type = @class;
-      if (type <= 5) {
-        var t = rand.Next(1, 10);
-        if (t <= 5) {
-          type = t;
-        }
-      }
 
       switch (type) {