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

Timestamp:

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

Author:

abeham

Message:

#1614

• included TSLIB's ATSP and CVRP problems as well

Location:

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

Files:

• . (modified) (1 prop)
• Plugin.cs (deleted)
• QAPLIBInstance.cs (modified) (1 diff)
• QAPLIBInstanceProvider.cs (modified) (3 diffs)

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

@@ -1 +1 @@
 *.user
 obj
+Plugin.cs

@@ -1 +1 @@
 *.user
 obj
+Plugin.cs

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstance.cs

@@ -24 +24 @@
     public string Name { get; set; }
     public string Description { get; set; }
+    public int Dimension { get; set; }
     public double[,] Distances { get; set; }
     public double[,] Weights { get; set; }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Problems.Instances.QAPLIB {
-  public class QAPLIBInstanceProvider : IProblemInstanceProvider<IQAPInstance> {
-    IProblemInstanceConsumer<IQAPInstance> consumer;
-
-    public string Name {
+  public class QAPLIBInstanceProvider : ProblemInstanceProvider<IQAPInstance> {
+    public override string Name {
       get { return "QAPLIB"; }
     }
 
-    public string Description {
+    public override string Description {
       get { return "Quadratic Assignment Problem Library"; }
     }
 
-    public Uri Link {
+    public override Uri Link {
       get { return new Uri("http://www.seas.upenn.edu/qaplib/"); }
     }
 
-    public bool ConsumerCanBeFed {
-      get { return consumer != null; }
-    }
-
-    public void SetConsumer(IProblemInstanceConsumer consumer) {
-      if (consumer is IProblemInstanceConsumer<IQAPInstance>)
-        this.consumer = (IProblemInstanceConsumer<IQAPInstance>)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 IQAPInstance GetInstance(IInstanceDescriptor id) {
+    public override IQAPInstance GetInstance(IInstanceDescriptor id) {
       var descriptor = (QAPLIBInstanceDescriptor)id;
       var instance = new QAPLIBInstance();
@@ -78 +62 @@
         datParser.Parse(stream);
         if (datParser.Error != null) throw datParser.Error;
+        instance.Dimension = datParser.Size;
         instance.Distances = datParser.Distances;
         instance.Weights = datParser.Weights;

@@ -1 +1 @@
 *.user
 obj
+Plugin.cs