Changeset 8480 for branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/XmlDataSource.cs

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

File:

• branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/XmlDataSource.cs (modified) (2 diffs)

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