Changeset 7538 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/ElloumiCTAPInstanceProvider.cs

Timestamp:

03/01/12 15:15:22 (13 years ago)

Author:

abeham

Message:

#1614

• Fixed plugin dependencies
• Updated GQAP view
• Changed instances infrastructure
  • Changed interface types into classes
  • Removed the library specific instance classes

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/ElloumiCTAPInstanceProvider.cs (modified) (3 diffs)

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.ElloumiCTAP {
-  public class ElloumiCTAPInstanceProvider : ProblemInstanceProvider<ICTAPInstance> {
+  public class ElloumiCTAPInstanceProvider : ProblemInstanceProvider<CTAPInstance> {
     public override string Name {
       get { return "Elloumi's CTAP instances"; }
@@ -62 +62 @@
     }
 
-    public override ICTAPInstance GetInstance(IInstanceDescriptor id) {
+    public override CTAPInstance LoadInstance(IInstanceDescriptor id) {
       var descriptor = (ElloumiCTAPInstanceDescriptor)id;
-      var instance = new ElloumiCTAPInstance();
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
-        ElloumiCTAPParser datParser = new ElloumiCTAPParser();
-        datParser.Parse(stream);
-        if (datParser.Error != null) throw datParser.Error;
-        instance.Processors = datParser.Processors;
-        instance.Tasks = datParser.Tasks;
-        instance.ExecutionCosts = datParser.ExecutionCosts;
-        instance.CommunicationCosts = datParser.CommunicationCosts;
-        instance.MemoryRequirements = datParser.MemoryRequirements;
-        instance.MemoryCapacities = datParser.MemoryCapacities;
+        var parser = new ElloumiCTAPParser();
+        parser.Parse(stream);
+        var instance = Load(parser);
 
         instance.Name = id.Name;
@@ -91 +84 @@
           }
         }
+        return instance;
       }
+    }
+
+    public override CTAPInstance LoadInstance(string path) {
+      var parser = new ElloumiCTAPParser();
+      parser.Parse(path);
+      var instance = Load(parser);
+      instance.Name = Path.GetFileName(path);
+      instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now.ToString();
+      return instance;
+    }
+
+    public override void SaveInstance(CTAPInstance instance, string path) {
+      throw new NotSupportedException();
+    }
+
+    private CTAPInstance Load(ElloumiCTAPParser parser) {
+      var instance = new CTAPInstance();
+      instance.Processors = parser.Processors;
+      instance.Tasks = parser.Tasks;
+      instance.ExecutionCosts = parser.ExecutionCosts;
+      instance.CommunicationCosts = parser.CommunicationCosts;
+      instance.MemoryRequirements = parser.MemoryRequirements;
+      instance.MemoryCapacities = parser.MemoryCapacities;
       return instance;
     }