Changeset 11299 for branches/HeuristicLab.Problems.Orienteering

Timestamp:

08/26/14 09:24:02 (10 years ago)

Author:

pfleck

Message:

#2208:
Renamed SchildeOP in Schilde.

Location:

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3

Files:

• Data/Schilde.zip (moved) (moved from branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/Data/SchildeOP.zip)
• SchildeInstanceProvider.cs (moved) (moved from branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeOPInstanceProvider.cs) (5 diffs)
• SchildeParser.cs (moved) (moved from branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeOPParser.cs) (1 diff)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeInstanceProvider.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.Instances.Orienteering {
-  public class SchildeOPInstanceProvider : ProblemInstanceProvider<OPData> {
+  public class SchildeInstanceProvider : ProblemInstanceProvider<OPData> {
     public override string Name {
-      get { return "Schilde OP instances"; }
+      get { return "Schilde (OP)"; }
     }
     public override string Description {
@@ -44 +44 @@
     }
 
-    private const string FileName = "SchildeOP";
+    private const string FileName = "Schilde";
 
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
@@ -59 +59 @@
       var descriptor = (OPDataDescriptor)id;
       var instanceArchiveName = GetResourceName(FileName + @"\.zip");
-      var parser = new SchildeOPParser();
+      var parser = new SchildeParser();
       using (var instancesZipFile = new ZipFile(GetType().Assembly.GetManifestResourceStream(instanceArchiveName))) {
         var entry = instancesZipFile.GetEntry(descriptor.InstanceIdentifier);
@@ -78 +78 @@
     }
     public override OPData ImportData(string path) {
-      var parser = new SchildeOPParser();
+      var parser = new SchildeParser();
       parser.Parse(path);
       var instance = LoadInstance(parser);
@@ -88 +88 @@
     }
 
-    private OPData LoadInstance(SchildeOPParser parser) {
+    private OPData LoadInstance(SchildeParser parser) {
       return new OPData {
         Dimension = parser.Coordinates.GetLength(0),
         Coordinates = parser.Coordinates,
         Distances = parser.Distances,
+        DistanceMeasure = parser.Distances != null ? DistanceMeasure.Direct : DistanceMeasure.Euclidean,
         MaximumDistance = parser.UpperBoundConstraint,
         StartingPoint = parser.StartingPoint,

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Instances.Orienteering/3.3/SchildeParser.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.Instances.Orienteering {
-  public class SchildeOPParser {
+  public class SchildeParser {
     private static readonly IFormatProvider FormatProvider = new CultureInfo("en-US");