Changeset 7538 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP

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

Location:

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

Files:

• CordeauGQAPInstance.cs (deleted)
• CordeauGQAPInstanceProvider.cs (modified) (3 diffs)
• CordeauGQAPParser.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

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;
     }

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

@@ -34 +34 @@
     public double[] Demands { get; private set; }
     public double[] Capacities { get; private set; }
-    public Exception Error { get; private set; }
 
     public CordeauGQAPParser() {
@@ -48 +47 @@
       Demands = null;
       Capacities = null;
-      Error = null;
     }
 
-    public bool Parse(string file) {
+    public void Parse(string file) {
       using (var stream = new FileStream(file, FileMode.Open, FileAccess.Read)) {
-        return Parse(stream);
+        Parse(stream);
       }
     }
@@ -64 +62 @@
     /// </remarks>
     /// <param name="stream">The stream to read data from.</param>
-    /// <returns>True if the file was successfully read or false otherwise.</returns>
-    public bool Parse(Stream stream) {
-      Error = null;
+    public void Parse(Stream stream) {
       var separator = new char[] { ' ', '\t' };
-      try {
-        StreamReader reader = new StreamReader(stream);
-        string line = Continue(reader);
+      var reader = new StreamReader(stream);
+      string line = Continue(reader);
 
-        var info = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-        Equipments = int.Parse(info[0]);
-        Locations = int.Parse(info[1]);
-        TransportationCosts = double.Parse(info[2]);
+      var info = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+      Equipments = int.Parse(info[0]);
+      Locations = int.Parse(info[1]);
+      TransportationCosts = double.Parse(info[2]);
 
+      line = Continue(reader);
+
+      Weights = new double[Equipments, Equipments];
+      for (int i = 0; i < Equipments; i++) {
+        var weightsPerEquipment = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+        for (int j = 0; j < Equipments; j++) {
+          Weights[i, j] = double.Parse(weightsPerEquipment[j], CultureInfo.InvariantCulture.NumberFormat);
+        }
         line = Continue(reader);
+      }
 
-        Weights = new double[Equipments, Equipments];
-        for (int i = 0; i < Equipments; i++) {
-          var weightsPerEquipment = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-          for (int j = 0; j < Equipments; j++) {
-            Weights[i, j] = double.Parse(weightsPerEquipment[j], CultureInfo.InvariantCulture.NumberFormat);
-          }
-          line = Continue(reader);
+      Distances = new double[Locations, Locations];
+      for (int i = 0; i < Locations; i++) {
+        var distancePerLocation = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+        for (int j = 0; j < Locations; j++) {
+          Distances[i, j] = double.Parse(distancePerLocation[j], CultureInfo.InvariantCulture.NumberFormat);
         }
+        line = Continue(reader);
+      }
 
-        Distances = new double[Locations, Locations];
-        for (int i = 0; i < Locations; i++) {
-          var distancePerLocation = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-          for (int j = 0; j < Locations; j++) {
-            Distances[i, j] = double.Parse(distancePerLocation[j], CultureInfo.InvariantCulture.NumberFormat);
-          }
-          line = Continue(reader);
-        }
+      InstallationCosts = new double[Equipments, Locations];
+      for (int i = 0; i < Equipments; i++) {
+        var costsPerEquipment = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+        for (int j = 0; j < Locations; j++)
+          InstallationCosts[i, j] = double.Parse(costsPerEquipment[j], CultureInfo.InvariantCulture.NumberFormat);
+        line = Continue(reader);
+      }
 
-        InstallationCosts = new double[Equipments, Locations];
-        for (int i = 0; i < Equipments; i++) {
-          var costsPerEquipment = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-          for (int j = 0; j < Locations; j++)
-            InstallationCosts[i, j] = double.Parse(costsPerEquipment[j], CultureInfo.InvariantCulture.NumberFormat);
-          line = Continue(reader);
-        }
+      Demands = new double[Equipments];
+      var demandsPerEquipment = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+      for (int i = 0; i < Equipments; i++)
+        Demands[i] = double.Parse(demandsPerEquipment[i], CultureInfo.InvariantCulture.NumberFormat);
 
-        Demands = new double[Equipments];
-        var demandsPerEquipment = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-        for (int i = 0; i < Equipments; i++)
-          Demands[i] = double.Parse(demandsPerEquipment[i], CultureInfo.InvariantCulture.NumberFormat);
+      line = Continue(reader);
 
-        line = Continue(reader);
-
-        Capacities = new double[Locations];
-        string[] capacityPerLocation = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-        for (int i = 0; i < Locations; i++)
-          Capacities[i] = double.Parse(capacityPerLocation[i], CultureInfo.InvariantCulture.NumberFormat);
-
-        return true;
-      } catch (Exception e) {
-        Error = e;
-        return false;
-      }
+      Capacities = new double[Locations];
+      string[] capacityPerLocation = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+      for (int i = 0; i < Locations; i++)
+        Capacities[i] = double.Parse(capacityPerLocation[i], CultureInfo.InvariantCulture.NumberFormat);
     }
 

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj

@@ -111 +111 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="CordeauGQAPParser.cs" />
-    <Compile Include="CordeauGQAPInstance.cs" />
     <Compile Include="CordeauGQAPInstanceProvider.cs" />
     <Compile Include="CordeauGQAPInstanceDescriptor.cs" />

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/Plugin.cs.frame

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.Instances.CordeauGQAP", "3.3.6.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.Instances.CordeauGQAP-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsInstancesCordeauGQAPPlugin : PluginBase {
   }