Changeset 7548 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.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.QAPLIB/3.3/QAPLIBInstanceProvider.cs (modified) (5 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.QAPLIB {
-  public class QAPLIBInstanceProvider : ProblemInstanceProvider<QAPInstance> {
+  public class QAPLIBInstanceProvider : ProblemInstanceProvider<QAPData> {
     public override string Name {
       get { return "QAPLIB"; }
@@ -49 +49 @@
     }
 
-    public override IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var solutions = Assembly.GetExecutingAssembly()
         .GetManifestResourceNames()
@@ -59 +59 @@
           .Where(x => x.EndsWith(".dat"))
           .OrderBy(x => x)
-          .Select(x => new QAPLIBInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
+          .Select(x => new QAPLIBDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
     }
 
-    public override QAPInstance LoadInstance(IInstanceDescriptor id) {
-      var descriptor = (QAPLIBInstanceDescriptor)id;
+    public override QAPData LoadData(IDataDescriptor id) {
+      var descriptor = (QAPLIBDataDescriptor)id;
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
@@ -87 +87 @@
     }
 
-    public override QAPInstance LoadInstance(string path) {
+    public override QAPData LoadData(string path) {
       var parser = new QAPLIBParser();
       parser.Parse(path);
@@ -96 +96 @@
     }
 
-    public override void SaveInstance(QAPInstance instance, string path) {
+    public override void SaveData(QAPData instance, string path) {
       throw new NotSupportedException();
     }
 
-    private QAPInstance Load(QAPLIBParser parser) {
-      var instance = new QAPInstance();
+    private QAPData Load(QAPLIBParser parser) {
+      var instance = new QAPData();
       instance.Dimension = parser.Size;
       instance.Distances = parser.Distances;