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

Simplify static_rtree tests

Browse Source
This commit is contained in:
Patrick Niklaus 2016-02-24 05:07:39 +01:00
parent d9d4742130
commit 5e5c52ff0a
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
unit_tests/util/static_rtree.cpp
View File

@ -1,7 +1,6 @@
#include "util/coordinate_calculation.hpp" #include "util/coordinate_calculation.hpp"
#include "engine/geospatial_query.hpp" #include "engine/geospatial_query.hpp"
#include "util/static_rtree.hpp" #include "util/static_rtree.hpp"
#include "extractor/query_node.hpp"
#include "extractor/edge_based_node.hpp" #include "extractor/edge_based_node.hpp"
#include "util/typedefs.hpp" #include "util/typedefs.hpp"
#include "util/rectangle.hpp" #include "util/rectangle.hpp"
@ -115,12 +114,10 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomGraphFixture
{ {
int lon = lon_udist(g); int lon = lon_udist(g);
int lat = lat_udist(g); int lat = lat_udist(g);
nodes.emplace_back(
extractor::QueryNode(FixedLongitude(lat), FixedLatitude(lon), OSMNodeID(i)));
coords->emplace_back(Coordinate(FixedLongitude(lon), FixedLatitude(lat))); coords->emplace_back(Coordinate(FixedLongitude(lon), FixedLatitude(lat)));
} }
std::uniform_int_distribution<> edge_udist(0, nodes.size() - 1); std::uniform_int_distribution<> edge_udist(0, coords->size() - 1);
std::unordered_set<std::pair<unsigned, unsigned>, TupleHash> used_edges; std::unordered_set<std::pair<unsigned, unsigned>, TupleHash> used_edges;
@ -139,7 +136,6 @@ template <unsigned NUM_NODES, unsigned NUM_EDGES> struct RandomGraphFixture
} }
} }
std::vector<extractor::QueryNode> nodes;
std::shared_ptr<std::vector<Coordinate>> coords; std::shared_ptr<std::vector<Coordinate>> coords;
std::vector<TestData> edges; std::vector<TestData> edges;
}; };
@ -154,8 +150,6 @@ struct GraphFixture
for (unsigned i = 0; i < input_coords.size(); i++) for (unsigned i = 0; i < input_coords.size(); i++)
{ {
coords->emplace_back(input_coords[i].first, input_coords[i].second); coords->emplace_back(input_coords[i].first, input_coords[i].second);
nodes.emplace_back(extractor::QueryNode(toFixed(input_coords[i].first),
toFixed(input_coords[i].second), OSMNodeID(i)));
} }
for (const auto &pair : input_edges) for (const auto &pair : input_edges)
@ -173,7 +167,6 @@ struct GraphFixture
} }
} }
std::vector<extractor::QueryNode> nodes;
std::shared_ptr<std::vector<Coordinate>> coords; std::shared_ptr<std::vector<Coordinate>> coords;
std::vector<TestData> edges; std::vector<TestData> edges;
}; };
@ -190,6 +183,7 @@ typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3, typedef RandomGraphFixture<TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 3,
TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2> TEST_LEAF_NODE_SIZE * TEST_BRANCHING_FACTOR * 2>
TestRandomGraphFixture_MultipleLevels; TestRandomGraphFixture_MultipleLevels;
typedef RandomGraphFixture<10, 30> TestRandomGraphFixture_10_30;
template <typename RTreeT> template <typename RTreeT>
void simple_verify_rtree(RTreeT &rtree, void simple_verify_rtree(RTreeT &rtree,
@ -254,17 +248,11 @@ void build_rtree(const std::string &prefix,
{ {
nodes_path = prefix + ".ramIndex"; nodes_path = prefix + ".ramIndex";
leaves_path = prefix + ".fileIndex"; leaves_path = prefix + ".fileIndex";
const std::string coords_path = prefix + ".nodes";
boost::filesystem::ofstream node_stream(coords_path, std::ios::binary); RTreeT r(fixture->edges, nodes_path, leaves_path, *fixture->coords);
const auto num_nodes = static_cast<unsigned>(fixture->nodes.size());
node_stream.write((char *)&num_nodes, sizeof(unsigned));
node_stream.write((char *)&(fixture->nodes[0]), num_nodes * sizeof(extractor::QueryNode));
RTreeT r(fixture->edges, nodes_path, leaves_path, fixture->nodes);
} }
template <typename FixtureT, typename RTreeT = TestStaticRTree> template <typename RTreeT = TestStaticRTree, typename FixtureT>
void construction_test(const std::string &prefix, FixtureT *fixture) void construction_test(const std::string &prefix, FixtureT *fixture)
{ {
std::string leaves_path; std::string leaves_path;
@ -277,6 +265,12 @@ void construction_test(const std::string &prefix, FixtureT *fixture)
sampling_verify_rtree(rtree, lsnn, *fixture->coords, 100); sampling_verify_rtree(rtree, lsnn, *fixture->coords, 100);
} }
BOOST_FIXTURE_TEST_CASE(construct_tiny, TestRandomGraphFixture_10_30)
{
using TinyTestTree = StaticRTree<TestData, std::vector<Coordinate>, false, 2, 1>;
construction_test<TinyTestTree>("test_tiny", this);
}
BOOST_FIXTURE_TEST_CASE(construct_half_leaf_test, TestRandomGraphFixture_LeafHalfFull) BOOST_FIXTURE_TEST_CASE(construct_half_leaf_test, TestRandomGraphFixture_LeafHalfFull)
{ {
construction_test("test_1", this); construction_test("test_1", this);
@ -312,14 +306,8 @@ BOOST_AUTO_TEST_CASE(regression_test)
{ {
Coord{FloatLongitude{0.0}, FloatLatitude{40.0}}, // Coord{FloatLongitude{0.0}, FloatLatitude{40.0}}, //
Coord{FloatLongitude{5.0}, FloatLatitude{35.0}}, // Coord{FloatLongitude{5.0}, FloatLatitude{35.0}}, //
Coord{FloatLongitude{5.0}, Coord{FloatLongitude{5.0}, FloatLatitude{5.0,}}, //
FloatLatitude{ Coord{FloatLongitude{10.0}, FloatLatitude{0.0}}, //
5.0,
}}, //
Coord{FloatLongitude{10.0},
FloatLatitude{
0.0,
}}, //
Coord{FloatLongitude{10.0}, FloatLatitude{20.0}}, // Coord{FloatLongitude{10.0}, FloatLatitude{20.0}}, //
Coord{FloatLongitude{5.0}, FloatLatitude{20.0}}, // Coord{FloatLongitude{5.0}, FloatLatitude{20.0}}, //
Coord{FloatLongitude{100.0}, FloatLatitude{40.0}}, // Coord{FloatLongitude{100.0}, FloatLatitude{40.0}}, //