Changeset 7538 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

Timestamp:

03/01/12 15:15:22 (12 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.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -27 +28 @@
 
 namespace HeuristicLab.Problems.Instances.CordeauGQAP {
-  public class CordeauGQAPInstanceProvider : ProblemInstanceProvider<IGQAPInstance> {
+  public class CordeauGQAPInstanceProvider : ProblemInstanceProvider<GQAPInstance> {
     public override string Name {
       get { return "Cordeau et al. GQAP instances"; }
@@ -56 +57 @@
     }
 
-    public override IGQAPInstance GetInstance(IInstanceDescriptor id) {
+    public override GQAPInstance LoadInstance(IInstanceDescriptor id) {
       var descriptor = (CordeauGQAPInstanceDescriptor)id;
-      var instance = new CordeauGQAPInstance();
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
         var parser = new CordeauGQAPParser();
         parser.Parse(stream);
-        if (parser.Error != null) throw parser.Error;
-        instance.Equipments = parser.Equipments;
-        instance.Locations = parser.Locations;
-        instance.Demands = parser.Demands;
-        instance.Capacities = parser.Capacities;
-        instance.Weights = parser.Weights;
-        instance.Distances = parser.Distances;
-        instance.InstallationCosts = parser.InstallationCosts;
-        instance.TransportationCosts = parser.TransportationCosts;
+        var instance = Load(parser);
 
         instance.Name = id.Name;
         instance.Description = id.Description;
+
+        return instance;
       }
+    }
+
+    public override GQAPInstance LoadInstance(string path) {
+      var parser = new CordeauGQAPParser();
+      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(GQAPInstance instance, string path) {
+      throw new NotSupportedException();
+    }
+
+    private GQAPInstance Load(CordeauGQAPParser parser) {
+      var instance = new GQAPInstance();
+      instance.Equipments = parser.Equipments;
+      instance.Locations = parser.Locations;
+      instance.Demands = parser.Demands;
+      instance.Capacities = parser.Capacities;
+      instance.Weights = parser.Weights;
+      instance.Distances = parser.Distances;
+      instance.InstallationCosts = parser.InstallationCosts;
+      instance.TransportationCosts = parser.TransportationCosts;
       return instance;
     }