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

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

Location:

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

Files:

• ElloumiCTAPInstance.cs (deleted)
• ElloumiCTAPInstanceProvider.cs (modified) (3 diffs)
• ElloumiCTAPParser.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

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

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

@@ -32 +32 @@
     public double[] MemoryRequirements { get; private set; }
     public double[] MemoryCapacities { get; private set; }
-    public Exception Error { get; private set; }
 
     public ElloumiCTAPParser() {
@@ -45 +44 @@
       MemoryRequirements = null;
       MemoryCapacities = null;
-      Error = null;
     }
 
-    public bool Parse(string file) {
+    public void Parse(string file) {
       using (Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read)) {
-        return Parse(stream);
+        Parse(stream);
       }
     }
@@ -62 +60 @@
     /// <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);
 
-        Tasks = int.Parse(line);
+      Tasks = int.Parse(line);
 
+      line = Continue(reader);
+
+      Processors = int.Parse(line);
+
+      line = Continue(reader);
+
+      ExecutionCosts = new double[Processors, Tasks];
+      for (int i = 0; i < Processors; i++) {
+        string[] costsPerTask = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+        for (int j = 0; j < Tasks; j++)
+          ExecutionCosts[i, j] = double.Parse(costsPerTask[j], CultureInfo.InvariantCulture.NumberFormat);
         line = Continue(reader);
+      }
 
-        Processors = int.Parse(line);
+      CommunicationCosts = new double[Tasks, Tasks];
+      for (int i = 0; i < Tasks - 1; i++) {
+        string[] costsTaskToTasks = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+        for (int j = i + 1; j < Tasks; j++) {
+          CommunicationCosts[i, j] = double.Parse(costsTaskToTasks[j - i - 1], CultureInfo.InvariantCulture.NumberFormat);
+          CommunicationCosts[j, i] = CommunicationCosts[i, j];
+        }
+        line = Continue(reader);
+      }
 
-        line = Continue(reader);
+      MemoryRequirements = new double[Tasks];
+      string[] requirementsPerTask = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+      for (int i = 0; i < Tasks; i++)
+        MemoryRequirements[i] = double.Parse(requirementsPerTask[i], CultureInfo.InvariantCulture.NumberFormat);
 
-        ExecutionCosts = new double[Processors, Tasks];
-        for (int i = 0; i < Processors; i++) {
-          string[] costsPerTask = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-          for (int j = 0; j < Tasks; j++)
-            ExecutionCosts[i, j] = double.Parse(costsPerTask[j], CultureInfo.InvariantCulture.NumberFormat);
-          line = Continue(reader);
-        }
+      line = Continue(reader);
 
-        CommunicationCosts = new double[Tasks, Tasks];
-        for (int i = 0; i < Tasks - 1; i++) {
-          string[] costsTaskToTasks = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-          for (int j = i + 1; j < Tasks; j++) {
-            CommunicationCosts[i, j] = double.Parse(costsTaskToTasks[j - i - 1], CultureInfo.InvariantCulture.NumberFormat);
-            CommunicationCosts[j, i] = CommunicationCosts[i, j];
-          }
-          line = Continue(reader);
-        }
+      MemoryCapacities = new double[Processors];
+      string[] capacitiesPerProcessor = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
+      for (int i = 0; i < Processors; i++)
+        MemoryCapacities[i] = double.Parse(capacitiesPerProcessor[i], CultureInfo.InvariantCulture.NumberFormat);
 
-        MemoryRequirements = new double[Tasks];
-        string[] requirementsPerTask = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-        for (int i = 0; i < Tasks; i++)
-          MemoryRequirements[i] = double.Parse(requirementsPerTask[i], CultureInfo.InvariantCulture.NumberFormat);
-
-        line = Continue(reader);
-
-        MemoryCapacities = new double[Processors];
-        string[] capacitiesPerProcessor = line.Split(separator, StringSplitOptions.RemoveEmptyEntries);
-        for (int i = 0; i < Processors; i++)
-          MemoryCapacities[i] = double.Parse(capacitiesPerProcessor[i], CultureInfo.InvariantCulture.NumberFormat);
-
-        return true;
-      } catch (Exception e) {
-        Error = e;
-        return false;
-      }
     }
 

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

@@ -133 +133 @@
     <EmbeddedResource Include="Data\tassc2005De.dat" />
     <None Include="Plugin.cs.frame" />
-    <Compile Include="ElloumiCTAPInstance.cs" />
     <Compile Include="ElloumiCTAPInstanceDescriptor.cs" />
     <Compile Include="ElloumiCTAPInstanceProvider.cs" />

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

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