Changeset 9848 for trunk/sources/HeuristicLab.Problems.TravelingSalesman
- Timestamp:
- 08/05/13 13:54:32 (11 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj
r8600 r9848 119 119 <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" /> 120 120 <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" /> 121 <Compile Include="Evaluators\TSPUpperEuclideanPathEvaluator.cs" /> 121 122 <Compile Include="Improvers\TSPImprovementOperator.cs" /> 122 123 <Compile Include="Interfaces\ITSPDistanceMatrixEvaluator.cs" /> -
trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r9456 r9848 382 382 if (data.Dimension > DistanceMatrixSizeLimit && (data.DistanceMeasure == DistanceMeasure.Att 383 383 || data.DistanceMeasure == DistanceMeasure.Manhattan 384 || data.DistanceMeasure == DistanceMeasure.Maximum 385 || data.DistanceMeasure == DistanceMeasure.UpperEuclidean)) 384 || data.DistanceMeasure == DistanceMeasure.Maximum)) 386 385 throw new System.IO.InvalidDataException("The given instance uses an unsupported distance measure and is too large for using a distance matrix."); 387 386 if (data.Coordinates != null && data.Coordinates.GetLength(1) != 2) … … 399 398 if (data.DistanceMeasure == DistanceMeasure.Att 400 399 || data.DistanceMeasure == DistanceMeasure.Manhattan 401 || data.DistanceMeasure == DistanceMeasure.Maximum 402 || data.DistanceMeasure == DistanceMeasure.UpperEuclidean) { 400 || data.DistanceMeasure == DistanceMeasure.Maximum) { 403 401 evaluator = new TSPDistanceMatrixEvaluator(); 404 402 UseDistanceMatrix = new BoolValue(true); … … 418 416 evaluator = new TSPRoundedEuclideanPathEvaluator(); 419 417 break; 418 case DistanceMeasure.UpperEuclidean: 419 evaluator = new TSPUpperEuclideanPathEvaluator(); 420 break; 420 421 case DistanceMeasure.Geo: 421 422 evaluator = new TSPGeoPathEvaluator();
Note: See TracChangeset
for help on using the changeset viewer.