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

adjust free functions naming style

Browse Source
This commit is contained in:
Michael Krasnyk 2017-03-07 14:09:59 +01:00 committed by Patrick Niklaus
parent f42136637d
commit d575561d39
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/partition/edge_based_graph_reader.hpp
View File

@ -40,7 +40,7 @@ struct EdgeBasedGraphEdge : EdgeBasedGraph::InputEdge
// Bidirectional (s,t) to (s,t) and (t,s) // Bidirectional (s,t) to (s,t) and (t,s)
std::vector<extractor::EdgeBasedEdge> std::vector<extractor::EdgeBasedEdge>
SplitBidirectionalEdges(const std::vector<extractor::EdgeBasedEdge> &edges) splitBidirectionalEdges(const std::vector<extractor::EdgeBasedEdge> &edges)
{ {
std::vector<extractor::EdgeBasedEdge> directed; std::vector<extractor::EdgeBasedEdge> directed;
directed.reserve(edges.size() * 2); directed.reserve(edges.size() * 2);
@ -68,7 +68,7 @@ SplitBidirectionalEdges(const std::vector<extractor::EdgeBasedEdge> &edges)
} }
std::vector<EdgeBasedGraphEdge> std::vector<EdgeBasedGraphEdge>
PrepareEdgesForUsageInGraph(std::vector<extractor::EdgeBasedEdge> edges) prepareEdgesForUsageInGraph(std::vector<extractor::EdgeBasedEdge> edges)
{ {
std::sort(begin(edges), end(edges)); std::sort(begin(edges), end(edges));
@ -167,9 +167,10 @@ struct EdgeBasedGraphReader
// - adaptToContractorInput // - adaptToContractorInput
// - GraphContractor::GraphContractor // - GraphContractor::GraphContractor
// and should really be abstracted over. // and should really be abstracted over.
// FIXME: edges passed as a const reference, can be changed pass-by-value if can be moved
auto directed = SplitBidirectionalEdges(edges); auto directed = splitBidirectionalEdges(edges);
auto tidied = PrepareEdgesForUsageInGraph(std::move(directed)); auto tidied = prepareEdgesForUsageInGraph(std::move(directed));
return std::make_unique<EdgeBasedGraph>(num_nodes, std::move(tidied)); return std::make_unique<EdgeBasedGraph>(num_nodes, std::move(tidied));
} }

4
src/storage/storage.cpp
View File

@ -1011,8 +1011,8 @@ void Storage::PopulateData(const DataLayout &layout, char *memory_ptr)
std::vector<extractor::EdgeBasedEdge> original_edges(number_of_edges); std::vector<extractor::EdgeBasedEdge> original_edges(number_of_edges);
reader.ReadInto(original_edges); reader.ReadInto(original_edges);
original_edges = partition::SplitBidirectionalEdges(std::move(original_edges)); original_edges = partition::splitBidirectionalEdges(std::move(original_edges));
auto edges = partition::PrepareEdgesForUsageInGraph(std::move(original_edges)); auto edges = partition::prepareEdgesForUsageInGraph(std::move(original_edges));
BOOST_ASSERT(edges.size() <= 2 * number_of_edges); BOOST_ASSERT(edges.size() <= 2 * number_of_edges);
auto nodes_ptr = layout.GetBlockPtr<EdgeBasedGraph::NodeArrayEntry, true>( auto nodes_ptr = layout.GetBlockPtr<EdgeBasedGraph::NodeArrayEntry, true>(