Merge pull request #1481 from Project-OSRM/fix/no-big-cc-pruning

Only activate pruning for big cc after one was found
Project-OSRM · May 18, 2015 · 8b81887 · 8b81887
2 parents 6d9c3bc + fd9bb3a
commit 8b81887
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/data_structures/static_rtree.hpp b/data_structures/static_rtree.hpp
@@ -651,6 +651,9 @@ class StaticRTree
         unsigned inspected_elements = 0;
         unsigned number_of_elements_from_big_cc = 0;
         unsigned number_of_elements_from_tiny_cc = 0;
+        // is true if a big cc was added to the queue to we also have a lower bound
+        // for them. it actives pruning for big components
+        bool has_big_cc = false;
 
 #ifdef NDEBUG
         unsigned pruned_elements = 0;
@@ -697,10 +700,11 @@ class StaticRTree
                         BOOST_ASSERT(0.f <= current_perpendicular_distance);
 
                         if (pruning_bound.get() >= current_perpendicular_distance ||
-                            current_edge.is_in_tiny_cc())
+                            (!has_big_cc && !current_edge.is_in_tiny_cc()))
                         {
                             pruning_bound.insert(current_perpendicular_distance);
                             traversal_queue.emplace(current_perpendicular_distance, current_edge);
+                            has_big_cc = has_big_cc || !current_edge.is_in_tiny_cc();
                         }
 #ifdef NDEBUG
                         else
@@ -812,6 +816,10 @@ class StaticRTree
         unsigned number_of_elements_from_big_cc = 0;
         unsigned number_of_elements_from_tiny_cc = 0;
 
+        // is true if a big cc was added to the queue to we also have a lower bound
+        // for them. it actives pruning for big components
+        bool has_big_cc = false;
+
         unsigned pruned_elements = 0;
 
         std::pair<double, double> projected_coordinate = {
@@ -852,10 +860,11 @@ class StaticRTree
                         BOOST_ASSERT(0.f <= current_perpendicular_distance);
 
                         if (pruning_bound.get() >= current_perpendicular_distance ||
-                            current_edge.is_in_tiny_cc())
+                            (!has_big_cc && !current_edge.is_in_tiny_cc()))
                         {
                             pruning_bound.insert(current_perpendicular_distance);
                             traversal_queue.emplace(current_perpendicular_distance, current_edge);
+                            has_big_cc = has_big_cc || !current_edge.is_in_tiny_cc();
                         }
                         else
                         {