Changeset 8429 for branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning.Test/Program.cs

Timestamp:

08/08/12 13:40:03 (12 years ago)

Author:

spimming

Message:

#1894

• renamed Graph to OsmGraph
• generic type in edge interface

File:

• branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning.Test/Program.cs (modified) (3 diffs)

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

@@ -23 +23 @@
 
       IDataSource ds = TestLoad(file6);
-      Graph.Graph graph = new Graph.Graph(ds);
-      TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
-      TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      OsmGraph graph = new OsmGraph(ds);
+      //TestRouter(new DijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      //TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
       TestRouter(new AStarAlgorithmV2(graph), 529102170, 31372732, false); // inz - hgb
-      TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
+      //TestRouter(new BidrectionalDijkstraAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
 
       //TestLoadAndRouter(file6, typeof(DijkstraAlgorithm), 529102170, 31372732, false, false); // inz - hgb
@@ -96 +96 @@
       Console.WriteLine("Loading Time: {0}", sw.Elapsed);
       Console.WriteLine();
-      Graph.Graph graph = new Graph.Graph(xmlDs);
+      OsmGraph graph = new OsmGraph(xmlDs);
       IRouter router = (IRouter)Activator.CreateInstance(routerType, graph);
       Console.Write("Calculate route ... ");
@@ -122 +122 @@
     }
 
-    private static void WriteGPXFile(Graph.Graph graph, long[] route, string file) {
+    private static void WriteGPXFile(OsmGraph graph, long[] route, string file) {
       XmlWriterSettings settings = new XmlWriterSettings();
       settings.Indent = true;