Moved MultiLevelPartition and CellStorage to partition namespace

This commit is contained in:
Patrick Niklaus
2017-03-04 18:54:06 +00:00
committed by Patrick Niklaus
parent 694bf9d8b1
commit 00d01946cd
9 changed files with 105 additions and 101 deletions
@@ -1,7 +1,7 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/test/unit_test.hpp>
#include "util/cell_storage.hpp"
#include "partition/cell_storage.hpp"
#include "util/static_graph.hpp"
#define CHECK_SIZE_RANGE(range, ref) BOOST_CHECK_EQUAL(range.end() - range.begin(), ref)
@@ -14,7 +14,7 @@
} while (0)
using namespace osrm;
using namespace osrm::util;
using namespace osrm::partition;
struct MockEdge
{
@@ -29,7 +29,7 @@ auto makeGraph(const std::vector<MockEdge> &mock_edges)
bool forward;
bool backward;
};
using Edge = static_graph_details::SortableEdgeWithData<EdgeData>;
using Edge = util::static_graph_details::SortableEdgeWithData<EdgeData>;
std::vector<Edge> edges;
std::size_t max_id = 0;
for (const auto &m : mock_edges)
@@ -1,7 +1,7 @@
#include <boost/numeric/conversion/cast.hpp>
#include <boost/test/unit_test.hpp>
#include "util/multi_level_partition.hpp"
#include "partition/multi_level_partition.hpp"
#define CHECK_SIZE_RANGE(range, ref) BOOST_CHECK_EQUAL(range.second - range.first, ref)
#define CHECK_EQUAL_RANGE(range, ref) \
@@ -13,7 +13,7 @@
} while (0)
using namespace osrm;
using namespace osrm::util;
using namespace osrm::partition;
BOOST_AUTO_TEST_SUITE(multi_level_partition_tests)