Changeset 7548 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB

Timestamp:

03/05/12 16:30:27 (12 years ago)

Author:

abeham

Message:

#1614: changed according to architects review

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3

Files:

• HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj (modified) (1 diff)
• TSPLIBATSPInstanceProvider.cs (modified) (4 diffs)
• TSPLIBCVRPInstanceProvider.cs (modified) (4 diffs)
• TSPLIBDataDescriptor.cs (added)
• TSPLIBInstanceDescriptor.cs (deleted)
• TSPLIBTSPInstanceProvider.cs (modified) (4 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj

@@ -47 +47 @@
     <Compile Include="TSPLIBATSPInstanceProvider.cs" />
     <Compile Include="TSPLIBCVRPInstanceProvider.cs" />
-    <Compile Include="TSPLIBInstanceDescriptor.cs" />
+    <Compile Include="TSPLIBDataDescriptor.cs" />
     <Compile Include="TSPLIBTSPInstanceProvider.cs" />
     <Compile Include="TSPLIBParser.cs" />

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
-  public class TSPLIBATSPInstanceProvider : ProblemInstanceProvider<ATSPInstance> {
+  public class TSPLIBATSPInstanceProvider : ProblemInstanceProvider<ATSPData> {
 
     public override string Name {
@@ -50 +50 @@
     }
 
-    public override IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var solutions = Assembly.GetExecutingAssembly()
         .GetManifestResourceNames()
@@ -62 +62 @@
           .Where(x => x.EndsWith(".atsp"))
           .OrderBy(x => x)
-          .Select(x => new TSPLIBInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
+          .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
     }
 
-    public override ATSPInstance LoadInstance(IInstanceDescriptor id) {
-      var descriptor = (TSPLIBInstanceDescriptor)id;
+    public override ATSPData LoadData(IDataDescriptor id) {
+      var descriptor = (TSPLIBDataDescriptor)id;
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
@@ -83 +83 @@
     }
 
-    public override ATSPInstance LoadInstance(string path) {
+    public override ATSPData LoadData(string path) {
       return Load(new TSPLIBParser(path));
     }
 
-    public override void SaveInstance(ATSPInstance instance, string path) {
+    public override void SaveData(ATSPData instance, string path) {
       throw new NotSupportedException();
     }
 
-    private ATSPInstance Load(TSPLIBParser parser) {
-      var instance = new ATSPInstance();
+    private ATSPData Load(TSPLIBParser parser) {
+      var instance = new ATSPData();
 
       parser.Parse();

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
-  public class TSPLIBCVRPInstanceProvider : ProblemInstanceProvider<CVRPInstance> {
+  public class TSPLIBCVRPInstanceProvider : ProblemInstanceProvider<CVRPData> {
 
     public override string Name {
@@ -50 +50 @@
     }
 
-    public override IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var solutions = Assembly.GetExecutingAssembly()
         .GetManifestResourceNames()
@@ -61 +61 @@
           .Where(x => Regex.Match(x, @".*\.Data\.CVRP\..*").Success)
           .OrderBy(x => x)
-          .Select(x => new TSPLIBInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
+          .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
     }
 
-    public override CVRPInstance LoadInstance(IInstanceDescriptor id) {
-      var descriptor = (TSPLIBInstanceDescriptor)id;
+    public override CVRPData LoadData(IDataDescriptor id) {
+      var descriptor = (TSPLIBDataDescriptor)id;
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
@@ -82 +82 @@
     }
 
-    public override CVRPInstance LoadInstance(string path) {
+    public override CVRPData LoadData(string path) {
       return Load(new TSPLIBParser(path));
     }
 
-    public override void SaveInstance(CVRPInstance instance, string path) {
+    public override void SaveData(CVRPData instance, string path) {
       throw new NotSupportedException();
     }
 
-    private CVRPInstance Load(TSPLIBParser parser) {
+    private CVRPData Load(TSPLIBParser parser) {
       parser.Parse();
-      var instance = new CVRPInstance();
+      var instance = new CVRPData();
       instance.Dimension = parser.Dimension;
       instance.Coordinates = parser.Vertices != null ? parser.Vertices : parser.DisplayVertices;

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
-  public class TSPLIBTSPInstanceProvider : ProblemInstanceProvider<TSPInstance> {
+  public class TSPLIBTSPInstanceProvider : ProblemInstanceProvider<TSPData> {
 
     public override string Name {
@@ -50 +50 @@
     }
 
-    public override IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var solutions = Assembly.GetExecutingAssembly()
         .GetManifestResourceNames()
@@ -62 +62 @@
         .Where(x => x.EndsWith(".tsp"))
         .OrderBy(x => x)
-        .Select(x => new TSPLIBInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
+        .Select(x => new TSPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
     }
 
-    public override TSPInstance LoadInstance(IInstanceDescriptor id) {
-      var descriptor = (TSPLIBInstanceDescriptor)id;
+    public override TSPData LoadData(IDataDescriptor id) {
+      var descriptor = (TSPLIBDataDescriptor)id;
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
@@ -84 +84 @@
     }
 
-    public override TSPInstance LoadInstance(string path) {
+    public override TSPData LoadData(string path) {
       return Load(new TSPLIBParser(path));
     }
 
-    public override void SaveInstance(TSPInstance instance, string path) {
+    public override void SaveData(TSPData instance, string path) {
       throw new NotSupportedException();
     }
 
-    private TSPInstance Load(TSPLIBParser parser) {
+    private TSPData Load(TSPLIBParser parser) {
       parser.Parse();
       if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
-      var instance = new TSPInstance();
+      var instance = new TSPData();
       instance.Dimension = parser.Dimension;
       instance.Coordinates = parser.Vertices != null ? parser.Vertices : parser.DisplayVertices;