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

Timestamp:

02/03/12 18:22:41 (12 years ago)

Author:

abeham

Message:

#1614

• Added Transpose() extension method for double[,] matrices
• Added IProblemInstanceConsumer<T> interface
• Implemented general ProblemView which auto-detects all instances a problem can consume
• Added ability of IProblemInstanceProvider to directly feed a consumer
• Implemented general view for problem instance providers
• Fixed a few bugs

Location:

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

Files:

• HeuristicLab.Problems.Instances.QAPLIB-3.3.csproj (modified) (1 diff)
• Plugin.cs (modified) (1 diff)
• QAPLIBInstanceProvider.cs (modified) (2 diffs)

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.Instances {
-  [Plugin("HeuristicLab.Problems.Instances.QAPLIB", "3.3.6.7444")]
+  [Plugin("HeuristicLab.Problems.Instances.QAPLIB", "3.3.6.7445")]
   [PluginFile("HeuristicLab.Problems.Instances.QAPLIB-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabProblemsInstancesQAPLIBPlugin : PluginBase {

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

@@ -29 +29 @@
 namespace HeuristicLab.Problems.Instances.QAPLIB {
   public class QAPLIBInstanceProvider : IProblemInstanceProvider<IQAPInstance> {
+    IProblemInstanceConsumer<IQAPInstance> consumer;
+
     public string Name {
       get { return "QAPLIB"; }
@@ -39 +41 @@
     public 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));
     }