Changeset 5801

Timestamp:

03/22/11 21:42:27 (14 years ago)

Author:

abeham

Message:

#1330

• Added QAP evaluator for translocation moves

Location:

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3

Files:

• Evaluators/QAPTranslocationMoveEvaluator.cs (added)
• HeuristicLab.Problems.QuadraticAssignment-3.3.csproj (modified) (1 diff)
• Tests/QAPMoveEvaluatorTest.cs (modified) (2 diffs)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

@@ -140 +140 @@
     <Compile Include="Evaluators\QAPInversionMoveEvaluator.cs" />
     <Compile Include="Evaluators\QAPMoveEvaluator.cs" />
+    <Compile Include="Evaluators\QAPTranslocationMoveEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="Interfaces\IQAPEvaluator.cs" />
     <Compile Include="Interfaces\IQAPMoveEvaluator.cs" />

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

@@ -130 +130 @@
     }
 
-    /*[TestMethod]
+    [TestMethod]
     public void TranslocationMoveEvaluatorTest() {
       DoubleMatrix distances = new DoubleMatrix(
@@ -156 +156 @@
         double before = QAPEvaluator.Apply(assignment, weights, distances);
         // translocate
+        Permutation clone = new Cloner().Clone(assignment);
         TranslocationManipulator.Apply(assignment, index1, index2, insertPoint);
         double after = QAPEvaluator.Apply(assignment, weights, distances);
-        // evaluate translocate back
-        double move = QAPTranslocationMoveEvaluator.Apply(assignment, new TranslocationMove(index1, index2, insertPoint, assignment), weights, distances);
-        Assert.IsTrue(move.IsAlmost(before - after));
+        // evaluate translocate move
+        double move = QAPTranslocationMoveEvaluator.Apply(clone, new TranslocationMove(index1, index2, insertPoint, assignment), weights, distances);
+        Assert.IsTrue(move.IsAlmost(after - before));
       }
-    }*/
+    }
 
   }