Changeset 15490 for branches/GeneralizedQAP/UnitTests

Timestamp:

12/04/17 23:00:03 (7 years ago)

Author:

abeham

Message:

#1614:

• branched optimization
• adapted references
• renamed plugin

Location:

branches/GeneralizedQAP

Files:

• . (modified) (1 prop)
• UnitTests/CordeauCrossoverTest.cs (modified) (3 diffs)
• UnitTests/UnitTests.csproj (modified) (2 diffs)

branches/GeneralizedQAP

@@ -2 +2 @@
 TestResults
 *.user
+.vs

@@ -2 +2 @@
 TestResults
 *.user
+.vs

branches/GeneralizedQAP/UnitTests/CordeauCrossoverTest.cs

@@ -21 +21 @@
 
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
 using HeuristicLab.Problems.Instances.CordeauGQAP;
@@ -34 +34 @@
     public void CordeauCrossoverFunctionalityTest() {
       var provider = new CordeauGQAPInstanceProvider();
-      var instance = provider.LoadData(provider.GetDataDescriptors().First());
+      var instance = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name == "20-15-75"));
       var gqap = new GeneralizedQuadraticAssignmentProblem();
       gqap.Load(instance);
+      var evaluator = gqap.Evaluator;
 
-      var random = new MersenneTwister();
       for (int i = 0; i < 100; i++) {
-        var parent1 = new IntegerVector(gqap.Demands.Length, random, 0, gqap.Capacities.Length);
-        var parent2 = new IntegerVector(gqap.Demands.Length, random, 0, gqap.Capacities.Length);
+        var random = new MersenneTwister((uint)i);
+        var parent1 = GreedyRandomizedSolutionCreator.CreateSolution(random, gqap.Demands, gqap.Capacities, gqap.Evaluator, 100, true, CancellationToken.None);
+        var parent2 = GreedyRandomizedSolutionCreator.CreateSolution(random, gqap.Demands, gqap.Capacities, gqap.Evaluator, 100, true, CancellationToken.None);
 
         try {
@@ -49 +50 @@
             parent2,
             new DoubleValue(gqap.Evaluator.Evaluate(parent2, gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality)),
-            gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality, gqap.Evaluator);
+            gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality, gqap.Evaluator,
+            new IntValue(0));
         } catch {
           Assert.Fail("Error during crossover");

branches/GeneralizedQAP/UnitTests/UnitTests.csproj

@@ -65 +65 @@
       <Private>True</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Optimization-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -115 +111 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj">
       <Project>{DA367BE5-4F53-4243-933B-32AAB86189D5}</Project>

@@ -2 +2 @@
 TestResults
 *.user
+.vs