Revert the usage of TBB's iterator pair taking overloads.

This reverts the range based overload usage introduced in @6b2bf495.

Old TBB versions do not provide the range overloads.
This commit is contained in:
Daniel J. Hofmann
2015-09-10 11:36:02 +02:00
parent 829b9d96e4
commit 6e6b38e8e9
6 changed files with 21 additions and 20 deletions
+7 -6
View File
@@ -192,7 +192,7 @@ class Contractor
// FIXME not sure if we need this
edges.shrink_to_fit();
tbb::parallel_sort(edges);
tbb::parallel_sort(edges.begin(), edges.end());
NodeID edge = 0;
for (NodeID i = 0; i < edges.size();)
{
@@ -416,7 +416,7 @@ class Contractor
contractor_graph.reset();
// create new graph
tbb::parallel_sort(new_edge_set);
tbb::parallel_sort(new_edge_set.begin(), new_edge_set.end());
contractor_graph =
std::make_shared<ContractorGraph>(remaining_nodes.size(), new_edge_set);
@@ -468,7 +468,8 @@ class Contractor
[&](const ThreadDataContainer::EnumerableThreadData::range_type &range)
{
for (auto &data : range)
tbb::parallel_sort(data->inserted_edges);
tbb::parallel_sort(data->inserted_edges.begin(),
data->inserted_edges.end());
});
tbb::parallel_for(
tbb::blocked_range<int>(first_independent_node, last, DeleteGrainSize),
@@ -867,7 +868,7 @@ class Contractor
}
}
// eliminate duplicate entries ( forward + backward edges )
tbb::parallel_sort(neighbours);
tbb::parallel_sort(neighbours.begin(), neighbours.end());
neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
for (const auto i : osrm::irange<std::size_t>(0, neighbours.size()))
@@ -896,7 +897,7 @@ class Contractor
node_data[u].depth = (std::max)(node_data[node].depth + 1, node_data[u].depth);
}
// eliminate duplicate entries ( forward + backward edges )
tbb::parallel_sort(neighbours);
tbb::parallel_sort(neighbours.begin(), neighbours.end());
neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
// re-evaluate priorities of neighboring nodes
@@ -939,7 +940,7 @@ class Contractor
neighbours.push_back(target);
}
tbb::parallel_sort(neighbours);
tbb::parallel_sort(neighbours.begin(), neighbours.end());
neighbours.resize(std::unique(neighbours.begin(), neighbours.end()) - neighbours.begin());
// examine all neighbours that are at most 2 hops away
+1 -1
View File
@@ -183,7 +183,7 @@ void Prepare::FindComponents(unsigned max_edge_id,
}
}
tbb::parallel_sort(edges);
tbb::parallel_sort(edges.begin(), edges.end());
auto new_end = std::unique(edges.begin(), edges.end());
edges.resize(new_end - edges.begin());