Changeset 12978 for trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

Timestamp:

10/01/15 00:36:27 (9 years ago)

Author:

abeham

Message:

#2481:

• Implemented TSPTranslocationMoveDistanceMatrixEvaluator
• Implemented TSPInversionMoveDistanceMatrixEvaluator
• Changed move check in TravelingSalesmanProblem to include all ITSPMoveEvaluators

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -254 +254 @@
     private void UpdateMoveEvaluators() {
       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
-      foreach (ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())
+      foreach (var op in ApplicationManager.Manager.GetInstances<ITSPMoveEvaluator>())
         if (op.EvaluatorType == Evaluator.GetType()) {
           Operators.Add(op);
@@ -432 +432 @@
         try {
           EvaluateAndLoadTour(data.BestKnownTour);
-        }
-        catch (InvalidOperationException) {
+        } catch (InvalidOperationException) {
           if (data.BestKnownQuality.HasValue)
             BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);