Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/07/13 07:41:17 (11 years ago)
Author:
gkronber
Message:

#2010 merged r9848 from trunk to stable branch

Location:
stable
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

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

    r8600 r9858  
    119119    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
    120120    <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
     121    <Compile Include="Evaluators\TSPUpperEuclideanPathEvaluator.cs" />
    121122    <Compile Include="Improvers\TSPImprovementOperator.cs" />
    122123    <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" />
  • stable/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

    r9456 r9858  
    382382      if (data.Dimension > DistanceMatrixSizeLimit && (data.DistanceMeasure == DistanceMeasure.Att
    383383        || data.DistanceMeasure == DistanceMeasure.Manhattan
    384         || data.DistanceMeasure == DistanceMeasure.Maximum
    385         || data.DistanceMeasure == DistanceMeasure.UpperEuclidean))
     384        || data.DistanceMeasure == DistanceMeasure.Maximum))
    386385        throw new System.IO.InvalidDataException("The given instance uses an unsupported distance measure and is too large for using a distance matrix.");
    387386      if (data.Coordinates != null && data.Coordinates.GetLength(1) != 2)
     
    399398      if (data.DistanceMeasure == DistanceMeasure.Att
    400399        || data.DistanceMeasure == DistanceMeasure.Manhattan
    401         || data.DistanceMeasure == DistanceMeasure.Maximum
    402         || data.DistanceMeasure == DistanceMeasure.UpperEuclidean) {
     400        || data.DistanceMeasure == DistanceMeasure.Maximum) {
    403401        evaluator = new TSPDistanceMatrixEvaluator();
    404402        UseDistanceMatrix = new BoolValue(true);
     
    418416            evaluator = new TSPRoundedEuclideanPathEvaluator();
    419417            break;
     418          case DistanceMeasure.UpperEuclidean:
     419            evaluator = new TSPUpperEuclideanPathEvaluator();
     420            break;
    420421          case DistanceMeasure.Geo:
    421422            evaluator = new TSPGeoPathEvaluator();
Note: See TracChangeset for help on using the changeset viewer.