- Timestamp:
- 06/21/12 18:02:33 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:ignore
-
old new 20 20 bin 21 21 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs
r7618 r8085 46 46 switch (parser.EdgeWeightType) { 47 47 case TSPLIBEdgeWeightTypes.ATT: 48 instance.DistanceMeasure = CVRPDistanceMeasure.Att; break;48 instance.DistanceMeasure = DistanceMeasure.Att; break; 49 49 case TSPLIBEdgeWeightTypes.CEIL_2D: 50 instance.DistanceMeasure = CVRPDistanceMeasure.UpperEuclidean; break;50 instance.DistanceMeasure = DistanceMeasure.UpperEuclidean; break; 51 51 case TSPLIBEdgeWeightTypes.EUC_2D: 52 52 case TSPLIBEdgeWeightTypes.EUC_3D: 53 instance.DistanceMeasure = CVRPDistanceMeasure.RoundedEuclidean; break;53 instance.DistanceMeasure = DistanceMeasure.RoundedEuclidean; break; 54 54 case TSPLIBEdgeWeightTypes.EXPLICIT: 55 instance.DistanceMeasure = CVRPDistanceMeasure.Direct; break;55 instance.DistanceMeasure = DistanceMeasure.Direct; break; 56 56 case TSPLIBEdgeWeightTypes.GEO: 57 instance.DistanceMeasure = CVRPDistanceMeasure.Geo; break;57 instance.DistanceMeasure = DistanceMeasure.Geo; break; 58 58 case TSPLIBEdgeWeightTypes.MAN_2D: 59 59 case TSPLIBEdgeWeightTypes.MAN_3D: 60 instance.DistanceMeasure = CVRPDistanceMeasure.Manhattan; break;60 instance.DistanceMeasure = DistanceMeasure.Manhattan; break; 61 61 case TSPLIBEdgeWeightTypes.MAX_2D: 62 62 case TSPLIBEdgeWeightTypes.MAX_3D: 63 instance.DistanceMeasure = CVRPDistanceMeasure.Maximum; break;63 instance.DistanceMeasure = DistanceMeasure.Maximum; break; 64 64 default: 65 65 throw new InvalidDataException("The given edge weight is not supported by HeuristicLab."); -
branches/GP-MoveOperators/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs
r7618 r8085 46 46 switch (parser.EdgeWeightType) { 47 47 case TSPLIBEdgeWeightTypes.ATT: 48 instance.DistanceMeasure = TSPDistanceMeasure.Att; break;48 instance.DistanceMeasure = DistanceMeasure.Att; break; 49 49 case TSPLIBEdgeWeightTypes.CEIL_2D: 50 instance.DistanceMeasure = TSPDistanceMeasure.UpperEuclidean; break;50 instance.DistanceMeasure = DistanceMeasure.UpperEuclidean; break; 51 51 case TSPLIBEdgeWeightTypes.EUC_2D: 52 instance.DistanceMeasure = TSPDistanceMeasure.RoundedEuclidean; break;52 instance.DistanceMeasure = DistanceMeasure.RoundedEuclidean; break; 53 53 case TSPLIBEdgeWeightTypes.EUC_3D: 54 54 throw new InvalidDataException("3D coordinates are not supported."); 55 55 case TSPLIBEdgeWeightTypes.EXPLICIT: 56 instance.DistanceMeasure = TSPDistanceMeasure.Direct; break;56 instance.DistanceMeasure = DistanceMeasure.Direct; break; 57 57 case TSPLIBEdgeWeightTypes.GEO: 58 instance.DistanceMeasure = TSPDistanceMeasure.Geo; break;58 instance.DistanceMeasure = DistanceMeasure.Geo; break; 59 59 case TSPLIBEdgeWeightTypes.MAN_2D: 60 instance.DistanceMeasure = TSPDistanceMeasure.Manhattan; break;60 instance.DistanceMeasure = DistanceMeasure.Manhattan; break; 61 61 case TSPLIBEdgeWeightTypes.MAN_3D: 62 62 throw new InvalidDataException("3D coordinates are not supported."); 63 63 case TSPLIBEdgeWeightTypes.MAX_2D: 64 instance.DistanceMeasure = TSPDistanceMeasure.Maximum; break;64 instance.DistanceMeasure = DistanceMeasure.Maximum; break; 65 65 case TSPLIBEdgeWeightTypes.MAX_3D: 66 66 throw new InvalidDataException("3D coordinates are not supported.");
Note: See TracChangeset
for help on using the changeset viewer.