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

introducing further typedefs to make code more readable

Browse Source
This commit is contained in:
DennisOSRM 2013-02-03 14:55:49 +01:00
parent 5b5e9296b3
commit 405600783e
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
DataStructures/SearchEngine.h
View File

@ -42,32 +42,33 @@ struct _HeapData {
_HeapData( NodeID p ) : parent(p) { } _HeapData( NodeID p ) : parent(p) { }
}; };
typedef boost::thread_specific_ptr<BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> > > SearchEngineHeapPtr; typedef BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> > QueryHeapType;
typedef boost::thread_specific_ptr<QueryHeapType> SearchEngineHeapPtr;
template<class EdgeData, class GraphT> template<class EdgeData, class GraphT>
struct SearchEngineData { struct SearchEngineData {
typedef SearchEngineHeapPtr HeapPtr;
typedef GraphT Graph; typedef GraphT Graph;
typedef QueryHeapType QueryHeap;
SearchEngineData(GraphT * g, NodeInformationHelpDesk * nh, std::vector<std::string> & n) :graph(g), nodeHelpDesk(nh), names(n) {} SearchEngineData(GraphT * g, NodeInformationHelpDesk * nh, std::vector<std::string> & n) :graph(g), nodeHelpDesk(nh), names(n) {}
const GraphT * graph; const GraphT * graph;
NodeInformationHelpDesk * nodeHelpDesk; NodeInformationHelpDesk * nodeHelpDesk;
std::vector<std::string> & names; std::vector<std::string> & names;
static HeapPtr forwardHeap; static SearchEngineHeapPtr forwardHeap;
static HeapPtr backwardHeap; static SearchEngineHeapPtr backwardHeap;
static HeapPtr forwardHeap2; static SearchEngineHeapPtr forwardHeap2;
static HeapPtr backwardHeap2; static SearchEngineHeapPtr backwardHeap2;
static HeapPtr forwardHeap3; static SearchEngineHeapPtr forwardHeap3;
static HeapPtr backwardHeap3; static SearchEngineHeapPtr backwardHeap3;
inline void InitializeOrClearFirstThreadLocalStorage() { inline void InitializeOrClearFirstThreadLocalStorage() {
if(!forwardHeap.get()) { if(!forwardHeap.get()) {
forwardHeap.reset(new BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> >(nodeHelpDesk->getNumberOfNodes())); forwardHeap.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
} }
else else
forwardHeap->Clear(); forwardHeap->Clear();
if(!backwardHeap.get()) { if(!backwardHeap.get()) {
backwardHeap.reset(new BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> >(nodeHelpDesk->getNumberOfNodes())); backwardHeap.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
} }
else else
backwardHeap->Clear(); backwardHeap->Clear();
@ -75,13 +76,13 @@ struct SearchEngineData {
inline void InitializeOrClearSecondThreadLocalStorage() { inline void InitializeOrClearSecondThreadLocalStorage() {
if(!forwardHeap2.get()) { if(!forwardHeap2.get()) {
forwardHeap2.reset(new BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> >(nodeHelpDesk->getNumberOfNodes())); forwardHeap2.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
} }
else else
forwardHeap2->Clear(); forwardHeap2->Clear();
if(!backwardHeap2.get()) { if(!backwardHeap2.get()) {
backwardHeap2.reset(new BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> >(nodeHelpDesk->getNumberOfNodes())); backwardHeap2.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
} }
else else
backwardHeap2->Clear(); backwardHeap2->Clear();
@ -89,13 +90,13 @@ struct SearchEngineData {
inline void InitializeOrClearThirdThreadLocalStorage() { inline void InitializeOrClearThirdThreadLocalStorage() {
if(!forwardHeap3.get()) { if(!forwardHeap3.get()) {
forwardHeap3.reset(new BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> >(nodeHelpDesk->getNumberOfNodes())); forwardHeap3.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
} }
else else
forwardHeap3->Clear(); forwardHeap3->Clear();
if(!backwardHeap3.get()) { if(!backwardHeap3.get()) {
backwardHeap3.reset(new BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> >(nodeHelpDesk->getNumberOfNodes())); backwardHeap3.reset(new QueryHeap(nodeHelpDesk->getNumberOfNodes()));
} }
else else
backwardHeap3->Clear(); backwardHeap3->Clear();