Changeset 15454 for branches/2817-BinPackingSpeedup/HeuristicLab.Tests/HeuristicLab.Problems.Bin-Packing-3.3/AlgorithmTest.cs

Timestamp:

11/07/17 08:24:24 (6 years ago)

Author:

rhanghof

Message:

#2817

• Extreme point bin packing does not need the occupation layer anymore
• Changes at the fitting algorithm. Now they are packing the items as in the paper of S. Martello, D. Pisinger, D. Vigo described

File:

• branches/2817-BinPackingSpeedup/HeuristicLab.Tests/HeuristicLab.Problems.Bin-Packing-3.3/AlgorithmTest.cs (modified) (12 diffs)

branches/2817-BinPackingSpeedup/HeuristicLab.Tests/HeuristicLab.Problems.Bin-Packing-3.3/AlgorithmTest.cs

@@ -3 +3 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using HeuristicLab.Problems.BinPacking3D;
+using HeuristicLab.Problems.BinPacking3D.Instances;
 using System.Collections.Generic;
 using System.Linq;
@@ -30 +31 @@
 
       var referenceItemLists = ReadReferenceItemLists();
-      TestRandomInstanceProviderByClass(new RandomInstanceClass1ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass2ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass3ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass4ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass5ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass6ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass7ProviderWithSRand(), referenceItemLists);
-      TestRandomInstanceProviderByClass(new RandomInstanceClass8ProviderWithSRand(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass1Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass2Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass3Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass4Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass5Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass6Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass7Provider(), referenceItemLists);
+      TestRandomInstanceProviderByClass(new RandomInstanceClass8Provider(), referenceItemLists);
 
     }
@@ -79 +80 @@
     }
 
-    private void TestRandomInstanceProviderByClass(RandomInstanceProviderWithSRand randomInstanceProvider, IDictionary<string, List<Dimension>> referenceItems) {
+    private void TestRandomInstanceProviderByClass(RandomInstanceProvider randomInstanceProvider, IDictionary<string, List<Dimension>> referenceItems) {
 
       var dataDescriptors = randomInstanceProvider.GetDataDescriptors();
@@ -111 +112 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass1() {
-      TestExtremePointAlgorithm(new RandomInstanceClass1ProviderWithSRand(), 1);
+      TestExtremePointAlgorithm(new RandomInstanceClass1Provider(), 1);
     }
 
@@ -117 +118 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass2() {
-      TestExtremePointAlgorithm(new RandomInstanceClass2ProviderWithSRand(), 2);
+      TestExtremePointAlgorithm(new RandomInstanceClass2Provider(), 2);
     }
 
@@ -123 +124 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass3() {
-      TestExtremePointAlgorithm(new RandomInstanceClass3ProviderWithSRand(), 3);
+      TestExtremePointAlgorithm(new RandomInstanceClass3Provider(), 3);
     }
 
@@ -129 +130 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass4() {
-      TestExtremePointAlgorithm(new RandomInstanceClass4ProviderWithSRand(), 4);
+      TestExtremePointAlgorithm(new RandomInstanceClass4Provider(), 4);
     }
 
@@ -135 +136 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass5() {
-      TestExtremePointAlgorithm(new RandomInstanceClass5ProviderWithSRand(), 5);
+      TestExtremePointAlgorithm(new RandomInstanceClass5Provider(), 5);
     }
 
@@ -141 +142 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass6() {
-      TestExtremePointAlgorithm(new RandomInstanceClass6ProviderWithSRand(), 6);
+      TestExtremePointAlgorithm(new RandomInstanceClass6Provider(), 6);
     }
 
@@ -147 +148 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass7() {
-      TestExtremePointAlgorithm(new RandomInstanceClass7ProviderWithSRand(), 7);
+      TestExtremePointAlgorithm(new RandomInstanceClass7Provider(), 7);
     }
 
@@ -153 +154 @@
     [TestCategory("Problems.BinPacking")]
     public void TestExtremePointAlgorithmClass8() {
-      TestExtremePointAlgorithm(new RandomInstanceClass8ProviderWithSRand(), 8);
-    }
-
-    private void TestExtremePointAlgorithm(RandomInstanceProviderWithSRand randomInstanceProvider, int @class) {
+      TestExtremePointAlgorithm(new RandomInstanceClass8Provider(), 8);
+    }
+
+    private void TestExtremePointAlgorithm(RandomInstanceProvider randomInstanceProvider, int @class) {
       foreach (SortingMethod sortingMethod in Enum.GetValues(typeof(SortingMethod))) {
         //foreach (FittingMethod fittingMethod in Enum.GetValues(typeof(FittingMethod))) {
@@ -168 +169 @@
 
 
-    private void TestExtremePointAlgorithmByParameters(RandomInstanceProviderWithSRand randomInstanceProvider, int @class, SortingMethod sortingMethod, FittingMethod fittingMethod) {
+    private void TestExtremePointAlgorithmByParameters(RandomInstanceProvider randomInstanceProvider, int @class, SortingMethod sortingMethod, FittingMethod fittingMethod) {
       var dataDescriptors = randomInstanceProvider.GetDataDescriptors();
       var referenceValues = GetReferenceAlgorithmValues();