Changeset 15418 for branches

Timestamp:

10/11/17 16:17:13 (7 years ago)

Author:

rhanghof

Message:

#2817:

• New RandomInstanceProvider added for testing the EP-algorithm with the same instances as Silvano Martello, David Pisinger, Daniele Vigo in their paper.
• Added some Unit Tests for the BinPacking-3D EP-algorithm

Location:

branches/2817-BinPackingSpeedup

Files:

• HeuristicLab.Problems.BinPacking/3.3/3D/Instances/RandomInstanceProvider.cs (modified) (4 diffs)
• HeuristicLab.Problems.BinPacking/3.3/3D/Instances/RandomInstanceProviderWithSRand.cs (added)
• HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Problems.Bin-Packing-3.3 (added)
• HeuristicLab.Tests/HeuristicLab.Problems.Bin-Packing-3.3/AlgorithmTest.cs (added)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (1 diff)

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

@@ -26 +26 @@
 using System.IO;
 using System.Linq;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Problems.Instances;
@@ -83 +84 @@
 
   // class 9 from the paper (all-fill) is not implemented 
+
+
   public abstract class RandomInstanceProvider : ProblemInstanceProvider<BPPData>, IProblemInstanceProvider<BPPData> {
+
+
 
     protected int @class;
@@ -122 +127 @@
     public override BPPData LoadData(IDataDescriptor dd) {
       var randDd = dd as RandomDataDescriptor;
-      if (randDd == null) throw new NotSupportedException("Cannot load data descriptor " + dd);
+      if (randDd == null)
+        throw new NotSupportedException("Cannot load data descriptor " + dd);
 
       var data = new BPPData() {
@@ -161 +167 @@
       switch (type) {
         case 1: {
-            minW = 1; maxW = w / 2; // integer division on purpose (see paper)
-            minH = h * 2 / 3; maxH = h;
-            minD = d * 2 / 3; maxD = d;
+            minW = 1;
+            maxW = w / 2; // integer division on purpose (see paper)
+            minH = h * 2 / 3;
+            maxH = h;
+            minD = d * 2 / 3;
+            maxD = d;
             break;
           }
         case 2: {
-            minW = w * 2 / 3; maxW = w;
-            minH = 1; maxH = h / 2;
-            minD = d * 2 / 3; maxD = d;
+            minW = w * 2 / 3;
+            maxW = w;
+            minH = 1;
+            maxH = h / 2;
+            minD = d * 2 / 3;
+            maxD = d;
             break;
           }
         case 3: {
-            minW = w * 2 / 3; maxW = w;
-            minH = h * 2 / 3; maxH = h;
-            minD = 1; maxD = d / 2;
+            minW = w * 2 / 3;
+            maxW = w;
+            minH = h * 2 / 3;
+            maxH = h;
+            minD = 1;
+            maxD = d / 2;
             break;
           }
         case 4: {
-            minW = w / 2; maxW = w;
-            minH = h / 2; maxH = h;
-            minD = d / 2; maxD = d;
+            minW = w / 2;
+            maxW = w;
+            minH = h / 2;
+            maxH = h;
+            minD = d / 2;
+            maxD = d;
             break;
           }
         case 5: {
-            minW = 1; maxW = w / 2;
-            minH = 1; maxH = h / 2;
-            minD = 1; maxD = d / 2;
+            minW = 1;
+            maxW = w / 2;
+            minH = 1;
+            maxH = h / 2;
+            minD = 1;
+            maxD = d / 2;
             break;
           }

branches/2817-BinPackingSpeedup/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

@@ -106 +106 @@
     <Compile Include="3D\Evaluators\BinUtilizationEvaluator.cs" />
     <Compile Include="3D\Evaluators\PackingRatioEvaluator.cs" />
+    <Compile Include="3D\Instances\RandomInstanceProviderWithSRand.cs" />
     <Compile Include="Algorithms\3D\ExtremePointAlgorithm.cs" />
     <Compile Include="3D\Instances\ThreeDInstanceDescriptor.cs" />

branches/2817-BinPackingSpeedup/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -583 +583 @@
     <Compile Include="HeuristicLab.PluginInfraStructure-3.3\InstallationManagerTest.cs" />
     <Compile Include="HeuristicLab.PluginInfraStructure-3.3\TypeExtensionsTest.cs" />
+    <Compile Include="HeuristicLab.Problems.Bin-Packing-3.3\AlgorithmTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\ThresholdCalculatorsTest.cs" />
     <Compile Include="HeuristicLab.Problems.DataAnalysis-3.4\OnlineCalculatorPerformanceTest.cs" />