Changeset 7548 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs

Timestamp:

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

Author:

abeham

Message:

#1614: changed according to architects review

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs (modified) (4 diffs)

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();