Changeset 5838 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests

Timestamp:

03/28/11 15:34:30 (14 years ago)

Author:

abeham

Message:

#1330

• Renamed the DistanceMatrix parameter to Distances
• Renamed the SwapMove to Swap2Move and renamed operators accordingly
• Integrated changes in HeuristicLab.Analysis.Views regarding description text box

Location:

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests

Files:

• QAPLIBInstancesTest.cs (modified) (1 diff)
• QAPMoveEvaluatorTest.cs (modified) (1 diff)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests/QAPLIBInstancesTest.cs

@@ -35 +35 @@
           double quality = double.NaN;
           try {
-            quality = QAPEvaluator.Apply(qap.BestKnownSolution, qap.Weights, qap.DistanceMatrix);
+            quality = QAPEvaluator.Apply(qap.BestKnownSolution, qap.Weights, qap.Distances);
           } catch (Exception ex) {
             failedInstances.AppendLine("An unknown problem occurred evaluating solution of instance " + instance + ": " + ex.Message);

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests/QAPMoveEvaluatorTest.cs

@@ -97 +97 @@
         double after = QAPEvaluator.Apply(assignment, weights, distances);
         // evaluate swap back
-        double move = QAPSwapMoveEvaluator.Apply(assignment, new SwapMove(index1, index2, assignment), weights, distances);
+        double move = QAPSwap2MoveEvaluator.Apply(assignment, new Swap2Move(index1, index2, assignment), weights, distances);
         Assert.IsTrue(move.IsAlmost(before - after));
       }