Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

reformat according to styleguide

Browse Source
This commit is contained in:
Dennis Luxen 2014-10-16 17:49:10 +02:00
parent e3d33aa171
commit 42e726dec5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Contractor/Prepare.cpp
View File

@ -195,7 +195,8 @@ int Prepare::Process(int argc, char *argv[])
*/ */
SimpleLogger().Write() << "initializing contractor"; SimpleLogger().Write() << "initializing contractor";
auto contractor = osrm::make_unique<Contractor>(number_of_edge_based_nodes, edge_based_edge_list); auto contractor =
osrm::make_unique<Contractor>(number_of_edge_based_nodes, edge_based_edge_list);
TIMER_START(contraction); TIMER_START(contraction);
contractor->Run(); contractor->Run();
@ -491,11 +492,12 @@ Prepare::SetupScriptingEnvironment(lua_State *lua_state,
/** /**
\brief Building an edge-expanded graph from node-based input and turn restrictions \brief Building an edge-expanded graph from node-based input and turn restrictions
*/ */
std::size_t Prepare::BuildEdgeExpandedGraph(lua_State *lua_state, std::size_t
NodeID number_of_node_based_nodes, Prepare::BuildEdgeExpandedGraph(lua_State *lua_state,
std::vector<EdgeBasedNode> &node_based_edge_list, NodeID number_of_node_based_nodes,
DeallocatingVector<EdgeBasedEdge> &edge_based_edge_list, std::vector<EdgeBasedNode> &node_based_edge_list,
EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile) DeallocatingVector<EdgeBasedEdge> &edge_based_edge_list,
EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile)
{ {
SimpleLogger().Write() << "Generating edge-expanded graph representation"; SimpleLogger().Write() << "Generating edge-expanded graph representation";
std::shared_ptr<NodeBasedDynamicGraph> node_based_graph = std::shared_ptr<NodeBasedDynamicGraph> node_based_graph =
@ -521,7 +523,8 @@ std::size_t Prepare::BuildEdgeExpandedGraph(lua_State *lua_state,
traffic_light_list.clear(); traffic_light_list.clear();
traffic_light_list.shrink_to_fit(); traffic_light_list.shrink_to_fit();
const std::size_t number_of_edge_based_nodes = edge_based_graph_factory->GetNumberOfEdgeBasedNodes(); const std::size_t number_of_edge_based_nodes =
edge_based_graph_factory->GetNumberOfEdgeBasedNodes();
BOOST_ASSERT(number_of_edge_based_nodes != std::numeric_limits<unsigned>::max()); BOOST_ASSERT(number_of_edge_based_nodes != std::numeric_limits<unsigned>::max());
#ifndef WIN32 #ifndef WIN32