Changeset 8509 for branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning

Timestamp:

08/20/12 17:32:19 (12 years ago)

Author:

spimming

Message:

#1894:
Dijkstra: get node with a specific rank
graph interface extended: get vertices
fixed bug in ReadData method
methods to perform routing algorithm benchmark added to test program

Location:

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3

Files:

• Graph/Graph.cs (modified) (1 diff)
• Graph/IGraph.cs (modified) (1 diff)
• Osm.Data/OsmDataSource.cs (modified) (4 diffs)

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/Graph.cs

@@ -25 +25 @@
       vertices.TryGetValue(id, out vertex);
       return vertex;
+    }
+
+    public List<Vertex> GetVertices() {
+      return new List<Vertex>(vertices.Values);
     }
 

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/IGraph.cs

@@ -5 +5 @@
     void AddVertex(Vertex vertex);
     Vertex GetVertex(long id);
+    List<Vertex> GetVertices();
     void AddEdge(long startId, long endId);
     void AddEdge(Edge<Vertex> edge);

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

@@ -141 +141 @@
       NameTable nt = new NameTable();
       string osmName = nt.Add("osm");
-      string nodeName = nt.Add("node");
+      object nodeName = nt.Add("node");
       object tagName = nt.Add("tag");
       object wayName = nt.Add("way");
@@ -147 +147 @@
       string lonName = nt.Add("lon");
       string idName = nt.Add("id");
-      string ndName = nt.Add("nd");
+      object ndName = nt.Add("nd");
       string refName = nt.Add("ref");
       string kName = nt.Add("k");
@@ -166 +166 @@
 
           reader.Read();
-          if (reader.LocalName.Equals(tagName)) {
-            reader.ReadToFollowing(nodeName, ns);
-          }
-        }
-        while (reader.LocalName.Equals(wayName)) {
+          //if (reader.LocalName.Equals(tagName)) {
+          if (ReferenceEquals(tagName, reader.LocalName)) {
+            reader.ReadToFollowing((string)nodeName, ns);
+          }
+        }
+        //while (reader.LocalName.Equals(wayName)) {
+        while (ReferenceEquals(wayName, reader.LocalName)) {
           List<Vertex> way = new List<Vertex>();
           bool missingNodes = false;
@@ -177 +179 @@
 
           reader.Read();
-          while (reader.LocalName.Equals(nodeName) || reader.LocalName.Equals(tagName)) {
+          while (ReferenceEquals(ndName, reader.LocalName) || ReferenceEquals(tagName, reader.LocalName)) {
             if (reader.LocalName.Equals(ndName)) {
               long refNodeId = XmlConvert.ToInt64(reader.GetAttribute(refName, ns));