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

use C++11 shrinktofit() instead of swap tricks

Browse Source
This commit is contained in:
Dennis Luxen 2014-05-27 12:16:53 +02:00
parent 49a1dfff60
commit f8ba4b9312
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Contractor/Contractor.h
View File

@ -187,7 +187,8 @@ class Contractor
edges.push_back(new_edge); edges.push_back(new_edge);
++diter; ++diter;
} }
// clear input vector and trim the current set of edges with the well-known swap trick // clear input vector
edges.shrink_to_fit();
input_edge_list.clear(); input_edge_list.clear();
tbb::parallel_sort(edges.begin(), edges.end()); tbb::parallel_sort(edges.begin(), edges.end());
NodeID edge = 0; NodeID edge = 0;
@ -416,7 +417,8 @@ class Contractor
// Replace old priorities array by new one // Replace old priorities array by new one
node_priorities.swap(new_node_priority); node_priorities.swap(new_node_priority);
// Delete old node_priorities vector // Delete old node_priorities vector
std::vector<float>().swap(new_node_priority); new_node_priority.clear();
new_node_priority.shrink_to_fit();
// old Graph is removed // old Graph is removed
contractor_graph.reset(); contractor_graph.reset();
@ -526,7 +528,7 @@ class Contractor
// remove contracted nodes from the pool // remove contracted nodes from the pool
number_of_contracted_nodes += last - first_independent_node; number_of_contracted_nodes += last - first_independent_node;
remaining_nodes.resize(first_independent_node); remaining_nodes.resize(first_independent_node);
std::vector<RemainingNodeData>(remaining_nodes).swap(remaining_nodes); remaining_nodes.shrink_to_fit();
// unsigned maxdegree = 0; // unsigned maxdegree = 0;
// unsigned avgdegree = 0; // unsigned avgdegree = 0;
// unsigned mindegree = UINT_MAX; // unsigned mindegree = UINT_MAX;