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

Timestamp:

02/13/12 16:35:13 (13 years ago)

Author:

abeham

Message:

#1614

• included TSLIB's ATSP and CVRP problems as well

Location:

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

Files:

• ElloumiCTAPInstance.cs (modified) (1 diff)
• ElloumiCTAPInstanceProvider.cs (modified) (3 diffs)

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

@@ -22 +22 @@
 namespace HeuristicLab.Problems.Instances.ElloumiCTAP {
   internal class ElloumiCTAPInstance : ICTAPInstance {
-    public string Name { get; internal set; }
-    public string Description { get; internal set; }
-    public double[,] ExecutionCosts { get; internal set; }
-    public double[,] CommunicationCosts { get; internal set; }
-    public double[] MemoryRequirements { get; internal set; }
-    public double[] MemoryCapacities { get; internal set; }
-    public int[] BestKnownAssignment { get; internal set; }
-    public double? BestKnownQuality { get; internal set; }
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public int Processors { get; set; }
+    public int Tasks { get; set; }
+    public double[,] ExecutionCosts { get; set; }
+    public double[,] CommunicationCosts { get; set; }
+    public double[] MemoryRequirements { get; set; }
+    public double[] MemoryCapacities { get; set; }
+    public int[] BestKnownAssignment { get; set; }
+    public double? BestKnownQuality { get; set; }
   }
 }

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.ElloumiCTAP {
-  public class ElloumiCTAPInstanceProvider : IProblemInstanceProvider<ICTAPInstance> {
-    private IProblemInstanceConsumer<ICTAPInstance> consumer;
-
-    public string Name {
+  public class ElloumiCTAPInstanceProvider : ProblemInstanceProvider<ICTAPInstance> {
+    public override string Name {
       get { return "Elloumi's CTAP instances"; }
     }
 
-    public string Description {
+    public override string Description {
       get { return "CTAP instances published by Sourour Elloumi"; }
     }
 
-    public Uri Link {
+    public override Uri Link {
       get { return new Uri("http://cedric.cnam.fr/oc/TAP/TAP.html"); }
     }
 
-    public bool ConsumerCanBeFed {
-      get { return consumer != null; }
-    }
-
-    public void SetConsumer(IProblemInstanceConsumer consumer) {
-      if (consumer is IProblemInstanceConsumer<ICTAPInstance>)
-        this.consumer = (IProblemInstanceConsumer<ICTAPInstance>)consumer;
-      else this.consumer = null;
-    }
-
-    public void FeedConsumer(IInstanceDescriptor descriptor) {
-      consumer.LoadFrom(GetInstance(descriptor));
-    }
-
-    public IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
+    public override IEnumerable<IInstanceDescriptor> GetInstanceDescriptors() {
       var solutions = Assembly.GetExecutingAssembly()
         .GetManifestResourceNames()
@@ -70 +54 @@
     }
 
-    public ICTAPInstance GetInstance(IInstanceDescriptor id) {
+    public override ICTAPInstance GetInstance(IInstanceDescriptor id) {
       var descriptor = (ElloumiCTAPInstanceDescriptor)id;
       var instance = new ElloumiCTAPInstance();
@@ -78 +62 @@
         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;