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

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/ElloumiCTAPInstanceProvider.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.ElloumiCTAP {
-  public class ElloumiCTAPInstanceProvider : ProblemInstanceProvider<CTAPInstance> {
+  public class ElloumiCTAPInstanceProvider : ProblemInstanceProvider<CTAPData> {
     public override string Name {
       get { return "Elloumi's CTAP instances"; }
@@ -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 ElloumiCTAPInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
+          .Select(x => new ElloumiCTAPDataDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
     }
 
-    public override CTAPInstance LoadInstance(IInstanceDescriptor id) {
-      var descriptor = (ElloumiCTAPInstanceDescriptor)id;
+    public override CTAPData LoadData(IDataDescriptor id) {
+      var descriptor = (ElloumiCTAPDataDescriptor)id;
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
@@ -88 +88 @@
     }
 
-    public override CTAPInstance LoadInstance(string path) {
+    public override CTAPData LoadData(string path) {
       var parser = new ElloumiCTAPParser();
       parser.Parse(path);
@@ -97 +97 @@
     }
 
-    public override void SaveInstance(CTAPInstance instance, string path) {
+    public override void SaveData(CTAPData instance, string path) {
       throw new NotSupportedException();
     }
 
-    private CTAPInstance Load(ElloumiCTAPParser parser) {
-      var instance = new CTAPInstance();
+    private CTAPData Load(ElloumiCTAPParser parser) {
+      var instance = new CTAPData();
       instance.Processors = parser.Processors;
       instance.Tasks = parser.Tasks;