Changeset 13193


Ignore:
Timestamp:
11/16/15 21:31:28 (4 years ago)
Author:
abeham
Message:

#2481: merged r12978 to stable

Location:
stable/HeuristicLab.Problems.TravelingSalesman/3.3
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • stable/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r11920 r13193  
    128128    <Compile Include="Improvers\TSPImprovementOperator.cs" />
    129129    <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" />
     130    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveDistanceMatrixEvaluator.cs" />
    130131    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" />
    131132    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveGeoPathEvaluator.cs" />
     
    134135    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveEuclideanPathEvaluator.cs" />
    135136    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveGeoPathEvaluator.cs" />
     137    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveDistanceMatrixEvaluator.cs" />
    136138    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" />
    137139    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" />
  • stable/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r12708 r13193  
    254254    private void UpdateMoveEvaluators() {
    255255      Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
    256       foreach (ITSPPathMoveEvaluator op in ApplicationManager.Manager.GetInstances<ITSPPathMoveEvaluator>())
     256      foreach (var op in ApplicationManager.Manager.GetInstances<ITSPMoveEvaluator>())
    257257        if (op.EvaluatorType == Evaluator.GetType()) {
    258258          Operators.Add(op);
     
    432432        try {
    433433          EvaluateAndLoadTour(data.BestKnownTour);
    434         }
    435         catch (InvalidOperationException) {
     434        } catch (InvalidOperationException) {
    436435          if (data.BestKnownQuality.HasValue)
    437436            BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
Note: See TracChangeset for help on using the changeset viewer.