Changeset 7842 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

Timestamp:

05/16/12 16:28:49 (12 years ago)

Author:

gkronber

Message:

merged r7609:7840 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs (modified) (3 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text.RegularExpressions;
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
-  public class TSPLIBTSPInstanceProvider : ProblemInstanceProvider<TSPData> {
+  public class TSPLIBTSPInstanceProvider : TSPLIBInstanceProvider<TSPData> {
 
     public override string Name {
@@ -38 +35 @@
     }
 
-    public override Uri WebLink {
-      get { return new Uri("http://comopt.ifi.uni-heidelberg.de/software/TSPLIB95/"); }
-    }
+    protected override string FileExtension { get { return "tsp"; } }
 
-    public override string ReferencePublication {
-      get {
-        return @"G. Reinelt. 1991.
-TSPLIB - A Traveling Salesman Problem Library.
-ORSA Journal on Computing, 3, pp. 376-384.";
-      }
-    }
-
-    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
-      var solutions = Assembly.GetExecutingAssembly()
-        .GetManifestResourceNames()
-        .Where(x => Regex.Match(x, @".*\.Data\.TSP\..*").Success)
-        .Where(x => x.EndsWith(".opt.tour"))
-        .ToDictionary(x => x.Substring(0, x.Length - ".opt.tour".Length) + ".tsp", x => x);
-
-      return Assembly.GetExecutingAssembly()
-        .GetManifestResourceNames()
-        .Where(x => Regex.Match(x, @".*\.Data\.TSP\..*").Success)
-        .Where(x => x.EndsWith(".tsp"))
-        .OrderBy(x => x)
-        .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
-    }
-
-    public override TSPData LoadData(IDataDescriptor id) {
-      var descriptor = (TSPLIBDataDescriptor)id;
-      using (var stream = Assembly.GetExecutingAssembly()
-        .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
-        var parser = new TSPLIBParser(stream);
-        var instance = Load(parser);
-
-        if (!String.IsNullOrEmpty(descriptor.SolutionIdentifier)) {
-          using (Stream solStream = Assembly.GetExecutingAssembly()
-            .GetManifestResourceStream(descriptor.SolutionIdentifier)) {
-            var tourParser = new TSPLIBParser(solStream);
-            tourParser.Parse();
-            instance.BestKnownTour = tourParser.Tour[0];
-          }
-        }
-        return instance;
-      }
-    }
-
-    public override TSPData LoadData(string path) {
-      return Load(new TSPLIBParser(path));
-    }
-
-    public TSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
-      var data = Load(new TSPLIBParser(tspFile));
-      if (bestQuality.HasValue)
-        data.BestKnownQuality = bestQuality.Value;
-      else data.BestKnownQuality = null;
-      if (!String.IsNullOrEmpty(tourFile)) {
-        var tourParser = new TSPLIBParser(tourFile);
-        tourParser.Parse();
-        data.BestKnownTour = tourParser.Tour[0];
-      }
-      return data;
-    }
-
-    public override void SaveData(TSPData instance, string path) {
-      throw new NotSupportedException();
-    }
-
-    private TSPData Load(TSPLIBParser parser) {
+    protected override TSPData LoadInstance(TSPLIBParser parser) {
       parser.Parse();
       if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
@@ -140 +72 @@
       instance.Description = parser.Comment
         + Environment.NewLine + Environment.NewLine
-        + GetDescription();
+        + GetInstanceDescription();
       return instance;
     }
 
-    private string GetPrettyName(string instanceIdentifier) {
-      return Regex.Match(instanceIdentifier, GetType().Namespace + @"\.Data\.TSP\.(.*)\.tsp").Groups[1].Captures[0].Value;
+    protected override void LoadSolution(TSPLIBParser parser, TSPData instance) {
+      parser.Parse();
+      instance.BestKnownTour = parser.Tour.FirstOrDefault();
     }
 
-    private string GetDescription() {
-      return "Embedded instance of plugin version " + Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true).Cast<AssemblyFileVersionAttribute>().First().Version + ".";
+    public TSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
+      var data = LoadInstance(new TSPLIBParser(tspFile));
+      if (!String.IsNullOrEmpty(tourFile)) {
+        var tourParser = new TSPLIBParser(tourFile);
+        LoadSolution(tourParser, data);
+      }
+      if (bestQuality.HasValue)
+        data.BestKnownQuality = bestQuality.Value;
+      return data;
     }
+
   }
 }