use parallel sorting for DeallocatingVector

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
-1
View File
@@ -160,7 +160,6 @@ class Contractor
temp_edge_counter = 0;
const auto dend = input_edge_list.dend();
for (auto diter = input_edge_list.dbegin(); diter != dend; ++diter)
{
BOOST_ASSERT_MSG(static_cast<unsigned int>(std::max(diter->weight, 1)) > 0, "edge distance < 1");
+1 -1
View File
@@ -202,7 +202,7 @@ int Prepare::Process(int argc, char *argv[])
* Sorting contracted edges in a way that the static query graph can read some in in-place.
*/
std::sort(contracted_edge_list.begin(), contracted_edge_list.end());
tbb::parallel_sort(contracted_edge_list.begin(), contracted_edge_list.end());
unsigned max_used_node_id = 0;
unsigned contracted_edge_count = contracted_edge_list.size();
SimpleLogger().Write() << "Serializing compacted graph of " << contracted_edge_count