minor code refactoring, wip

2014-05-18 22:44:19 +02:00
parent a122a1e8c7
commit 75a2d4d00a
12 changed files with 315 additions and 324 deletions
@@ -51,14 +51,15 @@ template <class DataFacadeT> class ShortestPathRouting : public BasicRoutingInte
    void operator()(const std::vector<PhantomNodes> &phantom_nodes_vector,
                    RawRouteData &raw_route_data) const
    {
-        for (const PhantomNodes &phantom_node_pair : phantom_nodes_vector)
+        if(std::any_of(begin(phantom_nodes_vector),
+                        end(phantom_nodes_vector),
+                        [](PhantomNodes phantom_node_pair)
+                        { return phantom_node_pair.AtLeastOnePhantomNodeIsInvalid(); }))
        {
-            if (phantom_node_pair.AtLeastOnePhantomNodeIsInvalid())
-            {
-                BOOST_ASSERT(false);
-                return;
-            }
+            BOOST_ASSERT(false);
+            return;
        }
+
        int distance1 = 0;
        int distance2 = 0;
        bool search_from_1st_node = true;