Changeset 15504 for branches/GeneralizedQAP/UnitTests

Timestamp:

12/10/17 22:11:10 (7 years ago)

Author:

abeham

Message:

#1614: refactored code

• change problem to derive from basic problem
• using a combined instance class instead of individual parameters

Location:

branches/GeneralizedQAP/UnitTests

Files:

• CordeauCrossoverTest.cs (modified) (3 diffs)
• GQAPNMoveEvaluatorTest.cs (modified) (7 diffs)
• Properties/AssemblyInfo.cs (modified) (2 diffs)

branches/GeneralizedQAP/UnitTests/CordeauCrossoverTest.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -35 +35 @@
       var provider = new CordeauGQAPInstanceProvider();
       var instance = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name == "20-15-75"));
-      var gqap = new GeneralizedQuadraticAssignmentProblem();
+      var gqap = new GQAP();
       gqap.Load(instance);
       var evaluator = gqap.Evaluator;
@@ -41 +41 @@
       for (int i = 0; i < 100; i++) {
         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);
+        var parent1 = GreedyRandomizedSolutionCreator.CreateSolution(random, gqap.ProblemInstance, 100, true, CancellationToken.None);
+        var parent2 = GreedyRandomizedSolutionCreator.CreateSolution(random, gqap.ProblemInstance, 100, true, CancellationToken.None);
 
         try {
           CordeauCrossover.Apply(random, gqap.Maximization,
             parent1,
-            new DoubleValue(gqap.Evaluator.Evaluate(parent1, gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality)),
+            new DoubleValue(gqap.Evaluate(parent1)),
             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,
+            new DoubleValue(gqap.Evaluate(parent2)),
+            gqap.ProblemInstance,
             new IntValue(0));
         } catch {

branches/GeneralizedQAP/UnitTests/GQAPNMoveEvaluatorTest.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -35 +35 @@
   public class GQAPNMoveEvaluatorTest {
     private const int Equipments = 10, Locations = 5;
-    private static DoubleMatrix symmetricWeights, asymmetricWeights, nonZeroDiagonalWeights;
-    private static DoubleMatrix symmetricDistances, asymmetricDistances, nonZeroDiagonalDistances;
-    private static DoubleMatrix installationCosts;
-    private static DoubleArray demands, capacities;
-    private static double transportationCosts, overbookedCapacityPenalty;
+    private static GQAPInstance symmetricInstance, asymmetricInstance, nonZeroDiagonalInstance;
     private static IntegerVector assignment;
     private static MersenneTwister random;
@@ -58 +54 @@
     public static void MyClassInitialize(TestContext testContext) {
       random = new MersenneTwister();
-      symmetricDistances = new DoubleMatrix(Locations, Locations);
-      symmetricWeights = new DoubleMatrix(Equipments, Equipments);
-      asymmetricDistances = new DoubleMatrix(Locations, Locations);
-      asymmetricWeights = new DoubleMatrix(Equipments, Equipments);
-      nonZeroDiagonalDistances = new DoubleMatrix(Locations, Locations);
-      nonZeroDiagonalWeights = new DoubleMatrix(Equipments, Equipments);
+      var symmetricDistances = new DoubleMatrix(Locations, Locations);
+      var symmetricWeights = new DoubleMatrix(Equipments, Equipments);
+      var asymmetricDistances = new DoubleMatrix(Locations, Locations);
+      var asymmetricWeights = new DoubleMatrix(Equipments, Equipments);
+      var nonZeroDiagonalDistances = new DoubleMatrix(Locations, Locations);
+      var nonZeroDiagonalWeights = new DoubleMatrix(Equipments, Equipments);
       for (int i = 0; i < Equipments - 1; i++) {
         for (int j = i + 1; j < Equipments; j++) {
@@ -86 +82 @@
         nonZeroDiagonalDistances[i, i] = random.Next(Locations * 100);
       }
-      installationCosts = new DoubleMatrix(Equipments, Locations);
+      var installationCosts = new DoubleMatrix(Equipments, Locations);
       for (int i = 0; i < Equipments; i++) {
         for (int j = 0; j < Locations; j++) {
@@ -92 +88 @@
         }
       }
-      demands = new DoubleArray(Equipments);
+      var demands = new DoubleArray(Equipments);
       for (int i = 0; i < Equipments; i++) {
         demands[i] = random.Next(1, 10);
       }
-      capacities = new DoubleArray(Locations);
+      var capacities = new DoubleArray(Locations);
       for (int j = 0; j < Locations; j++) {
         capacities[j] = random.Next(1, 10) * ((double)Equipments / (double)Locations) * 1.5;
@@ -107 +103 @@
         nonZeroDiagonalWeights[index, index] = random.Next(1, Equipments * 100);
 
-      transportationCosts = random.NextDouble() * 10;
-      overbookedCapacityPenalty = 1000 * random.NextDouble() + 100;
+      var transportationCosts = random.NextDouble() * 10;
+      var overbookedCapacityPenalty = 1000 * random.NextDouble() + 100;
       assignment = new IntegerVector(Equipments, random, 0, Locations);
+
+      symmetricInstance = new GQAPInstance() {
+        Capacities = capacities,
+        Demands = demands,
+        InstallationCosts = installationCosts,
+        PenaltyLevel = overbookedCapacityPenalty,
+        TransportationCosts = transportationCosts,
+        Weights = symmetricWeights,
+        Distances = symmetricDistances
+      };
+      asymmetricInstance = new GQAPInstance() {
+        Capacities = capacities,
+        Demands = demands,
+        InstallationCosts = installationCosts,
+        PenaltyLevel = overbookedCapacityPenalty,
+        TransportationCosts = transportationCosts,
+        Weights = asymmetricWeights,
+        Distances = asymmetricDistances
+      };
+      nonZeroDiagonalInstance = new GQAPInstance() {
+        Capacities = capacities,
+        Demands = demands,
+        InstallationCosts = installationCosts,
+        PenaltyLevel = overbookedCapacityPenalty,
+        TransportationCosts = transportationCosts,
+        Weights = nonZeroDiagonalWeights,
+        Distances = nonZeroDiagonalDistances
+      };
     }
     #endregion
@@ -119 +143 @@
     [TestMethod()]
     public void EvaluateTest() {
-      var evaluator = new GQAPAdditivePenaltyEvaluator();
       for (int i = 0; i < 500; i++) {
-        NMove currentMove = StochasticNMoveSingleMoveGenerator.GenerateUpToN(random, assignment, 3, capacities);
+        NMove currentMove = StochasticNMoveSingleMoveGenerator.GenerateUpToN(random, assignment, 3, symmetricInstance.Capacities);
         IntegerVector prevAssignment = (IntegerVector)assignment.Clone();
         NMoveMaker.Apply(assignment, currentMove);
-        double before = evaluator.Evaluate(prevAssignment, symmetricWeights, symmetricDistances, installationCosts, demands, capacities, transportationCosts, 0);
-        double after = evaluator.Evaluate(assignment, symmetricWeights, symmetricDistances, installationCosts, demands, capacities, transportationCosts, 0);
-        double moveDiff = GQAPNMoveEvaluator.Evaluate(currentMove, prevAssignment, symmetricWeights, symmetricDistances, installationCosts, demands, capacities, transportationCosts, 0, evaluator);
+        var beforeEval = symmetricInstance.Evaluate(prevAssignment);
+        double before = symmetricInstance.ToSingleObjective(beforeEval);
+        double after = Evaluate(symmetricInstance, assignment);
+        double moveDiff = symmetricInstance.ToSingleObjective(
+          GQAPNMoveEvaluator.Evaluate(currentMove, prevAssignment, beforeEval, symmetricInstance)
+          ) - symmetricInstance.ToSingleObjective(beforeEval);
         Assert.IsTrue(Math.Abs(moveDiff - (after - before)) < 1e-07, "Failed on symmetric matrices: " + Environment.NewLine
           + "Quality changed from " + before + " to " + after + " (" + (after - before).ToString() + "), but move quality change was " + moveDiff + ".");
 
-        before = evaluator.Evaluate(prevAssignment, asymmetricWeights, asymmetricDistances, installationCosts, demands, capacities, transportationCosts, 0);
-        after = evaluator.Evaluate(assignment, asymmetricWeights, asymmetricDistances, installationCosts, demands, capacities, transportationCosts, 0);
-        moveDiff = GQAPNMoveEvaluator.Evaluate(currentMove, prevAssignment, asymmetricWeights, asymmetricDistances, installationCosts, demands, capacities, transportationCosts, 0, evaluator);
+        beforeEval = asymmetricInstance.Evaluate(prevAssignment);
+        before = asymmetricInstance.ToSingleObjective(beforeEval);
+        after = Evaluate(asymmetricInstance, assignment);
+        moveDiff = asymmetricInstance.ToSingleObjective(
+          GQAPNMoveEvaluator.Evaluate(currentMove, prevAssignment, beforeEval, asymmetricInstance)
+          ) - asymmetricInstance.ToSingleObjective(beforeEval);
         Assert.IsTrue(Math.Abs(moveDiff - (after - before)) < 1e-07, "Failed on asymmetric matrices: " + Environment.NewLine
           + "Quality changed from " + before + " to " + after + " (" + (after - before).ToString() + "), but move quality change was " + moveDiff + ".");
 
-        before = evaluator.Evaluate(prevAssignment, nonZeroDiagonalWeights, nonZeroDiagonalDistances, installationCosts, demands, capacities, transportationCosts, 0);
-        after = evaluator.Evaluate(assignment, nonZeroDiagonalWeights, nonZeroDiagonalDistances, installationCosts, demands, capacities, transportationCosts, 0);
-        moveDiff = GQAPNMoveEvaluator.Evaluate(currentMove, prevAssignment, nonZeroDiagonalWeights, nonZeroDiagonalDistances, installationCosts, demands, capacities, transportationCosts, 0, evaluator);
+        beforeEval = nonZeroDiagonalInstance.Evaluate(prevAssignment);
+        before = nonZeroDiagonalInstance.ToSingleObjective(beforeEval);
+        after = Evaluate(nonZeroDiagonalInstance, assignment);
+        moveDiff = nonZeroDiagonalInstance.ToSingleObjective(
+          GQAPNMoveEvaluator.Evaluate(currentMove, prevAssignment, beforeEval, nonZeroDiagonalInstance)
+          ) - nonZeroDiagonalInstance.ToSingleObjective(beforeEval);
         Assert.IsTrue(Math.Abs(moveDiff - (after - before)) < 1e-07, "Failed on non-zero diagonal matrices: " + Environment.NewLine
           + "Quality changed from " + before + " to " + after + " (" + (after - before).ToString() + "), but move quality change was " + moveDiff + ".");
       }
     }
+
+    private double Evaluate(GQAPInstance instance, IntegerVector assignment) {
+      return instance.ToSingleObjective(instance.Evaluate(assignment));
+    }
   }
 }

branches/GeneralizedQAP/UnitTests/Properties/AssemblyInfo.cs

@@ -1 +1 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -9 +8 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("UnitTests")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2012")]
+[assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]