Changeset 13470 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/EstimatedPTSPMoveEvaluator.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/3.3/Moves/EstimatedPTSPMoveEvaluator.cs (modified) (3 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/EstimatedPTSPMoveEvaluator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.PTSP {
-  [Item("EstimatedPTSPMoveEvaluator", "A base class for operators which evaluate TSP moves.")]
+  [Item("EstimatedPTSPMoveEvaluator", "A base class for operators which evaluate PTSP moves.")]
   [StorableClass]
   public abstract class EstimatedPTSPMoveEvaluator : SingleSuccessorOperator, IEstimatedPTSPMoveEvaluator {
@@ -81 +81 @@
       var permutation = PermutationParameter.ActualValue;
       var coordinates = CoordinatesParameter.ActualValue;
-      double relativeQualityDifference = 0;
+      var realizations = RealizationsParameter.ActualValue;
+      Func<int, int, double> distance = null;
       if (UseDistanceMatrixParameter.ActualValue.Value) {
         var distanceMatrix = DistanceMatrixParameter.ActualValue;
         if (distanceMatrix == null) throw new InvalidOperationException("The distance matrix has not been calculated.");
-        relativeQualityDifference = EvaluateByDistanceMatrix(permutation, distanceMatrix);
+        distance = (a, b) => distanceMatrix[a, b];
       } else {
         if (coordinates == null) throw new InvalidOperationException("No coordinates were given.");
         var distanceCalculator = DistanceCalculatorParameter.ActualValue;
         if (distanceCalculator == null) throw new InvalidOperationException("Distance calculator is null!");
-        relativeQualityDifference = EvaluateByCoordinates(permutation, coordinates, distanceCalculator);
+        distance = (a, b) => distanceCalculator.Calculate(a, b, coordinates);
       }
+      var relativeQualityDifference = EvaluateMove(permutation, distance, realizations);
       var moveQuality = MoveQualityParameter.ActualValue;
       if (moveQuality == null) MoveQualityParameter.ActualValue = new DoubleValue(QualityParameter.ActualValue.Value + relativeQualityDifference);
@@ -98 +100 @@
     }
 
-    protected abstract double EvaluateByDistanceMatrix(Permutation permutation, DistanceMatrix distanceMatrix);
-    protected abstract double EvaluateByCoordinates(Permutation permutation, DoubleMatrix coordinates, DistanceCalculator distanceCalculator);
+    protected abstract double EvaluateMove(Permutation permutation, Func<int, int, double> distance, ItemList<BoolArray> realizations);
   }
 }