Changeset 8426

Timestamp:

08/07/12 15:35:05 (12 years ago)

Author:

spimming

Message:

#1894 various error fixed

Location:

branches/RoutePlanning

Files:

• HeuristicLab.Algorithms.GraphRouting/3.3/AStarAlgorithmV2.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning.Test/Program.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm/Way.cs (modified) (1 diff)

branches/RoutePlanning/HeuristicLab.Algorithms.GraphRouting/3.3/AStarAlgorithmV2.cs

@@ -36 +36 @@
 
       while (openList.Count > 0) {
-        NodeData data = openList.Max;
+        NodeData data = openList.Min;
         openList.Remove(data);
         openListLookup.Remove(data.Node);

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

@@ -22 +22 @@
       string file6 = @"C:\dev\osmfiles\oberosterreich.highway.osm";
 
-      //TestD(file5, 529102170, 1001363194, true, false); // inz - inz
-      //Test(file5, 529102170, 1001363194, true, false); // inz - inz
-      //Test(file6, 529102170, 1001363194, true, false); // inz - inz
-
-      //IDataSource ds = TestLoad(file6);
-      //Graph.Graph graph = new Graph.Graph(ds);
-      //TestRouter(new AStarAlgorithm(graph), 529102170, 31372732, false); // inz - hgb
-      //TestRouter(new AStarAlgorithmV2(graph), 529102170, 31372732, false); // inz - hgb
+      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
+      TestRouter(new AStarAlgorithmV2(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
       //TestLoadAndRouter(file6, typeof(AStarAlgorithm), 529102170, 31372732, false, false); // inz - hgb
-      //TestLoadAndRouter(file6, typeof(AStarAlgorithmV2), 529102170, 31372732, false, false); // inz - hgb
+      //TestLoadAndRouter(file6, typeof(AStarAlgorithmV2), 529102170, 31372732, false, true); // inz - hgb
+
+      //TestLoadAndRouter(file6, typeof(DijkstraAlgorithm), 529102170, 1001363194, true, false);
+      //TestLoadAndRouter(file6, typeof(AStarAlgorithm), 529102170, 1001363194, true, false);
+      //TestLoadAndRouter(file6, typeof(AStarAlgorithmV2), 529102170, 1001363194, true, false);
+      //TestLoadAndRouter(file6, typeof(BidrectionalDijkstraAlgorithm), 529102170, 1001363194, true, false);
 
       //TestLoadAndRouter(file5, typeof(DijkstraAlgorithm), 529102170, 1001363194, true, false);
       //TestLoadAndRouter(file5, typeof(BidrectionalDijkstraAlgorithm), 529102170, 1001363194, true, true);
-      TestLoadAndRouter(file6, typeof(BidrectionalDijkstraAlgorithm), 529102170, 31372732, false, true); // inz - hgb
+      //TestLoadAndRouter(file6, typeof(BidrectionalDijkstraAlgorithm), 529102170, 31372732, false, true); // inz - hgb
 
       System.Console.Read();

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Way.cs

@@ -73 +73 @@
         if (base.Tags.ContainsKey(TagConstants.OneWayTag)) {
           string value = base.Tags[TagConstants.OneWayTag];
-          return value.Equals(TagConstants.YesValue) || value.Equals(TagConstants.TrueValue);
-        } else if (base.Tags.ContainsKey(TagConstants.JunctionTagKey)) {
-          string value = base.Tags[TagConstants.JunctionTagKey];
-          return value.Equals(TagConstants.RoundaboutValue);
+          return value.Equals(TagConstants.YesValue);
         } else {
           return false;