Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
- Timestamp:
- 07/18/14 12:35:00 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll11 10 HeuristicLab 3.3.5.1.ReSharper.user 12 11 HeuristicLab 3.3.6.0.ReSharper.user 13 12 HeuristicLab.4.5.resharper.user 14 13 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development16 14 HeuristicLab.resharper.user 17 15 ProtoGen.exe … … 19 17 _ReSharper.HeuristicLab 20 18 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests22 19 _ReSharper.HeuristicLab.ExtLibs 23 20 bin 24 21 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HiveStatistics/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 382 382 if (data.Dimension > DistanceMatrixSizeLimit && (data.DistanceMeasure == DistanceMeasure.Att 383 383 || data.DistanceMeasure == DistanceMeasure.Manhattan 384 || data.DistanceMeasure == DistanceMeasure.Maximum)) 384 || data.DistanceMeasure == DistanceMeasure.Maximum 385 || data.DistanceMeasure == DistanceMeasure.UpperEuclidean)) 385 386 throw new System.IO.InvalidDataException("The given instance uses an unsupported distance measure and is too large for using a distance matrix."); 386 387 if (data.Coordinates != null && data.Coordinates.GetLength(1) != 2) … … 398 399 if (data.DistanceMeasure == DistanceMeasure.Att 399 400 || data.DistanceMeasure == DistanceMeasure.Manhattan 400 || data.DistanceMeasure == DistanceMeasure.Maximum) { 401 || data.DistanceMeasure == DistanceMeasure.Maximum 402 || data.DistanceMeasure == DistanceMeasure.UpperEuclidean) { 401 403 evaluator = new TSPDistanceMatrixEvaluator(); 402 404 UseDistanceMatrix = new BoolValue(true); … … 416 418 evaluator = new TSPRoundedEuclideanPathEvaluator(); 417 419 break; 418 case DistanceMeasure.UpperEuclidean:419 evaluator = new TSPUpperEuclideanPathEvaluator();420 break;421 420 case DistanceMeasure.Geo: 422 421 evaluator = new TSPGeoPathEvaluator();
Note: See TracChangeset
for help on using the changeset viewer.