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

Use array heap

Browse Source
This commit is contained in:
Patrick Niklaus 2017-04-04 11:38:48 +00:00 committed by Patrick Niklaus
parent 9b614c6057
commit 571681d019
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/customizer/cell_customizer.hpp
View File

@ -5,7 +5,8 @@
#include "partition/multi_level_partition.hpp" #include "partition/multi_level_partition.hpp"
#include "util/binary_heap.hpp" #include "util/binary_heap.hpp"
#include <boost/thread/tss.hpp> #include <tbb/enumerable_thread_specific.h>
#include <unordered_set> #include <unordered_set>
namespace osrm namespace osrm
@ -15,12 +16,20 @@ namespace customizer
class CellCustomizer class CellCustomizer
{ {
private:
struct HeapData
{
bool from_clique;
};
using Heap = util::
BinaryHeap<NodeID, NodeID, EdgeWeight, HeapData, util::ArrayStorage<NodeID, int>>;
using HeapPtr = tbb::enumerable_thread_specific<Heap>;
public: public:
CellCustomizer(const partition::MultiLevelPartition &partition) : partition(partition) {} CellCustomizer(const partition::MultiLevelPartition &partition) : partition(partition) {}
template <typename GraphT> template <typename GraphT>
void Customize(const GraphT &graph, partition::CellStorage &cells, LevelID level, CellID id) void Customize(const GraphT &graph, Heap& heap, partition::CellStorage &cells, LevelID level, CellID id)
{ {
auto cell = cells.GetCell(level, id); auto cell = cells.GetCell(level, id);
auto destinations = cell.GetDestinationNodes(); auto destinations = cell.GetDestinationNodes();
@ -29,7 +38,7 @@ class CellCustomizer
for (auto source : cell.GetSourceNodes()) for (auto source : cell.GetSourceNodes())
{ {
std::unordered_set<NodeID> destinations_set(destinations.begin(), destinations.end()); std::unordered_set<NodeID> destinations_set(destinations.begin(), destinations.end());
Heap heap(graph.GetNumberOfNodes()); heap.Clear();
heap.Insert(source, 0, {false}); heap.Insert(source, 0, {false});
// explore search space // explore search space
@ -60,26 +69,23 @@ class CellCustomizer
template <typename GraphT> void Customize(const GraphT &graph, partition::CellStorage &cells) template <typename GraphT> void Customize(const GraphT &graph, partition::CellStorage &cells)
{ {
Heap heap_exemplar(graph.GetNumberOfNodes());
HeapPtr heaps(heap_exemplar);
for (std::size_t level = 1; level < partition.GetNumberOfLevels(); ++level) for (std::size_t level = 1; level < partition.GetNumberOfLevels(); ++level)
{ {
tbb::parallel_for(tbb::blocked_range<std::size_t>(0, partition.GetNumberOfCells(level)), tbb::parallel_for(tbb::blocked_range<std::size_t>(0, partition.GetNumberOfCells(level)),
[&](const tbb::blocked_range<std::size_t> &range) { [&](const tbb::blocked_range<std::size_t> &range) {
auto& heap = heaps.local();
for (auto id = range.begin(), end = range.end(); id != end; ++id) for (auto id = range.begin(), end = range.end(); id != end; ++id)
{ {
Customize(graph, cells, level, id); Customize(graph, heap, cells, level, id);
} }
}); });
} }
} }
private: private:
struct HeapData
{
bool from_clique;
};
using Heap = util::
BinaryHeap<NodeID, NodeID, EdgeWeight, HeapData, util::UnorderedMapStorage<NodeID, int>>;
using HeapPtr = boost::thread_specific_ptr<Heap>;
template <bool first_level, typename GraphT> template <bool first_level, typename GraphT>
void RelaxNode(const GraphT &graph, void RelaxNode(const GraphT &graph,

4
include/util/binary_heap.hpp
View File

@ -126,10 +126,6 @@ template <typename NodeID,
typename IndexStorage = ArrayStorage<NodeID, NodeID>> typename IndexStorage = ArrayStorage<NodeID, NodeID>>
class BinaryHeap class BinaryHeap
{ {
private:
BinaryHeap(const BinaryHeap &right);
void operator=(const BinaryHeap &right);
public: public:
using WeightType = Weight; using WeightType = Weight;
using DataType = Data; using DataType = Data;