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

use parallel sorting for DeallocatingVector

Browse Source
This commit is contained in:
Dennis Luxen
2014-07-18 11:37:07 +02:00
parent 480f70c049
commit a6ab042078
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataStructures/NodeBasedGraph.h
+2 -3
View File
@@ -60,7 +60,6 @@ inline std::shared_ptr<NodeBasedDynamicGraph>
NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge> &input_edge_list)
{
static_assert(sizeof(NodeBasedEdgeData) == 16, "changing node based edge data size changes memory consumption");
// tbb::parallel_sort(input_edge_list.begin(), input_edge_list.end());
DeallocatingVector<NodeBasedDynamicGraph::InputEdge> edges_list;
NodeBasedDynamicGraph::InputEdge edge;
@@ -107,7 +106,7 @@ NodeBasedDynamicGraphFromImportEdges(int number_of_nodes, std::vector<ImportEdge
}
// remove duplicate edges
std::sort(edges_list.begin(), edges_list.end());
tbb::parallel_sort(edges_list.begin(), edges_list.end());
NodeID edge_count = 0;
for (NodeID i = 0; i < edges_list.size(); )
{
@@ -194,7 +193,7 @@ SimpleNodeBasedDynamicGraphFromEdges(int number_of_nodes, std::vector<SimpleEdge
}
// remove duplicate edges
std::sort(edges_list.begin(), edges_list.end());
tbb::parallel_sort(edges_list.begin(), edges_list.end());
NodeID edge_count = 0;
for (NodeID i = 0; i < edges_list.size(); )
{