Changeset 13470 for branches/PTSP/HeuristicLab.Problems.PTSP.Tests-3.3/PTSPMoveEvaluatorTest.cs

Timestamp:

12/15/15 16:38:08 (9 years ago)

Author:

abeham

Message:

#2221:

• implemented review comments
  • hid rng as private class, implemented djb2 hash function (hash function implementation may also change)
  • added missing probabilities
  • base class for instance providers
  • prebuild event events
  • build platforms
  • unit test will be removed on trunk integration
  • corrected assembly file version
  • distance calculator parameter was not hidden, can be changed by user, updates distance matrix
  • fixed performance problems (ouch!) also for estimated ptsp (inlined GetDistance method)
• added moves (full evaluation) for analytical tsp
• added local improvement operators for analytical ptsp
• added recalculation of distance matrix when parameters change
• still lots of other changes

File:

• branches/PTSP/HeuristicLab.Problems.PTSP.Tests-3.3/PTSPMoveEvaluatorTest.cs (modified) (3 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP.Tests-3.3/PTSPMoveEvaluatorTest.cs

@@ -85 +85 @@
     [TestProperty("Time", "short")]
     public void InversionMoveEvaluatorTest() {
-      var beforeMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distances, realizations)[0];
+      Func<int, int, double> distance = (a, b) => distances[a, b];
+      double variance;
+      var beforeMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distance, realizations, out variance);
 
       for (var i = 0; i < 500; i++) {
         var move = StochasticInversionSingleMoveGenerator.Apply(tour, random);
-        var moveMatrix = PTSPEstimatedInversionMoveEvaluator.EvaluateByDistanceMatrix(tour, move, distances, realizations);
+        var moveMatrix = PTSPEstimatedInversionMoveEvaluator.EvaluateMove(tour, move, distance, realizations);
         InversionManipulator.Apply(tour, move.Index1, move.Index2);
-        var afterMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distances, realizations)[0];
+        var afterMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distance, realizations, out variance);
 
         Assert.IsTrue(Math.Abs(moveMatrix).IsAlmost(Math.Abs(afterMatrix - beforeMatrix)),
@@ -106 +108 @@
     [TestProperty("Time", "short")]
     public void InsertionMoveEvaluatorTest() {
-      var beforeMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distances, realizations)[0];
-
+      Func<int, int, double> distance = (a, b) => distances[a, b];
+      double variance;
+      var beforeMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distance, realizations, out variance);
       for (var i = 0; i < 500; i++) {
         var move = StochasticTranslocationSingleMoveGenerator.Apply(tour, random);
-        var moveMatrix = PTSPEstimatedInsertionMoveEvaluator.EvaluateByDistanceMatrix(tour, move, distances, realizations);
+        var moveMatrix = PTSPEstimatedInsertionMoveEvaluator.EvaluateMove(tour, move, distance, realizations);
         TranslocationManipulator.Apply(tour, move.Index1, move.Index1, move.Index3);
-        var afterMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distances, realizations)[0];
+        var afterMatrix = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(tour, distance, realizations, out variance);
 
         Assert.IsTrue(Math.Abs(moveMatrix).IsAlmost(Math.Abs(afterMatrix - beforeMatrix)),
@@ -122 +125 @@
       }
     }
-
-    [TestMethod]
-    [TestCategory("Problems.ProbabilisticTravelingSalesman")]
-    [TestProperty("Time", "short")]
-    public void AnalyticalTest() {
-      for (var i = 0; i < 10; i++) {
-        var perm = new Permutation(PermutationTypes.RelativeUndirected, ProblemSize, random);
-        var estimated = EstimatedProbabilisticTravelingSalesmanProblem.Evaluate(perm, distances, realizations)[0];
-
-        var analytical = AnalyticalProbabilisticTravelingSalesmanProblem.Evaluate(perm, distances, probabilities);
-        Console.WriteLine(Math.Abs(analytical - estimated));
-      }
-    }
   }
 }