Changeset 8316

Timestamp:

07/21/12 23:49:56 (12 years ago)

Author:

spimming

Message:

#1894:

• check if way has missing node references
• check if attribute exists before using it
• test program restructured

Location:

branches/RoutePlanning

Files:

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

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning.Test/Program.cs

@@ -1 +1 @@
 
 using System;
+using System.Diagnostics;
+using System.IO;
 using System.Xml;
 using HeuristicLab.Algorithms.GraphRouting;
@@ -9 +11 @@
   class Program {
     static void Main(string[] args) {
-      Test1();
-    }
+      string file1 = @"..\..\OsmTestFiles\test.osm";
+      string file2 = @"..\..\OsmTestFiles\testNode1.osm";
+      string file3 = @"..\..\OsmTestFiles\testWay1.osm";
+      string file4 = @"..\..\OsmTestFiles\testRelation1.osm";
+      string file5 = @"..\..\OsmTestFiles\test_mid.osm";
+      string file6 = @"C:\dev\osmfiles\oberosterreich.highway.osm";
 
-    private static void Test1() {
-      string filepath = @"..\..\OsmTestFiles\test_mid.osm";
-
-      Console.Write("Loading data ... ");
-      XmlDataSource xmlDs = new XmlDataSource(filepath);
-      Console.WriteLine("done.");
-
-      Graph.Graph graph = new Graph.Graph(xmlDs);
-      IRouter router = new DijkstraAlgorithm(graph);
-
-      Console.Write("Calculate route ... ");
-      long[] result = router.Calculate(529102170, 1001363194);
-      System.Console.WriteLine("done.");
-
-      Console.Write("Result: ");
-      foreach (long i in result) System.Console.Write(i + "; ");
-      Console.WriteLine();
-
-      WriteGPXFile(graph, result);
-
+      Test(file5, 529102170, 1001363194, true, false);
+      //Test(file6, 529102170, 1001363194, true, false);
+      //Test(file6, 529102170, 31372732, false, true); // inz - hgb
       System.Console.Read();
     }
 
-    private static void Test2() {
-      //string filepath = @"..\..\OsmTestFiles\test.osm";
-      //string filepath = @"..\..\OsmTestFiles\testNode1.osm";
-      //string filepath = @"..\..\OsmTestFiles\testWay1.osm";
-      //string filepath = @"..\..\OsmTestFiles\testRelation1.osm";
-      string filepath = @"..\..\OsmTestFiles\test_mid.osm";
-
+    private static void Test(string filepath, long sourceNodeId, long targetNodeId, bool showResult, bool writeResultFile) {
+      FileInfo file = new FileInfo(filepath);
+      Console.WriteLine("Test BEGIN ------------------------------");
+      Console.WriteLine("File name: {0}", file.Name);
+      Console.WriteLine();
       Console.Write("Loading data ... ");
+      var sw = Stopwatch.StartNew();
       XmlDataSource xmlDs = new XmlDataSource(filepath);
+      sw.Stop();
       Console.WriteLine("done.");
-
+      Console.WriteLine("Loading Time: {0}", sw.Elapsed);
+      Console.WriteLine();
       Graph.Graph graph = new Graph.Graph(xmlDs);
       IRouter router = new DijkstraAlgorithm(graph);
-
       Console.Write("Calculate route ... ");
-      long[] result = router.Calculate(529102170, 1001363194);
-      System.Console.WriteLine("done.");
-
-      Console.Write("Result: ");
-      foreach (long i in result) System.Console.Write(i + "; ");
+      sw = Stopwatch.StartNew();
+      long[] result = router.Calculate(sourceNodeId, targetNodeId);
+      sw.Stop();
+      Console.WriteLine("done.");
+      Console.WriteLine("Execution Time: {0}", sw.Elapsed);
       Console.WriteLine();
-      System.Console.Read();
+      if (showResult) {
+        Console.WriteLine("Result: ");
+        foreach (long i in result) System.Console.Write(i + "; ");
+        Console.WriteLine();
+        Console.WriteLine();
+      }
+      if (writeResultFile) {
+        string dt = DateTime.Now.ToString("yyyyMMddhhmmss_");
+        string fn = Path.GetFileNameWithoutExtension(file.Name);
+        string resultFile = dt + fn + "_" + sourceNodeId + "-" + targetNodeId + ".gpx";
+        Console.WriteLine("Result file: {0}", resultFile);
+        WriteGPXFile(graph, result, resultFile);
+      }
+      Console.WriteLine("=========================================");
+      Console.WriteLine();
     }
 
-    private static void WriteGPXFile(Graph.Graph graph, long[] route) {
+    private static void WriteGPXFile(Graph.Graph graph, long[] route, string file) {
       XmlWriterSettings settings = new XmlWriterSettings();
       settings.Indent = true;
       settings.IndentChars = ("   ");
 
-      using (XmlWriter writer = XmlWriter.Create("RoutePath.gpx", settings)) {
+      using (XmlWriter writer = XmlWriter.Create(file, settings)) {
         writer.WriteStartElement("gpx", "http://www.topografix.com/GPX/1/0");
         writer.WriteAttributeString("version", "1.1");

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

@@ -91 +91 @@
       using (XmlReader reader = XmlReader.Create(file.FullName, settings)) {
         reader.ReadStartElement("osm");
-        reader.ReadStartElement("bounds");
+        //reader.ReadStartElement("bounds");
+        reader.Read();
         while (reader.LocalName.Equals("node")) {
           Node node = new Node();
@@ -119 +120 @@
           GetBaseAttributes(reader, way);
           reader.Read();
+          bool missingNodes = false;
           while (reader.LocalName.Equals("nd") || reader.LocalName.Equals("tag")) {
             if (reader.LocalName.Equals("nd")) {
               long refNodeId = XmlConvert.ToInt64(reader.GetAttribute("ref"));
-              way.Nodes.Add(GetNode(refNodeId));
+              Node refNode = GetNode(refNodeId);
+              if (refNode != null) {
+                way.Nodes.Add(refNode);
+              } else {
+                missingNodes = true;
+              }
 
             } else if (reader.LocalName.Equals("tag")) {
@@ -131 +138 @@
             reader.Read();
           }
-
+          if (missingNodes) {
+            // TODO: Error/Trace output 
+            // if Way xxx has incomplete nodes. At least one node was missing in the data.
+          }
           ways.Add(way.Id, way);
           InsertNodeWayRelation(way);
@@ -181 +191 @@
         obj.UserId = XmlConvert.ToInt32(reader.GetAttribute("uid"));
       }
-      obj.Visible = XmlConvert.ToBoolean(reader.GetAttribute("visible"));
-      obj.Version = XmlConvert.ToInt32(reader.GetAttribute("version"));
-      obj.Changeset = XmlConvert.ToInt64(reader.GetAttribute("changeset"));
-      obj.Timestamp = XmlConvert.ToDateTime(reader.GetAttribute("timestamp"), XmlDateTimeSerializationMode.Utc);
+      if (reader.GetAttribute("visible") != null) {
+        obj.Visible = XmlConvert.ToBoolean(reader.GetAttribute("visible"));
+      }
+      if (reader.GetAttribute("version") != null) {
+        obj.Version = XmlConvert.ToInt32(reader.GetAttribute("version"));
+      }
+      if (reader.GetAttribute("changeset") != null) {
+        obj.Changeset = XmlConvert.ToInt64(reader.GetAttribute("changeset"));
+      }
+      if (reader.GetAttribute("timestamp") != null) {
+        obj.Timestamp = XmlConvert.ToDateTime(reader.GetAttribute("timestamp"), XmlDateTimeSerializationMode.Utc);
+      }
 
     }