Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/22/12 17:38:36 (12 years ago)
Author:
svonolfe
Message:

Moved distance measure to helper class (#1782)

Location:
trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs

    r7618 r7872  
    4646      switch (parser.EdgeWeightType) {
    4747        case TSPLIBEdgeWeightTypes.ATT:
    48           instance.DistanceMeasure = CVRPDistanceMeasure.Att; break;
     48          instance.DistanceMeasure = DistanceMeasure.Att; break;
    4949        case TSPLIBEdgeWeightTypes.CEIL_2D:
    50           instance.DistanceMeasure = CVRPDistanceMeasure.UpperEuclidean; break;
     50          instance.DistanceMeasure = DistanceMeasure.UpperEuclidean; break;
    5151        case TSPLIBEdgeWeightTypes.EUC_2D:
    5252        case TSPLIBEdgeWeightTypes.EUC_3D:
    53           instance.DistanceMeasure = CVRPDistanceMeasure.RoundedEuclidean; break;
     53          instance.DistanceMeasure = DistanceMeasure.RoundedEuclidean; break;
    5454        case TSPLIBEdgeWeightTypes.EXPLICIT:
    55           instance.DistanceMeasure = CVRPDistanceMeasure.Direct; break;
     55          instance.DistanceMeasure = DistanceMeasure.Direct; break;
    5656        case TSPLIBEdgeWeightTypes.GEO:
    57           instance.DistanceMeasure = CVRPDistanceMeasure.Geo; break;
     57          instance.DistanceMeasure = DistanceMeasure.Geo; break;
    5858        case TSPLIBEdgeWeightTypes.MAN_2D:
    5959        case TSPLIBEdgeWeightTypes.MAN_3D:
    60           instance.DistanceMeasure = CVRPDistanceMeasure.Manhattan; break;
     60          instance.DistanceMeasure = DistanceMeasure.Manhattan; break;
    6161        case TSPLIBEdgeWeightTypes.MAX_2D:
    6262        case TSPLIBEdgeWeightTypes.MAX_3D:
    63           instance.DistanceMeasure = CVRPDistanceMeasure.Maximum; break;
     63          instance.DistanceMeasure = DistanceMeasure.Maximum; break;
    6464        default:
    6565          throw new InvalidDataException("The given edge weight is not supported by HeuristicLab.");
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

    r7618 r7872  
    4646      switch (parser.EdgeWeightType) {
    4747        case TSPLIBEdgeWeightTypes.ATT:
    48           instance.DistanceMeasure = TSPDistanceMeasure.Att; break;
     48          instance.DistanceMeasure = DistanceMeasure.Att; break;
    4949        case TSPLIBEdgeWeightTypes.CEIL_2D:
    50           instance.DistanceMeasure = TSPDistanceMeasure.UpperEuclidean; break;
     50          instance.DistanceMeasure = DistanceMeasure.UpperEuclidean; break;
    5151        case TSPLIBEdgeWeightTypes.EUC_2D:
    52           instance.DistanceMeasure = TSPDistanceMeasure.RoundedEuclidean; break;
     52          instance.DistanceMeasure = DistanceMeasure.RoundedEuclidean; break;
    5353        case TSPLIBEdgeWeightTypes.EUC_3D:
    5454          throw new InvalidDataException("3D coordinates are not supported.");
    5555        case TSPLIBEdgeWeightTypes.EXPLICIT:
    56           instance.DistanceMeasure = TSPDistanceMeasure.Direct; break;
     56          instance.DistanceMeasure = DistanceMeasure.Direct; break;
    5757        case TSPLIBEdgeWeightTypes.GEO:
    58           instance.DistanceMeasure = TSPDistanceMeasure.Geo; break;
     58          instance.DistanceMeasure = DistanceMeasure.Geo; break;
    5959        case TSPLIBEdgeWeightTypes.MAN_2D:
    60           instance.DistanceMeasure = TSPDistanceMeasure.Manhattan; break;
     60          instance.DistanceMeasure = DistanceMeasure.Manhattan; break;
    6161        case TSPLIBEdgeWeightTypes.MAN_3D:
    6262          throw new InvalidDataException("3D coordinates are not supported.");
    6363        case TSPLIBEdgeWeightTypes.MAX_2D:
    64           instance.DistanceMeasure = TSPDistanceMeasure.Maximum; break;
     64          instance.DistanceMeasure = DistanceMeasure.Maximum; break;
    6565        case TSPLIBEdgeWeightTypes.MAX_3D:
    6666          throw new InvalidDataException("3D coordinates are not supported.");
Note: See TracChangeset for help on using the changeset viewer.