Changeset 8480

Timestamp:

08/13/12 17:35:16 (12 years ago)

Author:

spimming

Message:

#1894:

• fixed problem with edge category in XmlDataSource
• initial version for new DIMACS data source

Location:

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3

Files:

• DIMACS (added)
• DIMACS/DIMACSDataSource.cs (added)
• HeuristicLab.Problems.RoutePlanning.csproj (modified) (2 diffs)
• Osm.Data/XmlDataSource.cs (modified) (2 diffs)

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj

@@ -46 +46 @@
     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -56 +57 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DIMACS\DIMACSDataSource.cs" />
     <Compile Include="Graph\Edge.cs" />
     <Compile Include="Graph\Graph.cs" />

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/XmlDataSource.cs

@@ -1 +1 @@
 
-using System;
 using System.Collections.Generic;
 using System.IO;
@@ -92 +91 @@
           graph.AddVertex(v1);
           Vertex v2 = new Vertex(nodes[i + 1].Id, nodes[i + 1].Longitude, nodes[i + 1].Latitude);
-          if (v1.Id == 370626403) {
-            Console.WriteLine();
-          }
+
+          // ---------------------------------------
+          //long id = 314973778;
+          //if (v1.Id == id || v2.Id == id) {
+          //  Console.WriteLine();
+          //}
+          // ---------------------------------------
           graph.AddVertex(v2);
+          short category = (short)way.HighwayTag;
           if (way.OneWay) {
-            Edge<Vertex> edge = new Edge<Vertex>(v1, v2);
-            edge.Category = (short)way.HighwayTag;
+            Edge<Vertex> edge = new Edge<Vertex>(v1, v2, category);
             graph.AddEdge(edge);
           } else {
-            Edge<Vertex> edgeForward = new Edge<Vertex>(v1, v2);
-            edgeForward.Category = (short)way.HighwayTag;
+            Edge<Vertex> edgeForward = new Edge<Vertex>(v1, v2, category);
             graph.AddEdge(edgeForward);
 
-            Edge<Vertex> edgeBackward = new Edge<Vertex>(v2, v1);
-            edgeForward.Category = (short)way.HighwayTag;
+            Edge<Vertex> edgeBackward = new Edge<Vertex>(v2, v1, category);
             graph.AddEdge(edgeBackward);
           }
-
         }
       }