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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Tests/HeuristicLab.Problems.Bin-Packing-3.3/AlgorithmTest.cs
r15424 r15454 3 3 using Microsoft.VisualStudio.TestTools.UnitTesting; 4 4 using HeuristicLab.Problems.BinPacking3D; 5 using HeuristicLab.Problems.BinPacking3D.Instances; 5 6 using System.Collections.Generic; 6 7 using System.Linq; … … 30 31 31 32 var referenceItemLists = ReadReferenceItemLists(); 32 TestRandomInstanceProviderByClass(new RandomInstanceClass1Provider WithSRand(), referenceItemLists);33 TestRandomInstanceProviderByClass(new RandomInstanceClass2Provider WithSRand(), referenceItemLists);34 TestRandomInstanceProviderByClass(new RandomInstanceClass3Provider WithSRand(), referenceItemLists);35 TestRandomInstanceProviderByClass(new RandomInstanceClass4Provider WithSRand(), referenceItemLists);36 TestRandomInstanceProviderByClass(new RandomInstanceClass5Provider WithSRand(), referenceItemLists);37 TestRandomInstanceProviderByClass(new RandomInstanceClass6Provider WithSRand(), referenceItemLists);38 TestRandomInstanceProviderByClass(new RandomInstanceClass7Provider WithSRand(), referenceItemLists);39 TestRandomInstanceProviderByClass(new RandomInstanceClass8Provider WithSRand(), referenceItemLists);33 TestRandomInstanceProviderByClass(new RandomInstanceClass1Provider(), referenceItemLists); 34 TestRandomInstanceProviderByClass(new RandomInstanceClass2Provider(), referenceItemLists); 35 TestRandomInstanceProviderByClass(new RandomInstanceClass3Provider(), referenceItemLists); 36 TestRandomInstanceProviderByClass(new RandomInstanceClass4Provider(), referenceItemLists); 37 TestRandomInstanceProviderByClass(new RandomInstanceClass5Provider(), referenceItemLists); 38 TestRandomInstanceProviderByClass(new RandomInstanceClass6Provider(), referenceItemLists); 39 TestRandomInstanceProviderByClass(new RandomInstanceClass7Provider(), referenceItemLists); 40 TestRandomInstanceProviderByClass(new RandomInstanceClass8Provider(), referenceItemLists); 40 41 41 42 } … … 79 80 } 80 81 81 private void TestRandomInstanceProviderByClass(RandomInstanceProvider WithSRandrandomInstanceProvider, IDictionary<string, List<Dimension>> referenceItems) {82 private void TestRandomInstanceProviderByClass(RandomInstanceProvider randomInstanceProvider, IDictionary<string, List<Dimension>> referenceItems) { 82 83 83 84 var dataDescriptors = randomInstanceProvider.GetDataDescriptors(); … … 111 112 [TestCategory("Problems.BinPacking")] 112 113 public void TestExtremePointAlgorithmClass1() { 113 TestExtremePointAlgorithm(new RandomInstanceClass1Provider WithSRand(), 1);114 TestExtremePointAlgorithm(new RandomInstanceClass1Provider(), 1); 114 115 } 115 116 … … 117 118 [TestCategory("Problems.BinPacking")] 118 119 public void TestExtremePointAlgorithmClass2() { 119 TestExtremePointAlgorithm(new RandomInstanceClass2Provider WithSRand(), 2);120 TestExtremePointAlgorithm(new RandomInstanceClass2Provider(), 2); 120 121 } 121 122 … … 123 124 [TestCategory("Problems.BinPacking")] 124 125 public void TestExtremePointAlgorithmClass3() { 125 TestExtremePointAlgorithm(new RandomInstanceClass3Provider WithSRand(), 3);126 TestExtremePointAlgorithm(new RandomInstanceClass3Provider(), 3); 126 127 } 127 128 … … 129 130 [TestCategory("Problems.BinPacking")] 130 131 public void TestExtremePointAlgorithmClass4() { 131 TestExtremePointAlgorithm(new RandomInstanceClass4Provider WithSRand(), 4);132 TestExtremePointAlgorithm(new RandomInstanceClass4Provider(), 4); 132 133 } 133 134 … … 135 136 [TestCategory("Problems.BinPacking")] 136 137 public void TestExtremePointAlgorithmClass5() { 137 TestExtremePointAlgorithm(new RandomInstanceClass5Provider WithSRand(), 5);138 TestExtremePointAlgorithm(new RandomInstanceClass5Provider(), 5); 138 139 } 139 140 … … 141 142 [TestCategory("Problems.BinPacking")] 142 143 public void TestExtremePointAlgorithmClass6() { 143 TestExtremePointAlgorithm(new RandomInstanceClass6Provider WithSRand(), 6);144 TestExtremePointAlgorithm(new RandomInstanceClass6Provider(), 6); 144 145 } 145 146 … … 147 148 [TestCategory("Problems.BinPacking")] 148 149 public void TestExtremePointAlgorithmClass7() { 149 TestExtremePointAlgorithm(new RandomInstanceClass7Provider WithSRand(), 7);150 TestExtremePointAlgorithm(new RandomInstanceClass7Provider(), 7); 150 151 } 151 152 … … 153 154 [TestCategory("Problems.BinPacking")] 154 155 public void TestExtremePointAlgorithmClass8() { 155 TestExtremePointAlgorithm(new RandomInstanceClass8Provider WithSRand(), 8);156 } 157 158 private void TestExtremePointAlgorithm(RandomInstanceProvider WithSRandrandomInstanceProvider, int @class) {156 TestExtremePointAlgorithm(new RandomInstanceClass8Provider(), 8); 157 } 158 159 private void TestExtremePointAlgorithm(RandomInstanceProvider randomInstanceProvider, int @class) { 159 160 foreach (SortingMethod sortingMethod in Enum.GetValues(typeof(SortingMethod))) { 160 161 //foreach (FittingMethod fittingMethod in Enum.GetValues(typeof(FittingMethod))) { … … 168 169 169 170 170 private void TestExtremePointAlgorithmByParameters(RandomInstanceProvider WithSRandrandomInstanceProvider, int @class, SortingMethod sortingMethod, FittingMethod fittingMethod) {171 private void TestExtremePointAlgorithmByParameters(RandomInstanceProvider randomInstanceProvider, int @class, SortingMethod sortingMethod, FittingMethod fittingMethod) { 171 172 var dataDescriptors = randomInstanceProvider.GetDataDescriptors(); 172 173 var referenceValues = GetReferenceAlgorithmValues();
Note: See TracChangeset
for help on using the changeset viewer.