Changeset 15562 for branches/GeneralizedQAP/UnitTests

Timestamp:

12/29/17 23:56:43 (7 years ago)

Author:

abeham

Message:

#1614: added additional algorithms

Location:

branches/GeneralizedQAP/UnitTests

Files:

• ApproximateLocalSearchTest.cs (modified) (1 diff)
• GRASPTest.cs (added)
• UnitTests.csproj (modified) (2 diffs)

branches/GeneralizedQAP/UnitTests/ApproximateLocalSearchTest.cs

@@ -13 +13 @@
     [TestMethod]
     public void ApproximateLocalSearchApplyTest() {
-      CollectionAssert.AreEqual(new [] { 3, 2, 1, 1, 3, 0, 1, 0, 3, 0 }, assignment.ToArray());
+      CollectionAssert.AreEqual(new [] { 2, 0, 1, 1, 2, 3, 0, 3, 0, 0 }, assignment.ToArray());
 
       var evaluation = instance.Evaluate(assignment);
-      Assert.AreEqual(4091776, evaluation.FlowCosts);
-      Assert.AreEqual(42, evaluation.InstallationCosts);
+      Assert.AreEqual(3985258, evaluation.FlowCosts);
+      Assert.AreEqual(30, evaluation.InstallationCosts);
       Assert.AreEqual(0, evaluation.ExcessDemand);
 
       var quality = instance.ToSingleObjective(evaluation);
-      Assert.AreEqual(15903846.056964701, quality, 1e-9);
+      Assert.AreEqual(15489822.781533258, quality, 1e-9);
 
       var evaluatedSolutions = 0;
       ApproximateLocalSearch.Apply(random, assignment, ref quality,
-        ref evaluation, 10, 0.5, 1000, instance,
+        ref evaluation, 10, 0.5, 100, instance,
         out evaluatedSolutions);
-      Assert.AreEqual(680, evaluatedSolutions);
-      CollectionAssert.AreEqual(new[] { 3, 1, 0, 3, 0, 0, 1, 2, 3, 0 }, assignment.ToArray());
-      Assert.AreEqual(12440163.936988469, quality, 1e-9);
+      Assert.AreEqual(61, evaluatedSolutions);
+      CollectionAssert.AreEqual(new[] { 2, 0, 0, 0, 2, 1, 0, 3, 0, 0 }, assignment.ToArray());
+      Assert.AreEqual(10167912.633734789, quality, 1e-9);
     }
 

branches/GeneralizedQAP/UnitTests/UnitTests.csproj

@@ -110 +110 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ApproximateLocalSearchTest.cs" />
+    <Compile Include="GRASPTest.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -115 +116 @@
       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
       <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj">
+      <Project>{577239EC-7D7F-4505-A0A4-572E34010DBA}</Project>
+      <Name>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.GeneralizedQuadraticAssignment\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj">