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

Restore storage constructors with one arguments

Browse Source
This commit is contained in:
Michael Krasnyk 2018-04-09 12:45:53 +02:00 committed by Patrick Niklaus
parent bf2b45120a
commit c4bf450fc6
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/util/query_heap.hpp
View File

@ -20,7 +20,7 @@ template <typename NodeID, typename Key> class GenerationArrayStorage
using GenerationCounter = std::uint16_t; using GenerationCounter = std::uint16_t;
public: public:
explicit GenerationArrayStorage(std::size_t size, std::size_t) explicit GenerationArrayStorage(std::size_t size)
: positions(size, 0), generation(1), generations(size, 0) : positions(size, 0), generation(1), generations(size, 0)
{ {
} }
@ -60,7 +60,7 @@ template <typename NodeID, typename Key> class GenerationArrayStorage
template <typename NodeID, typename Key> class ArrayStorage template <typename NodeID, typename Key> class ArrayStorage
{ {
public: public:
explicit ArrayStorage(std::size_t size, std::size_t) : positions(size, 0) {} explicit ArrayStorage(std::size_t size) : positions(size, 0) {}
~ArrayStorage() {} ~ArrayStorage() {}
@ -77,7 +77,7 @@ template <typename NodeID, typename Key> class ArrayStorage
template <typename NodeID, typename Key> class MapStorage template <typename NodeID, typename Key> class MapStorage
{ {
public: public:
explicit MapStorage(std::size_t, std::size_t) {} explicit MapStorage(std::size_t) {}
Key &operator[](NodeID node) { return nodes[node]; } Key &operator[](NodeID node) { return nodes[node]; }
@ -100,7 +100,7 @@ template <typename NodeID, typename Key> class MapStorage
template <typename NodeID, typename Key> class UnorderedMapStorage template <typename NodeID, typename Key> class UnorderedMapStorage
{ {
public: public:
explicit UnorderedMapStorage(std::size_t, std::size_t) { nodes.rehash(1000); } explicit UnorderedMapStorage(std::size_t) { nodes.rehash(1000); }
Key &operator[](const NodeID node) { return nodes[node]; } Key &operator[](const NodeID node) { return nodes[node]; }
@ -134,8 +134,8 @@ class TwoLevelStorage
{ {
public: public:
explicit TwoLevelStorage(std::size_t number_of_nodes, std::size_t number_of_overlay_nodes) explicit TwoLevelStorage(std::size_t number_of_nodes, std::size_t number_of_overlay_nodes)
: number_of_overlay_nodes(number_of_overlay_nodes), base(number_of_nodes, number_of_nodes), : number_of_overlay_nodes(number_of_overlay_nodes), base(number_of_nodes),
overlay(number_of_overlay_nodes, number_of_overlay_nodes) overlay(number_of_overlay_nodes)
{ {
} }
@ -198,17 +198,11 @@ class QueryHeap
using WeightType = Weight; using WeightType = Weight;
using DataType = Data; using DataType = Data;
explicit QueryHeap(std::size_t number_of_elements, std::size_t number_of_overlay_nodes) template <typename... StorageArgs> explicit QueryHeap(StorageArgs... args) : node_index(args...)
: node_index(number_of_elements, number_of_overlay_nodes)
{ {
Clear(); Clear();
} }
explicit QueryHeap(std::size_t number_of_elements)
: QueryHeap(number_of_elements, number_of_elements)
{
}
void Clear() void Clear()
{ {
heap.clear(); heap.clear();

4
include/util/xor_fast_hash_storage.hpp
View File

@ -31,9 +31,7 @@ class XORFastHashStorage
void operator=(const Key key_to_insert) { key = key_to_insert; } void operator=(const Key key_to_insert) { key = key_to_insert; }
}; };
explicit XORFastHashStorage(size_t, size_t) : positions(MaxNumElements), current_timestamp{0u} explicit XORFastHashStorage(size_t) : positions(MaxNumElements), current_timestamp{0u} {}
{
}
HashCell &operator[](const NodeID node) HashCell &operator[](const NodeID node)
{ {

4
unit_tests/engine/offline_facade.cpp
View File

@ -40,7 +40,7 @@ template <> struct SearchEngineData<routing_algorithms::offline::Algorithm>
} }
else else
{ {
forward_heap_1.reset(new QueryHeap(number_of_nodes)); forward_heap_1.reset(new QueryHeap(number_of_nodes, 0));
} }
if (reverse_heap_1.get()) if (reverse_heap_1.get())
@ -49,7 +49,7 @@ template <> struct SearchEngineData<routing_algorithms::offline::Algorithm>
} }
else else
{ {
reverse_heap_1.reset(new QueryHeap(number_of_nodes)); reverse_heap_1.reset(new QueryHeap(number_of_nodes, 0));
} }
} }
}; };