Changeset 11299


Ignore:
Timestamp:
08/26/14 09:24:02 (5 years ago)
Author:
pfleck
Message:

#2208:
Renamed SchildeOP in Schilde.

Location:
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3
Files:
3 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeInstanceProvider.cs

    r11298 r11299  
    3030
    3131namespace HeuristicLab.Problems.Instances.Orienteering {
    32   public class SchildeOPInstanceProvider : ProblemInstanceProvider<OPData> {
     32  public class SchildeInstanceProvider : ProblemInstanceProvider<OPData> {
    3333    public override string Name {
    34       get { return "Schilde OP instances"; }
     34      get { return "Schilde (OP)"; }
    3535    }
    3636    public override string Description {
     
    4444    }
    4545
    46     private const string FileName = "SchildeOP";
     46    private const string FileName = "Schilde";
    4747
    4848    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
     
    5959      var descriptor = (OPDataDescriptor)id;
    6060      var instanceArchiveName = GetResourceName(FileName + @"\.zip");
    61       var parser = new SchildeOPParser();
     61      var parser = new SchildeParser();
    6262      using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
    6363        var entry = instancesZipFile.GetEntry(descriptor.InstanceIdentifier);
     
    7878    }
    7979    public override OPData ImportData(string path) {
    80       var parser = new SchildeOPParser();
     80      var parser = new SchildeParser();
    8181      parser.Parse(path);
    8282      var instance = LoadInstance(parser);
     
    8888    }
    8989
    90     private OPData LoadInstance(SchildeOPParser parser) {
     90    private OPData LoadInstance(SchildeParser parser) {
    9191      return new OPData {
    9292        Dimension = parser.Coordinates.GetLength(0),
    9393        Coordinates = parser.Coordinates,
    9494        Distances = parser.Distances,
     95        DistanceMeasure = parser.Distances != null ? DistanceMeasure.Direct : DistanceMeasure.Euclidean,
    9596        MaximumDistance = parser.UpperBoundConstraint,
    9697        StartingPoint = parser.StartingPoint,
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeParser.cs

    r11298 r11299  
    2727
    2828namespace HeuristicLab.Problems.Instances.Orienteering {
    29   public class SchildeOPParser {
     29  public class SchildeParser {
    3030    private static readonly IFormatProvider FormatProvider = new CultureInfo("en-US");
    3131
Note: See TracChangeset for help on using the changeset viewer.