Changeset 7466 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.TSPLIB/3.3

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.TSPLIB/3.3

Files:

• HeuristicLab.Problems.Instances.TSPLIB-3.3.csproj (modified) (3 diffs)
• TSPLIBATSPInstance.cs (added)
• TSPLIBATSPInstanceProvider.cs (added)
• TSPLIBCVRPInstance.cs (added)
• TSPLIBCVRPInstanceProvider.cs (added)
• TSPLIBInstance.cs (deleted)
• TSPLIBParser.cs (modified) (1 diff)
• TSPLIBTSPInstance.cs (added)
• TSPLIBTSPInstanceProvider.cs (modified) (2 diffs)

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