Changeset 7466 for branches

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

Files:

• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/ElloumiCTAPInstance.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.ElloumiCTAP/3.3/ElloumiCTAPInstanceProvider.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3 (modified) (1 prop)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/Plugin.cs (deleted)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstance.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstance.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBATSPInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstance.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBCVRPInstanceProvider.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBInstance.cs (deleted)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBParser.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstance.cs (added)
• HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances/3.3 (modified) (1 prop)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances/3.3/Instances/IATSPInstance.cs (added)
• HeuristicLab.Problems.Instances/3.3/Instances/ICTAPInstance.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances/3.3/Instances/ICVRPInstance.cs (added)
• HeuristicLab.Problems.Instances/3.3/Instances/IQAPInstance.cs (modified) (2 diffs)
• HeuristicLab.Problems.Instances/3.3/Instances/ITSPInstance.cs (modified) (4 diffs)
• HeuristicLab.Problems.Instances/3.3/Plugin.cs (deleted)
• HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/ProblemInstanceProviderView.cs

@@ -59 +59 @@
     private void loadButton_Click(object sender, EventArgs e) {
       var instance = (IInstanceDescriptor)instancesComboBox.SelectedItem;
-      Content.FeedConsumer(instance);
+      if (!Content.FeedConsumer(instance)) {
+        MessageBox.Show("Loading the problem instance " + instance.Name + " failed.");
+      }
     }
 

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

@@ -38 +38 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IGQAPSolutionCreator>, IStorableContent, IProblemInstanceConsumer<IQAPInstance>, IProblemInstanceConsumer<ICTAPInstance> {
+  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IGQAPSolutionCreator>, IStorableContent, IProblemInstanceConsumer<IQAPInstance>, IProblemInstanceConsumer<ICTAPInstance>, IProblemInstanceConsumer<ITSPInstance>, IProblemInstanceConsumer<IATSPInstance> {
 
     public override Image ItemImage {
@@ -206 +206 @@
     }
 
-    public void LoadFrom(IQAPInstance instance) {
-      Name = instance.Name;
-      Description = instance.Description;
-
-      Weights = new DoubleMatrix(instance.Weights);
-      Distances = new DoubleMatrix(instance.Distances);
-      InstallationCosts = new DoubleMatrix(Weights.Rows, Distances.Columns); // all zero
-      Capacities = new DoubleArray(Enumerable.Range(0, Distances.Rows).Select(x => 1.0).ToArray());
-      Demands = new DoubleArray(Enumerable.Range(0, Weights.Rows).Select(x => 1.0).ToArray());
-
-      TransportationCosts.Value = 1;
-
-      if (instance.BestKnownAssignment != null) {
-        EvaluateAndLoadAssignment(instance.BestKnownAssignment);
-      } else {
-        BestKnownQuality = null;
-        BestKnownSolution = null;
-        BestKnownSolutions = null;
-      }
-    }
-
-    public void LoadFrom(ICTAPInstance instance) {
-      Name = instance.Name;
-      Description = instance.Description;
-
-      Capacities = new DoubleArray(instance.MemoryCapacities);
-      Demands = new DoubleArray(instance.MemoryRequirements);
-      Weights = new DoubleMatrix(instance.CommunicationCosts);
-      InstallationCosts = new DoubleMatrix(instance.ExecutionCosts.Transpose());
-      Distances = new DoubleMatrix(Capacities.Length, Capacities.Length); // all one, except diagonal
-      for (int i = 0; i < Capacities.Length - 1; i++)
-        for (int j = i + 1; j < Capacities.Length; j++) {
-          Distances[i, j] = 1;
-          Distances[j, i] = 1;
-        }
-
-      TransportationCosts.Value = 1;
-
-      if (instance.BestKnownAssignment != null) {
-        EvaluateAndLoadAssignment(instance.BestKnownAssignment);
-      } else {
-        BestKnownQuality = null;
-        BestKnownSolution = null;
-        BestKnownSolutions = null;
-      }
+    public bool LoadFrom(IQAPInstance instance) {
+      try {
+        Name = instance.Name;
+        Description = instance.Description;
+
+        Weights = new DoubleMatrix(instance.Weights);
+        Distances = new DoubleMatrix(instance.Distances);
+        InstallationCosts = new DoubleMatrix(Weights.Rows, Distances.Columns); // all zero
+        Capacities = new DoubleArray(Enumerable.Range(0, Distances.Rows).Select(x => 1.0).ToArray());
+        Demands = new DoubleArray(Enumerable.Range(0, Weights.Rows).Select(x => 1.0).ToArray());
+
+        TransportationCosts.Value = 1;
+
+        if (instance.BestKnownAssignment != null) {
+          EvaluateAndLoadAssignment(instance.BestKnownAssignment);
+        } else {
+          BestKnownQuality = null;
+          BestKnownSolution = null;
+          BestKnownSolutions = null;
+        }
+      } catch {
+        return false;
+      }
+      return true;
+    }
+
+    public bool LoadFrom(ICTAPInstance instance) {
+      try {
+        Name = instance.Name;
+        Description = instance.Description;
+
+        Capacities = new DoubleArray(instance.MemoryCapacities);
+        Demands = new DoubleArray(instance.MemoryRequirements);
+        Weights = new DoubleMatrix(instance.CommunicationCosts);
+        InstallationCosts = new DoubleMatrix(instance.ExecutionCosts.Transpose());
+        Distances = new DoubleMatrix(Capacities.Length, Capacities.Length); // all one, except diagonal
+        for (int i = 0; i < Capacities.Length - 1; i++)
+          for (int j = i + 1; j < Capacities.Length; j++) {
+            Distances[i, j] = 1;
+            Distances[j, i] = 1;
+          }
+
+        TransportationCosts.Value = 1;
+
+        if (instance.BestKnownAssignment != null) {
+          EvaluateAndLoadAssignment(instance.BestKnownAssignment);
+        } else {
+          BestKnownQuality = null;
+          BestKnownSolution = null;
+          BestKnownSolutions = null;
+        }
+      } catch {
+        return false;
+      }
+      return true;
+    }
+
+    public bool LoadFrom(ITSPInstance instance) {
+      try {
+        if (instance.Dimension > 1000) return false;
+        
+        Name = instance.Name;
+        Description = instance.Description;
+
+        Capacities = new DoubleArray(instance.Dimension);
+        Demands = new DoubleArray(instance.Dimension);
+        for (int i = 0; i < instance.Dimension; i++) {
+          Capacities[i] = 1;
+          Demands[i] = 1;
+        }
+        InstallationCosts = new DoubleMatrix(instance.Dimension, instance.Dimension);
+        Weights = new DoubleMatrix(instance.Dimension, instance.Dimension);
+        for (int i = 0; i < instance.Dimension; i++)
+          Weights[i, (i + 1) % instance.Dimension] = 1;
+        Distances = new DoubleMatrix(instance.GetDistanceMatrix());
+
+        TransportationCosts.Value = 1;
+
+        if (instance.BestKnownTour != null) {
+          EvaluateAndLoadAssignment(instance.BestKnownTour);
+        } else {
+          BestKnownQuality = null;
+          BestKnownSolution = null;
+          BestKnownSolutions = null;
+        }
+      } catch {
+        return false;
+      }
+      return true;
+    }
+
+    public bool LoadFrom(IATSPInstance instance) {
+      try {
+        Name = instance.Name;
+        Description = instance.Description;
+
+        Capacities = new DoubleArray(instance.Dimension);
+        Demands = new DoubleArray(instance.Dimension);
+        for (int i = 0; i < instance.Dimension; i++) {
+          Capacities[i] = 1;
+          Demands[i] = 1;
+        }
+        InstallationCosts = new DoubleMatrix(instance.Dimension, instance.Dimension);
+        Weights = new DoubleMatrix(instance.Dimension, instance.Dimension);
+        for (int i = 0; i < instance.Dimension; i++)
+          Weights[i, (i + 1) % instance.Dimension] = 1;
+        Distances = new DoubleMatrix(instance.Distances);
+
+        TransportationCosts.Value = 1;
+
+        if (instance.BestKnownTour != null) {
+          EvaluateAndLoadAssignment(instance.BestKnownTour);
+        } else {
+          BestKnownQuality = null;
+          BestKnownSolution = null;
+          BestKnownSolutions = null;
+        }
+      } catch {
+        return false;
+      }
+      return true;
     }
 

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;

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;

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

@@ -45 +45 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TSPLIBInstance.cs" />
+    <Compile Include="TSPLIBATSPInstance.cs" />
+    <Compile Include="TSPLIBATSPInstanceProvider.cs" />
+    <Compile Include="TSPLIBCVRPInstance.cs" />
+    <Compile Include="TSPLIBCVRPInstanceProvider.cs" />
+    <Compile Include="TSPLIBTSPInstance.cs" />
     <Compile Include="TSPLIBInstanceDescriptor.cs" />
     <Compile Include="TSPLIBTSPInstanceProvider.cs" />
@@ -192 +196 @@
     <EmbeddedResource Include="Data\TSP\vm1084.tsp" />
     <EmbeddedResource Include="Data\TSP\vm1748.tsp" />
+    <EmbeddedResource Include="Data\ATSP\br17.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ft53.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ft70.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv170.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv33.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv35.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv38.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv44.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv47.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv55.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv64.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ftv70.atsp" />
+    <EmbeddedResource Include="Data\ATSP\kro124p.atsp" />
+    <EmbeddedResource Include="Data\ATSP\p43.atsp" />
+    <EmbeddedResource Include="Data\ATSP\rbg323.atsp" />
+    <EmbeddedResource Include="Data\ATSP\rbg358.atsp" />
+    <EmbeddedResource Include="Data\ATSP\rbg403.atsp" />
+    <EmbeddedResource Include="Data\ATSP\rbg443.atsp" />
+    <EmbeddedResource Include="Data\ATSP\ry48p.atsp" />
+    <EmbeddedResource Include="Data\CVRP\att48.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil13.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil22.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil23.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil30.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil31.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil33.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil51.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eil7.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eilA101.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eilA76.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eilB101.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eilB76.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eilC76.vrp" />
+    <EmbeddedResource Include="Data\CVRP\eilD76.vrp" />
+    <EmbeddedResource Include="Data\CVRP\gil262.vrp" />
     <None Include="Plugin.cs.frame" />
     <Compile Include="Plugin.cs" />
@@ -206 +245 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Data\ATSP\" />
-    <Folder Include="Data\CVRP\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBParser.cs

@@ -525 +525 @@
         || edgeWeightFormat == TSPLIBEdgeWeightFormats.UPPER_ROW;
 
-      int dim1 = !upperTriangular ? (diagonal ? 0 : 1) : 0;
-      int dim2 = upperTriangular ? (diagonal ? 0 : 1) : 0;
+      int dim1 = !triangular && !upperTriangular ? (diagonal ? 0 : 1) : 0;
+      int dim2 = !triangular && upperTriangular ? (diagonal ? 0 : 1) : 0;
       bool finished = false;
       while (!finished) {

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs

@@ -45 +45 @@
       var solutions = Assembly.GetExecutingAssembly()
         .GetManifestResourceNames()
+        .Where(x => Regex.Match(x, @".*\.Data\.TSP\..*").Success)
         .Where(x => x.EndsWith(".opt.tour"))
         .ToDictionary(x => x.Substring(0, x.Length - ".opt.tour".Length) + ".tsp", x => x);
 
       return Assembly.GetExecutingAssembly()
-          .GetManifestResourceNames()
-          .Where(x => x.EndsWith(".tsp"))
-          .OrderBy(x => x)
-          .Select(x => new TSPLIBInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
+        .GetManifestResourceNames()
+        .Where(x => Regex.Match(x, @".*\.Data\.TSP\..*").Success)
+        .Where(x => x.EndsWith(".tsp"))
+        .OrderBy(x => x)
+        .Select(x => new TSPLIBInstanceDescriptor(GetPrettyName(x), GetDescription(), x, solutions.ContainsKey(x) ? solutions[x] : String.Empty));
     }
 
     public override ITSPInstance GetInstance(IInstanceDescriptor id) {
       var descriptor = (TSPLIBInstanceDescriptor)id;
-      var instance = new TSPLIBInstance();
+      var instance = new TSPLIBTSPInstance();
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
-        var tspParser = new TSPLIBParser(stream);
-        tspParser.Parse();
-        instance.Coordinates = tspParser.Vertices != null ? tspParser.Vertices : tspParser.DisplayVertices;
-        instance.Distances = tspParser.Distances;
+        var parser = new TSPLIBParser(stream);
+        parser.Parse();
+        instance.Dimension = parser.Dimension;
+        instance.Coordinates = parser.Vertices != null ? parser.Vertices : parser.DisplayVertices;
+        instance.Distances = parser.Distances;
+        switch (parser.EdgeWeightType) {
+          case TSPLIBEdgeWeightTypes.ATT:
+            instance.DistanceMeasure = TSPDistanceMeasure.Att; break;
+          case TSPLIBEdgeWeightTypes.CEIL_2D:
+            instance.DistanceMeasure = TSPDistanceMeasure.UpperEuclidean; break;
+          case TSPLIBEdgeWeightTypes.EUC_2D:
+            instance.DistanceMeasure = TSPDistanceMeasure.RoundedEuclidean; break;
+          case TSPLIBEdgeWeightTypes.EUC_3D:
+            throw new InvalidDataException("3D coordinates are not supported.");
+          case TSPLIBEdgeWeightTypes.EXPLICIT:
+            instance.DistanceMeasure = TSPDistanceMeasure.Direct; break;
+          case TSPLIBEdgeWeightTypes.GEO:
+            instance.DistanceMeasure = TSPDistanceMeasure.Geo; break;
+          case TSPLIBEdgeWeightTypes.MAN_2D:
+            instance.DistanceMeasure = TSPDistanceMeasure.Manhattan; break;
+          case TSPLIBEdgeWeightTypes.MAN_3D:
+            throw new InvalidDataException("3D coordinates are not supported.");
+          case TSPLIBEdgeWeightTypes.MAX_2D:
+            instance.DistanceMeasure = TSPDistanceMeasure.Maximum; break;
+          case TSPLIBEdgeWeightTypes.MAX_3D:
+            throw new InvalidDataException("3D coordinates are not supported.");
+          default:
+            throw new InvalidDataException("The given edge weight is not supported by HeuristicLab.");
+        }
 
-        instance.Name = tspParser.Name;
-        instance.Description = tspParser.Comment
+        instance.Name = parser.Name;
+        instance.Description = parser.Comment
           + Environment.NewLine + Environment.NewLine
           + GetDescription();
@@ -73 +100 @@
           using (Stream solStream = Assembly.GetExecutingAssembly()
             .GetManifestResourceStream(descriptor.SolutionIdentifier)) {
-            var slnParser = new TSPLIBParser(solStream);
-            slnParser.Parse();
-            instance.BestKnownTour = slnParser.Tour[0];
+            var tourParser = new TSPLIBParser(solStream);
+            tourParser.Parse();
+            instance.BestKnownTour = tourParser.Tour[0];
           }
         }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3

@@ -1 +1 @@
 obj
 bin
+Plugin.cs

@@ -1 +1 @@
 obj
 bin
+Plugin.cs

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

@@ -52 +52 @@
   <ItemGroup>
     <None Include="Plugin.cs.frame" />
+    <Compile Include="Instances\IATSPInstance.cs" />
     <Compile Include="Instances\ICTAPInstance.cs" />
     <Compile Include="IInstanceDescriptor.cs" />
+    <Compile Include="Instances\ICVRPInstance.cs" />
     <Compile Include="Instances\IQAPInstance.cs" />
     <Compile Include="Instances\ITSPInstance.cs" />

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

@@ -24 +24 @@
 
   public interface IProblemInstanceConsumer<TInstance> : IProblemInstanceConsumer {
-    void LoadFrom(TInstance instance);
+    bool LoadFrom(TInstance instance);
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/IProblemInstanceProvider.cs

@@ -33 +33 @@
 
     void SetConsumer(IProblemInstanceConsumer consumer);
-    void FeedConsumer(IInstanceDescriptor descriptor);
+    bool FeedConsumer(IInstanceDescriptor descriptor);
 
     IEnumerable<IInstanceDescriptor> GetInstanceDescriptors();

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/Instances/ICTAPInstance.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.Instances {
+  /// <summary>
+  /// Describes instances of the Capacitated Task Assignment Problem (CTAP).
+  /// </summary>
   public interface ICTAPInstance {
     /// <summary>
@@ -31 +34 @@
     string Description { get; }
 
+    /// <summary>
+    /// The number M of processors
+    /// </summary>
+    int Processors { get; }
+    /// <summary>
+    /// The number N of tasks
+    /// </summary>
+    int Tasks { get; }
     /// <summary>
     /// An MxN Matrix with M = |Processors| and N = |Tasks|

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/Instances/IQAPInstance.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.Instances {
+  /// <summary>
+  /// Describes instances of the Quadratic Assignment Problem (QAP).
+  /// </summary>
   public interface IQAPInstance {
     /// <summary>
@@ -31 +34 @@
     string Description { get; }
 
+    /// <summary>
+    /// The number of facilities (and also the number of locations)
+    /// </summary>
+    int Dimension { get; }
     /// <summary>
     /// An NxN Matrix with N = |Faciliies|

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/Instances/ITSPInstance.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.Problems.Instances {
-  public enum TSPDistanceMeasure { Direct, Euclidean, RoundedEuclidean, Geo };
+  public enum TSPDistanceMeasure { Direct, Euclidean, RoundedEuclidean, UpperEuclidean, Geo, Manhattan, Maximum, Att };
 
+  /// <summary>
+  /// Describes instances of the Traveling Salesman Problem (TSP).
+  /// </summary>
   public interface ITSPInstance {
     /// <summary>
@@ -35 +38 @@
 
     /// <summary>
+    /// The number of cities.
+    /// </summary>
+    int Dimension { get; }
+    /// <summary>
     /// Specifies the distance measure that is to be used.
-    /// 
-    /// Direct           = The distances are given in form of the distance matrix.
-    /// Euclidean        = The distances are calculated as euclidean distance.
-    /// RoundedEuclidean = Each individual euclidean distance is rounded before
-    ///                    being summed.
-    /// Geo              = The coordinates specify points on the surface of the
-    ///                    earth and the distances are arc distances.
     /// </summary>
     TSPDistanceMeasure DistanceMeasure { get; }
@@ -53 +53 @@
     double[,] Distances { get; }
     /// <summary>
-    /// Optional! A a matrix of dimension [N, 2] where each row is one of the cities
+    /// Optional! A a matrix of dimension [N, 2] matrix where each row is one of the cities
     /// and the colmns represent x and y coordinates respectively.
     /// </summary>
@@ -74 +74 @@
     /// </summary>
     double? BestKnownQuality { get; }
+
+    /// <summary>
+    /// If only the coordinates are given, can calculate the distance matrix.
+    /// </summary>
+    /// <returns>A full distance matrix between all cities.</returns>
+    double[,] GetDistanceMatrix();
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances/3.3/ProblemInstanceProvider.cs

@@ -41 +41 @@
     }
 
-    public void FeedConsumer(IInstanceDescriptor descriptor) {
-      Consumer.LoadFrom(GetInstance(descriptor));
+    public bool FeedConsumer(IInstanceDescriptor descriptor) {
+      return Consumer.LoadFrom(GetInstance(descriptor));
     }
 

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

@@ -1 +1 @@
 obj
 bin
+Plugin.cs