Changeset 13193

Timestamp:

11/16/15 21:31:28 (9 years ago)

Author:

abeham

Message:

#2481: merged r12978 to stable

Location:

stable/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

• HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (2 diffs)
• MoveEvaluators/ThreeOpt/TSPTranslocationMoveDistanceMatrixEvaluator.cs (added)
• MoveEvaluators/TwoOpt/TSPInversionMoveDistanceMatrixEvaluator.cs (added)
• TravelingSalesmanProblem.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

@@ -128 +128 @@
     <Compile Include="Improvers\TSPImprovementOperator.cs" />
     <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" />
+    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveDistanceMatrixEvaluator.cs" />
     <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" />
     <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveGeoPathEvaluator.cs" />
@@ -134 +135 @@
     <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveEuclideanPathEvaluator.cs" />
     <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveGeoPathEvaluator.cs" />
+    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveDistanceMatrixEvaluator.cs" />
     <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" />
     <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" />

stable/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);