Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity
3285ce3b2f
osrm-backend/unit_tests/customizer/cell_customization.cpp

432 lines
19 KiB
C++
Raw Normal View History

removed code duplication in unit tests
2017-03-07 10:26:24 -05:00
#include "common/range_tools.hpp"
Added cells customizer
2017-02-20 08:20:22 -05:00
#include "customizer/cell_customizer.hpp"
Rename namespace partition to partitioner Rename module partition to partitioner. This cultivates naming used in existing modules like extractor, customizer, etc. - noun vs verb (word partition is both though).
2018-02-01 10:47:43 -05:00
#include "partitioner/multi_level_graph.hpp"
#include "partitioner/multi_level_partition.hpp"
Added cells customizer
2017-02-20 08:20:22 -05:00
#include "util/static_graph.hpp"
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
#include <boost/test/unit_test.hpp>
Added cells customizer
2017-02-20 08:20:22 -05:00
using namespace osrm;
Add update functionality to osrm-customize All speed file flags are compatible with osrm-contract.
2017-03-10 17:35:46 -05:00
using namespace osrm::customizer;
Rename namespace partition to partitioner Rename module partition to partitioner. This cultivates naming used in existing modules like extractor, customizer, etc. - noun vs verb (word partition is both though).
2018-02-01 10:47:43 -05:00
using namespace osrm::partitioner;
Added cells customizer
2017-02-20 08:20:22 -05:00
using namespace osrm::util;
namespace
{
struct MockEdge
{
NodeID start;
NodeID target;
EdgeWeight weight;
};
Fix all customization tests
2017-03-20 11:59:50 -04:00
auto makeGraph(const MultiLevelPartition &mlp, const std::vector<MockEdge> &mock_edges)
Added cells customizer
2017-02-20 08:20:22 -05:00
{
struct EdgeData
{
EdgeWeight weight;
Matrix plugin with MLD overlay
2017-06-27 18:48:18 -04:00
EdgeDuration duration;
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
EdgeDistance distance;
Added cells customizer
2017-02-20 08:20:22 -05:00
bool forward;
bool backward;
};
using Edge = static_graph_details::SortableEdgeWithData<EdgeData>;
std::vector<Edge> edges;
std::size_t max_id = 0;
for (const auto &m : mock_edges)
{
max_id = std::max<std::size_t>(max_id, std::max(m.start, m.target));
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
edges.push_back(Edge{m.start,
m.target,
m.weight,
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
EdgeDuration{2} * alias_cast<EdgeDuration>(m.weight),
EdgeDistance{1.0},
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
true,
false});
edges.push_back(Edge{m.target,
m.start,
m.weight,
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
EdgeDuration{2} * alias_cast<EdgeDuration>(m.weight),
EdgeDistance{1.0},
Replace dynamic distance calculation for table plugin with pre-calculated distances on shortcuts, avoiding unpacking cost. Adds approx 10% to total data size. Speeds up large table requests by 2 orders of magnitude. Co-authored-by: Kajari Ghosh <ghoshkaj@gmail.com>
2018-10-30 00:47:49 -04:00
false,
true});
Added cells customizer
2017-02-20 08:20:22 -05:00
}
std::sort(edges.begin(), edges.end());
Rename namespace partition to partitioner Rename module partition to partitioner. This cultivates naming used in existing modules like extractor, customizer, etc. - noun vs verb (word partition is both though).
2018-02-01 10:47:43 -05:00
return partitioner::MultiLevelGraph<EdgeData, osrm::storage::Ownership::Container>(
clang-format
2017-03-29 08:07:03 -04:00
mlp, max_id + 1, edges);
Added cells customizer
2017-02-20 08:20:22 -05:00
}
Fix osrm-contract, tests, on Windows As part of graph contraction, node renumbering leads to in-place permuting of graph state, including boolean vector elements. std::vector<bool> returns proxy objects when referencing individual bits. To correctly swap bool elements using MSVC, we need to explicitly apply std::vector<bool>::swap. Making this change fixes osrm-contract on Windows. We also correct failing tests and other undefined behaviours (mainly iterator access outside boundaries) highlighted by MSVC.
2020-11-14 13:02:56 -05:00
} // namespace
Added cells customizer
2017-02-20 08:20:22 -05:00
BOOST_AUTO_TEST_SUITE(cell_customization_tests)
BOOST_AUTO_TEST_CASE(two_level_test)
{
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
// 0 --- 1
// | |
// 2 --- 3
Added cells customizer
2017-02-20 08:20:22 -05:00
// node: 0 1 2 3
std::vector<CellID> l1{{0, 0, 1, 1}};
MultiLevelPartition mlp{{l1}, {2}};
BOOST_REQUIRE_EQUAL(mlp.GetNumberOfLevels(), 2);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
std::vector<MockEdge> edges = {{0, 1, {1}}, {0, 2, {1}}, {2, 3, {1}}, {3, 1, {1}}, {3, 2, {1}}};
Added cells customizer
2017-02-20 08:20:22 -05:00
Fix all customization tests
2017-03-20 11:59:50 -04:00
auto graph = makeGraph(mlp, edges);
Fix stupid vector size bug
2017-07-28 10:00:14 -04:00
std::vector<bool> node_filter(graph.GetNumberOfNodes(), true);
Added cells customizer
2017-02-20 08:20:22 -05:00
CellStorage storage(mlp, graph);
Refactor cell weights and durations to own file and allow for multiple metrics
2017-07-24 20:05:15 -04:00
auto metric = storage.MakeMetric();
Added cells customizer
2017-02-20 08:20:22 -05:00
CellCustomizer customizer(mlp);
Fix test compilation
2017-04-04 13:20:36 -04:00
CellCustomizer::Heap heap(graph.GetNumberOfNodes());
Added cells customizer
2017-02-20 08:20:22 -05:00
Refactor cell weights and durations to own file and allow for multiple metrics
2017-07-24 20:05:15 -04:00
auto cell_1_0 = storage.GetCell(metric, 1, 0);
auto cell_1_1 = storage.GetCell(metric, 1, 1);
Added cells customizer
2017-02-20 08:20:22 -05:00
REQUIRE_SIZE_RANGE(cell_1_0.GetSourceNodes(), 1);
REQUIRE_SIZE_RANGE(cell_1_0.GetDestinationNodes(), 1);
REQUIRE_SIZE_RANGE(cell_1_1.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetDestinationNodes(), 2);
CHECK_EQUAL_RANGE(cell_1_0.GetSourceNodes(), 0);
CHECK_EQUAL_RANGE(cell_1_0.GetDestinationNodes(), 1);
CHECK_EQUAL_RANGE(cell_1_1.GetSourceNodes(), 2, 3);
CHECK_EQUAL_RANGE(cell_1_1.GetDestinationNodes(), 2, 3);
REQUIRE_SIZE_RANGE(cell_1_0.GetOutWeight(0), 1);
REQUIRE_SIZE_RANGE(cell_1_0.GetOutWeight(1), 0);
REQUIRE_SIZE_RANGE(cell_1_0.GetInWeight(1), 1);
REQUIRE_SIZE_RANGE(cell_1_0.GetInWeight(0), 0);
REQUIRE_SIZE_RANGE(cell_1_1.GetOutWeight(2), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetInWeight(3), 2);
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
customizer.Customize(graph, heap, storage, node_filter, metric, 1, 0);
customizer.Customize(graph, heap, storage, node_filter, metric, 1, 1);
Added cells customizer
2017-02-20 08:20:22 -05:00
// cell 0
// check row source -> destination
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_0.GetOutWeight(0), EdgeWeight{1});
Added cells customizer
2017-02-20 08:20:22 -05:00
// check column destination -> source
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_0.GetInWeight(1), EdgeWeight{1});
Added cells customizer
2017-02-20 08:20:22 -05:00
// cell 1
// check row source -> destination
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(2), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(3), EdgeWeight{1}, EdgeWeight{0});
Added cells customizer
2017-02-20 08:20:22 -05:00
// check column destination -> source
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(2), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(3), EdgeWeight{1}, EdgeWeight{0});
Added cells customizer
2017-02-20 08:20:22 -05:00
}
BOOST_AUTO_TEST_CASE(four_levels_test)
{
// node: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
std::vector<CellID> l1{{0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3}};
std::vector<CellID> l2{{0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1}};
std::vector<CellID> l3{{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
MultiLevelPartition mlp{{l1, l2, l3}, {4, 2, 1}};
BOOST_REQUIRE_EQUAL(mlp.GetNumberOfLevels(), 4);
std::vector<MockEdge> edges = {
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
{0, 1, {1}}, // cell (0, 0, 0)
{0, 2, {1}}, {3, 1, {1}}, {3, 2, {1}},
{4, 5, {1}}, // cell (1, 0, 0)
{4, 6, {1}}, {4, 7, {1}}, {5, 4, {1}}, {5, 6, {1}}, {5, 7, {1}}, {6, 4, {1}},
{6, 5, {1}}, {6, 7, {1}}, {7, 4, {1}}, {7, 5, {1}}, {7, 6, {1}},
{9, 11, {1}}, // cell (2, 1, 0)
{10, 8, {1}}, {11, 10, {1}},
{13, 12, {10}}, // cell (3, 1, 0)
{15, 14, {1}},
{2, 4, {1}}, // edge between cells (0, 0, 0) -> (1, 0, 0)
{5, 12, {1}}, // edge between cells (1, 0, 0) -> (3, 1, 0)
{8, 3, {1}}, // edge between cells (2, 1, 0) -> (0, 0, 0)
{9, 3, {1}}, // edge between cells (2, 1, 0) -> (0, 0, 0)
{12, 5, {1}}, // edge between cells (3, 1, 0) -> (1, 0, 0)
{13, 7, {1}}, // edge between cells (3, 1, 0) -> (1, 0, 0)
{14, 9, {1}}, // edge between cells (2, 1, 0) -> (0, 0, 0)
{14, 11, {1}} // edge between cells (2, 1, 0) -> (0, 0, 0)
Added cells customizer
2017-02-20 08:20:22 -05:00
};
Fix all customization tests
2017-03-20 11:59:50 -04:00
auto graph = makeGraph(mlp, edges);
Fix osrm-contract, tests, on Windows As part of graph contraction, node renumbering leads to in-place permuting of graph state, including boolean vector elements. std::vector<bool> returns proxy objects when referencing individual bits. To correctly swap bool elements using MSVC, we need to explicitly apply std::vector<bool>::swap. Making this change fixes osrm-contract on Windows. We also correct failing tests and other undefined behaviours (mainly iterator access outside boundaries) highlighted by MSVC.
2020-11-14 13:02:56 -05:00
std::vector<bool> node_filter(graph.GetNumberOfNodes(), true);
Added cells customizer
2017-02-20 08:20:22 -05:00
CellStorage storage(mlp, graph);
Refactor cell weights and durations to own file and allow for multiple metrics
2017-07-24 20:05:15 -04:00
auto metric = storage.MakeMetric();
Added cells customizer
2017-02-20 08:20:22 -05:00
Refactor cell weights and durations to own file and allow for multiple metrics
2017-07-24 20:05:15 -04:00
auto cell_1_0 = storage.GetCell(metric, 1, 0);
auto cell_1_1 = storage.GetCell(metric, 1, 1);
auto cell_1_2 = storage.GetCell(metric, 1, 2);
auto cell_1_3 = storage.GetCell(metric, 1, 3);
auto cell_2_0 = storage.GetCell(metric, 2, 0);
auto cell_2_1 = storage.GetCell(metric, 2, 1);
auto cell_3_0 = storage.GetCell(metric, 3, 0);
Added cells customizer
2017-02-20 08:20:22 -05:00
REQUIRE_SIZE_RANGE(cell_1_0.GetSourceNodes(), 1);
REQUIRE_SIZE_RANGE(cell_1_0.GetDestinationNodes(), 1);
CHECK_EQUAL_RANGE(cell_1_0.GetSourceNodes(), 3);
CHECK_EQUAL_RANGE(cell_1_0.GetDestinationNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_0.GetOutWeight(3), 1);
REQUIRE_SIZE_RANGE(cell_1_0.GetInWeight(2), 1);
REQUIRE_SIZE_RANGE(cell_1_1.GetSourceNodes(), 3);
REQUIRE_SIZE_RANGE(cell_1_1.GetDestinationNodes(), 3);
CHECK_EQUAL_RANGE(cell_1_1.GetSourceNodes(), 4, 5, 7);
CHECK_EQUAL_RANGE(cell_1_1.GetDestinationNodes(), 4, 5, 7);
REQUIRE_SIZE_RANGE(cell_1_1.GetOutWeight(4), 3);
REQUIRE_SIZE_RANGE(cell_1_1.GetOutWeight(5), 3);
REQUIRE_SIZE_RANGE(cell_1_1.GetOutWeight(7), 3);
REQUIRE_SIZE_RANGE(cell_1_1.GetInWeight(4), 3);
REQUIRE_SIZE_RANGE(cell_1_1.GetInWeight(5), 3);
REQUIRE_SIZE_RANGE(cell_1_1.GetInWeight(7), 3);
REQUIRE_SIZE_RANGE(cell_1_2.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetDestinationNodes(), 2);
CHECK_EQUAL_RANGE(cell_1_2.GetSourceNodes(), 9, 11);
CHECK_EQUAL_RANGE(cell_1_2.GetDestinationNodes(), 8, 11);
REQUIRE_SIZE_RANGE(cell_1_2.GetOutWeight(9), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetOutWeight(11), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetInWeight(8), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetInWeight(11), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetSourceNodes(), 1);
REQUIRE_SIZE_RANGE(cell_1_3.GetDestinationNodes(), 2);
CHECK_EQUAL_RANGE(cell_1_3.GetSourceNodes(), 13);
CHECK_EQUAL_RANGE(cell_1_3.GetDestinationNodes(), 12, 14);
REQUIRE_SIZE_RANGE(cell_1_3.GetOutWeight(13), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetInWeight(12), 1);
REQUIRE_SIZE_RANGE(cell_1_3.GetInWeight(14), 1);
REQUIRE_SIZE_RANGE(cell_2_0.GetSourceNodes(), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetDestinationNodes(), 2);
CHECK_EQUAL_RANGE(cell_2_0.GetSourceNodes(), 3, 5, 7);
CHECK_EQUAL_RANGE(cell_2_0.GetDestinationNodes(), 5, 7);
REQUIRE_SIZE_RANGE(cell_2_0.GetOutWeight(3), 2);
REQUIRE_SIZE_RANGE(cell_2_0.GetOutWeight(5), 2);
REQUIRE_SIZE_RANGE(cell_2_0.GetOutWeight(7), 2);
REQUIRE_SIZE_RANGE(cell_2_0.GetInWeight(5), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetInWeight(7), 3);
REQUIRE_SIZE_RANGE(cell_2_1.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetDestinationNodes(), 3);
CHECK_EQUAL_RANGE(cell_2_1.GetSourceNodes(), 9, 13);
CHECK_EQUAL_RANGE(cell_2_1.GetDestinationNodes(), 8, 9, 12);
REQUIRE_SIZE_RANGE(cell_2_1.GetOutWeight(9), 3);
REQUIRE_SIZE_RANGE(cell_2_1.GetOutWeight(13), 3);
REQUIRE_SIZE_RANGE(cell_2_1.GetInWeight(8), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetInWeight(9), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetInWeight(12), 2);
REQUIRE_SIZE_RANGE(cell_3_0.GetSourceNodes(), 0);
REQUIRE_SIZE_RANGE(cell_3_0.GetDestinationNodes(), 0);
CellCustomizer customizer(mlp);
Fix test compilation
2017-04-04 13:20:36 -04:00
CellCustomizer::Heap heap(graph.GetNumberOfNodes());
Added cells customizer
2017-02-20 08:20:22 -05:00
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
customizer.Customize(graph, heap, storage, node_filter, metric, 1, 0);
customizer.Customize(graph, heap, storage, node_filter, metric, 1, 1);
customizer.Customize(graph, heap, storage, node_filter, metric, 1, 2);
customizer.Customize(graph, heap, storage, node_filter, metric, 1, 3);
Added cells customizer
2017-02-20 08:20:22 -05:00
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
customizer.Customize(graph, heap, storage, node_filter, metric, 2, 0);
customizer.Customize(graph, heap, storage, node_filter, metric, 2, 1);
Added cells customizer
2017-02-20 08:20:22 -05:00
// level 1
// cell 0
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_0.GetOutWeight(3), EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_0.GetInWeight(2), EdgeWeight{1});
Added cells customizer
2017-02-20 08:20:22 -05:00
// cell 1
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(4), EdgeWeight{0}, EdgeWeight{1}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(5), EdgeWeight{1}, EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(7), EdgeWeight{1}, EdgeWeight{1}, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(4), EdgeWeight{0}, EdgeWeight{1}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(5), EdgeWeight{1}, EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(7), EdgeWeight{1}, EdgeWeight{1}, EdgeWeight{0});
Added cells customizer
2017-02-20 08:20:22 -05:00
// cell 2
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_2.GetOutWeight(9), EdgeWeight{3}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_2.GetOutWeight(11), EdgeWeight{2}, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_1_2.GetInWeight(8), EdgeWeight{3}, EdgeWeight{2});
CHECK_EQUAL_RANGE(cell_1_2.GetInWeight(11), EdgeWeight{1}, EdgeWeight{0});
Added cells customizer
2017-02-20 08:20:22 -05:00
// cell 3
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_3.GetOutWeight(13), EdgeWeight{10}, INVALID_EDGE_WEIGHT);
CHECK_EQUAL_RANGE(cell_1_3.GetInWeight(12), EdgeWeight{10});
Added cells customizer
2017-02-20 08:20:22 -05:00
CHECK_EQUAL_RANGE(cell_1_3.GetInWeight(14), INVALID_EDGE_WEIGHT);
// level 2
// cell 0
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_2_0.GetOutWeight(3), EdgeWeight{3}, EdgeWeight{3});
CHECK_EQUAL_RANGE(cell_2_0.GetOutWeight(5), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_2_0.GetOutWeight(7), EdgeWeight{1}, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_2_0.GetInWeight(5), EdgeWeight{3}, EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_2_0.GetInWeight(7), EdgeWeight{3}, EdgeWeight{1}, EdgeWeight{0});
Added cells customizer
2017-02-20 08:20:22 -05:00
// cell 1
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_2_1.GetOutWeight(9), EdgeWeight{3}, EdgeWeight{0}, INVALID_EDGE_WEIGHT);
CHECK_EQUAL_RANGE(
cell_2_1.GetOutWeight(13), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT, EdgeWeight{10});
CHECK_EQUAL_RANGE(cell_2_1.GetInWeight(8), EdgeWeight{3}, INVALID_EDGE_WEIGHT);
CHECK_EQUAL_RANGE(cell_2_1.GetInWeight(9), EdgeWeight{0}, INVALID_EDGE_WEIGHT);
CHECK_EQUAL_RANGE(cell_2_1.GetInWeight(12), INVALID_EDGE_WEIGHT, EdgeWeight{10});
CHECK_EQUAL_RANGE(
cell_2_1.GetOutDuration(9), EdgeDuration{6}, EdgeDuration{0}, INVALID_EDGE_DURATION);
CHECK_EQUAL_RANGE(cell_2_1.GetOutDuration(13),
INVALID_EDGE_DURATION,
INVALID_EDGE_DURATION,
EdgeDuration{20});
CHECK_EQUAL_RANGE(cell_2_1.GetInDuration(8), EdgeDuration{6}, INVALID_EDGE_DURATION);
CHECK_EQUAL_RANGE(cell_2_1.GetInDuration(9), EdgeDuration{0}, INVALID_EDGE_DURATION);
CHECK_EQUAL_RANGE(cell_2_1.GetInDuration(12), INVALID_EDGE_DURATION, EdgeDuration{20});
Matrix plugin with MLD overlay
2017-06-27 18:48:18 -04:00
Added cells customizer
2017-02-20 08:20:22 -05:00
CellStorage storage_rec(mlp, graph);
Refactor cell weights and durations to own file and allow for multiple metrics
2017-07-24 20:05:15 -04:00
auto metric_rec = storage_rec.MakeMetric();
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
customizer.Customize(graph, storage_rec, node_filter, metric_rec);
Refactor cell weights and durations to own file and allow for multiple metrics
2017-07-24 20:05:15 -04:00
CHECK_EQUAL_COLLECTIONS(cell_2_1.GetOutWeight(9),
storage_rec.GetCell(metric_rec, 2, 1).GetOutWeight(9));
CHECK_EQUAL_COLLECTIONS(cell_2_1.GetOutWeight(13),
storage_rec.GetCell(metric_rec, 2, 1).GetOutWeight(13));
CHECK_EQUAL_COLLECTIONS(cell_2_1.GetInWeight(8),
storage_rec.GetCell(metric_rec, 2, 1).GetInWeight(8));
CHECK_EQUAL_COLLECTIONS(cell_2_1.GetInWeight(9),
storage_rec.GetCell(metric_rec, 2, 1).GetInWeight(9));
CHECK_EQUAL_COLLECTIONS(cell_2_1.GetInWeight(12),
storage_rec.GetCell(metric_rec, 2, 1).GetInWeight(12));
Added cells customizer
2017-02-20 08:20:22 -05:00
}
Avoid -> Exclude
2017-08-16 16:21:19 -04:00
BOOST_AUTO_TEST_CASE(exclude_test)
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
{
// 0 --- 1 --- 5 --- 6
// | / | | |
// 2 ----3 --- 4 --- 7
// \__________/
std::vector<MockEdge> edges = {
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
{0, 1, {1}}, {0, 2, {1}}, {1, 0, {1}}, {1, 2, {10}}, {1, 3, {1}}, {1, 5, {1}},
{2, 0, {1}}, {2, 1, {10}}, {2, 3, {1}}, {2, 4, {1}}, {3, 1, {1}}, {3, 2, {1}},
{3, 4, {1}}, {4, 2, {1}}, {4, 3, {1}}, {4, 5, {1}}, {4, 7, {1}}, {5, 1, {1}},
{5, 4, {1}}, {5, 6, {1}}, {6, 5, {1}}, {6, 7, {1}}, {7, 4, {1}}, {7, 6, {1}},
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
};
// node: 0 1 2 3 4 5 6 7
std::vector<CellID> l1{{0, 0, 1, 1, 3, 2, 2, 3}};
std::vector<CellID> l2{{0, 0, 0, 0, 1, 1, 1, 1}};
std::vector<CellID> l3{{0, 0, 0, 0, 0, 0, 0, 0}};
MultiLevelPartition mlp{{l1, l2, l3}, {4, 2, 1}};
BOOST_REQUIRE_EQUAL(mlp.GetNumberOfLevels(), 4);
auto graph = makeGraph(mlp, edges);
Avoid -> Exclude
2017-08-16 16:21:19 -04:00
// exclude node 0, 3 and 7
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
std::vector<bool> node_filter = {false, true, true, false, true, true, true, false};
CellCustomizer customizer(mlp);
CellStorage storage(mlp, graph);
auto metric = storage.MakeMetric();
customizer.Customize(graph, storage, node_filter, metric);
auto cell_1_0 = storage.GetCell(metric, 1, 0);
auto cell_1_1 = storage.GetCell(metric, 1, 1);
auto cell_1_2 = storage.GetCell(metric, 1, 2);
auto cell_1_3 = storage.GetCell(metric, 1, 3);
REQUIRE_SIZE_RANGE(cell_1_0.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_0.GetDestinationNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetDestinationNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetDestinationNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetDestinationNodes(), 2);
CHECK_EQUAL_RANGE(cell_1_0.GetSourceNodes(), 0, 1);
CHECK_EQUAL_RANGE(cell_1_0.GetDestinationNodes(), 0, 1);
CHECK_EQUAL_RANGE(cell_1_1.GetSourceNodes(), 2, 3);
CHECK_EQUAL_RANGE(cell_1_1.GetDestinationNodes(), 2, 3);
CHECK_EQUAL_RANGE(cell_1_2.GetSourceNodes(), 5, 6);
CHECK_EQUAL_RANGE(cell_1_2.GetDestinationNodes(), 5, 6);
CHECK_EQUAL_RANGE(cell_1_3.GetSourceNodes(), 4, 7);
CHECK_EQUAL_RANGE(cell_1_3.GetDestinationNodes(), 4, 7);
REQUIRE_SIZE_RANGE(cell_1_0.GetOutWeight(0), 2);
REQUIRE_SIZE_RANGE(cell_1_0.GetOutWeight(1), 2);
REQUIRE_SIZE_RANGE(cell_1_0.GetInWeight(0), 2);
REQUIRE_SIZE_RANGE(cell_1_0.GetInWeight(1), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetOutWeight(2), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetOutWeight(3), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetInWeight(2), 2);
REQUIRE_SIZE_RANGE(cell_1_1.GetInWeight(3), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetOutWeight(5), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetOutWeight(6), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetInWeight(5), 2);
REQUIRE_SIZE_RANGE(cell_1_2.GetInWeight(6), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetOutWeight(4), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetOutWeight(7), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetInWeight(4), 2);
REQUIRE_SIZE_RANGE(cell_1_3.GetInWeight(7), 2);
CHECK_EQUAL_RANGE(cell_1_0.GetOutWeight(0), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_0.GetOutWeight(1), INVALID_EDGE_WEIGHT, EdgeWeight{0});
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
CHECK_EQUAL_RANGE(cell_1_0.GetInWeight(0), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_0.GetInWeight(1), INVALID_EDGE_WEIGHT, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(2), EdgeWeight{0}, INVALID_EDGE_WEIGHT);
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
CHECK_EQUAL_RANGE(cell_1_1.GetOutWeight(3), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(2), EdgeWeight{0}, INVALID_EDGE_WEIGHT);
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
CHECK_EQUAL_RANGE(cell_1_1.GetInWeight(3), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_2.GetOutWeight(5), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_2.GetOutWeight(6), EdgeWeight{1}, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_1_2.GetInWeight(5), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_1_2.GetInWeight(6), EdgeWeight{1}, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_1_3.GetOutWeight(4), EdgeWeight{0}, INVALID_EDGE_WEIGHT);
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
CHECK_EQUAL_RANGE(cell_1_3.GetOutWeight(7), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_1_3.GetInWeight(4), EdgeWeight{0}, INVALID_EDGE_WEIGHT);
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
CHECK_EQUAL_RANGE(cell_1_3.GetInWeight(7), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
auto cell_2_0 = storage.GetCell(metric, 2, 0);
auto cell_2_1 = storage.GetCell(metric, 2, 1);
REQUIRE_SIZE_RANGE(cell_2_0.GetSourceNodes(), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetDestinationNodes(), 3);
REQUIRE_SIZE_RANGE(cell_2_1.GetSourceNodes(), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetDestinationNodes(), 2);
CHECK_EQUAL_RANGE(cell_2_0.GetSourceNodes(), 1, 2, 3);
CHECK_EQUAL_RANGE(cell_2_0.GetDestinationNodes(), 1, 2, 3);
CHECK_EQUAL_RANGE(cell_2_1.GetSourceNodes(), 4, 5);
CHECK_EQUAL_RANGE(cell_2_1.GetDestinationNodes(), 4, 5);
REQUIRE_SIZE_RANGE(cell_2_0.GetOutWeight(1), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetOutWeight(2), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetOutWeight(3), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetInWeight(1), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetInWeight(2), 3);
REQUIRE_SIZE_RANGE(cell_2_0.GetInWeight(3), 3);
REQUIRE_SIZE_RANGE(cell_2_1.GetOutWeight(4), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetOutWeight(5), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetInWeight(4), 2);
REQUIRE_SIZE_RANGE(cell_2_1.GetInWeight(5), 2);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_2_0.GetOutWeight(1), EdgeWeight{0}, EdgeWeight{10}, INVALID_EDGE_WEIGHT);
CHECK_EQUAL_RANGE(cell_2_0.GetOutWeight(2), EdgeWeight{10}, EdgeWeight{0}, INVALID_EDGE_WEIGHT);
Fix clang format
2017-08-14 17:24:33 -04:00
CHECK_EQUAL_RANGE(
cell_2_0.GetOutWeight(3), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_2_0.GetInWeight(1), EdgeWeight{0}, EdgeWeight{10}, INVALID_EDGE_WEIGHT);
CHECK_EQUAL_RANGE(cell_2_0.GetInWeight(2), EdgeWeight{10}, EdgeWeight{0}, INVALID_EDGE_WEIGHT);
Fix clang format
2017-08-14 17:24:33 -04:00
CHECK_EQUAL_RANGE(
cell_2_0.GetInWeight(3), INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT, INVALID_EDGE_WEIGHT);
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
Make edge metrics strongly typed (#6421) This change takes the existing typedefs for weight, duration and distance, and makes them proper types, using the existing Alias functionality. Primarily this is to prevent bugs where the metrics are switched, but it also adds additional documentation. For example, it now makes it clear (despite the naming of variables) that most of the trip algorithm is running on the duration metric. I've not made any changes to the casts performed between metrics and numeric types, they now just more explicit.
2022-10-28 10:16:12 -04:00
CHECK_EQUAL_RANGE(cell_2_1.GetOutWeight(4), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_2_1.GetOutWeight(5), EdgeWeight{1}, EdgeWeight{0});
CHECK_EQUAL_RANGE(cell_2_1.GetInWeight(4), EdgeWeight{0}, EdgeWeight{1});
CHECK_EQUAL_RANGE(cell_2_1.GetInWeight(5), EdgeWeight{1}, EdgeWeight{0});
Add tests for avoid flags
2017-07-28 05:49:49 -04:00
}
Added cells customizer
2017-02-20 08:20:22 -05:00
BOOST_AUTO_TEST_SUITE_END()
Reference in New Issue Copy Permalink