Skip to content

Commit 4ee9968

Browse files
fenwuyaojifenwuyaoji
authored
bug-fix: invalid contract node (#7066)
1 parent 646384a commit 4ee9968

File tree

5 files changed

+129
-23
lines changed

5 files changed

+129
-23
lines changed

‎include/contractor/contractor_search.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ namespace osrm::contractor
1313

1414
void search(ContractorHeap &heap,
1515
const ContractorGraph &graph,
16+
const std::vector<bool> &contractable,
1617
const unsigned number_of_targets,
1718
const int node_limit,
1819
const EdgeWeight weight_limit,

‎include/util/xor_fast_hash.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ template <std::size_t MaxNumElements = (1u << 16u)> class XORFastHash
4242
public:
4343
XORFastHash()
4444
{
45-
std::mt19937 generator; // impl. defined but deterministic default seed
45+
std::mt19937 generator(1); // impl. defined but deterministic default seed
4646

4747
std::iota(begin(table1), end(table1), 0u);
4848
std::shuffle(begin(table1), end(table1), generator);

‎src/contractor/contractor_search.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ namespace
1010
{
1111
void relaxNode(ContractorHeap &heap,
1212
const ContractorGraph &graph,
13+
const std::vector<bool> &contractable,
1314
const NodeID node,
1415
const EdgeWeight node_weight,
1516
const NodeID forbidden_node)
@@ -34,6 +35,10 @@ void relaxNode(ContractorHeap &heap,
3435
// New Node discovered -> Add to Heap + Node Info Storage
3536
if (!toHeapNode)
3637
{
38+
if (!contractable[to])
39+
{
40+
continue;
41+
}
3742
heap.Insert(to, to_weight, ContractorHeapData{current_hop, false});
3843
}
3944
// Found a shorter Path -> Update weight
@@ -49,6 +54,7 @@ void relaxNode(ContractorHeap &heap,
4954

5055
void search(ContractorHeap &heap,
5156
const ContractorGraph &graph,
57+
const std::vector<bool> &contractable,
5258
const unsigned number_of_targets,
5359
const int node_limit,
5460
const EdgeWeight weight_limit,
@@ -80,7 +86,7 @@ void search(ContractorHeap &heap,
8086
}
8187
}
8288

83-
relaxNode(heap, graph, node, node_weight, forbidden_node);
89+
relaxNode(heap, graph, contractable, node, node_weight, forbidden_node);
8490
}
8591
}
8692
} // namespace osrm::contractor

‎src/contractor/graph_contractor.cpp‎

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ void ContractNode(ContractorThreadData *data,
138138
const ContractorGraph &graph,
139139
const NodeID node,
140140
std::vector<EdgeWeight> &node_weights,
141+
const std::vector<bool> &contractable,
141142
ContractionStats *stats = nullptr)
142143
{
143144
auto &heap = data->heap;
@@ -245,12 +246,24 @@ void ContractNode(ContractorThreadData *data,
245246
if (RUNSIMULATION)
246247
{
247248
const int constexpr SIMULATION_SEARCH_SPACE_SIZE = 1000;
248-
search(heap, graph, number_of_targets, SIMULATION_SEARCH_SPACE_SIZE, max_weight, node);
249+
search(heap,
250+
graph,
251+
contractable,
252+
number_of_targets,
253+
SIMULATION_SEARCH_SPACE_SIZE,
254+
max_weight,
255+
node);
249256
}
250257
else
251258
{
252259
const int constexpr FULL_SEARCH_SPACE_SIZE = 2000;
253-
search(heap, graph, number_of_targets, FULL_SEARCH_SPACE_SIZE, max_weight, node);
260+
search(heap,
261+
graph,
262+
contractable,
263+
number_of_targets,
264+
FULL_SEARCH_SPACE_SIZE,
265+
max_weight,
266+
node);
254267
}
255268
for (auto out_edge : graph.GetAdjacentEdgeRange(node))
256269
{
@@ -344,18 +357,20 @@ void ContractNode(ContractorThreadData *data,
344357
void ContractNode(ContractorThreadData *data,
345358
const ContractorGraph &graph,
346359
const NodeID node,
347-
std::vector<EdgeWeight> &node_weights)
360+
std::vector<EdgeWeight> &node_weights,
361+
const std::vector<bool> &contractable)
348362
{
349-
ContractNode<false>(data, graph, node, node_weights, nullptr);
363+
ContractNode<false>(data, graph, node, node_weights, contractable, nullptr);
350364
}
351365

352366
ContractionStats SimulateNodeContraction(ContractorThreadData *data,
353367
const ContractorGraph &graph,
354368
const NodeID node,
355-
std::vector<EdgeWeight> &node_weights)
369+
std::vector<EdgeWeight> &node_weights,
370+
const std::vector<bool> &contractable)
356371
{
357372
ContractionStats stats;
358-
ContractNode<true>(data, graph, node, node_weights, &stats);
373+
ContractNode<true>(data, graph, node, node_weights, contractable, &stats);
359374
return stats;
360375
}
361376

@@ -487,7 +502,8 @@ bool UpdateNodeNeighbours(ContractorNodeData &node_data,
487502
if (node_data.contractable[u])
488503
{
489504
node_data.priorities[u] = EvaluateNodePriority(
490-
SimulateNodeContraction(data, graph, u, node_data.weights), node_data.depths[u]);
505+
SimulateNodeContraction(data, graph, u, node_data.weights, node_data.contractable),
506+
node_data.depths[u]);
491507
}
492508
}
493509
return true;
@@ -618,19 +634,21 @@ std::vector<bool> contractGraph(ContractorGraph &graph,
618634
{
619635
util::UnbufferedLog log;
620636
log << "initializing node priorities...";
621-
tbb::parallel_for(tbb::blocked_range<std::size_t>(0, remaining_nodes.size(), PQGrainSize),
622-
[&](const auto &range)
623-
{
624-
ContractorThreadData *data = thread_data_list.GetThreadData();
625-
for (auto x = range.begin(), end = range.end(); x != end; ++x)
626-
{
627-
auto node = remaining_nodes[x].id;
628-
BOOST_ASSERT(node_data.contractable[node]);
629-
node_data.priorities[node] = EvaluateNodePriority(
630-
SimulateNodeContraction(data, graph, node, node_data.weights),
631-
node_data.depths[node]);
632-
}
633-
});
637+
tbb::parallel_for(
638+
tbb::blocked_range<std::size_t>(0, remaining_nodes.size(), PQGrainSize),
639+
[&](const auto &range)
640+
{
641+
ContractorThreadData *data = thread_data_list.GetThreadData();
642+
for (auto x = range.begin(), end = range.end(); x != end; ++x)
643+
{
644+
auto node = remaining_nodes[x].id;
645+
BOOST_ASSERT(node_data.contractable[node]);
646+
node_data.priorities[node] = EvaluateNodePriority(
647+
SimulateNodeContraction(
648+
data, graph, node, node_data.weights, node_data.contractable),
649+
node_data.depths[node]);
650+
}
651+
});
634652
log << " ok.";
635653
}
636654

@@ -688,7 +706,7 @@ std::vector<bool> contractGraph(ContractorGraph &graph,
688706
for (auto position = range.begin(), end = range.end(); position != end; ++position)
689707
{
690708
const NodeID node = remaining_nodes[position].id;
691-
ContractNode(data, graph, node, node_data.weights);
709+
ContractNode(data, graph, node, node_data.weights, node_data.contractable);
692710
}
693711
});
694712

‎unit_tests/contractor/graph_contractor.cpp‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#include "contractor/graph_contractor.hpp"
2+
#include <contractor/contract_excludable_graph.hpp>
23

34
#include "../common/range_tools.hpp"
45
#include "helper.hpp"
56

67
#include <boost/test/unit_test.hpp>
8+
79
#include <tbb/global_control.h>
810

911
using namespace osrm;
@@ -12,6 +14,85 @@ using namespace osrm::unit_test;
1214

1315
BOOST_AUTO_TEST_SUITE(graph_contractor)
1416

17+
BOOST_AUTO_TEST_CASE(contract_exclude_graph)
18+
{
19+
tbb::global_control scheduler(tbb::global_control::max_allowed_parallelism, 1);
20+
/* Edge 0 is labeled with toll,
21+
* no edge will be contracted
22+
*
23+
* toll
24+
* (0) <--1--< (1)
25+
* v v
26+
* | \
27+
* 1 2
28+
* | \
29+
* > (3) <--2--< (2) <
30+
*/
31+
std::vector edges = {TestEdge{1, 0, 1},
32+
TestEdge{0, 3, 1},
33+
34+
TestEdge{1, 2, 2},
35+
TestEdge{2, 3, 2}};
36+
auto reference_graph = makeGraph(edges);
37+
38+
auto contracted_graph = reference_graph;
39+
40+
QueryGraph query_graph;
41+
std::vector<std::vector<bool>> edge_filters;
42+
std::tie(query_graph, edge_filters) =
43+
contractExcludableGraph(contracted_graph,
44+
{{1}, {1}, {1}, {1}},
45+
{{true, true, true, true}, {false, true, true, true}});
46+
REQUIRE_SIZE_RANGE(query_graph.GetAdjacentEdgeRange(0), 0);
47+
BOOST_CHECK(query_graph.FindEdge(0, 1) == SPECIAL_EDGEID);
48+
BOOST_CHECK(query_graph.FindEdge(0, 3) == SPECIAL_EDGEID);
49+
REQUIRE_SIZE_RANGE(query_graph.GetAdjacentEdgeRange(1), 2);
50+
BOOST_CHECK(query_graph.FindEdge(1, 0) != SPECIAL_EDGEID);
51+
BOOST_CHECK(query_graph.FindEdge(1, 2) != SPECIAL_EDGEID);
52+
REQUIRE_SIZE_RANGE(query_graph.GetAdjacentEdgeRange(2), 0);
53+
BOOST_CHECK(query_graph.FindEdge(2, 1) == SPECIAL_EDGEID);
54+
BOOST_CHECK(query_graph.FindEdge(2, 3) == SPECIAL_EDGEID);
55+
REQUIRE_SIZE_RANGE(query_graph.GetAdjacentEdgeRange(3), 2);
56+
BOOST_CHECK(query_graph.FindEdge(3, 0) != SPECIAL_EDGEID);
57+
BOOST_CHECK(query_graph.FindEdge(3, 2) != SPECIAL_EDGEID);
58+
59+
auto reference_graph2 = makeGraph(edges);
60+
61+
auto contracted_graph2 = reference_graph2;
62+
63+
/* All edges are normal edges,
64+
* edge 2 will be contracted
65+
*
66+
* Deleted edge_based_edges 1 -> 2, 3 -> 2
67+
*
68+
* (0) <--1--< (1)
69+
* v v
70+
* | \
71+
* 1 2
72+
* | \
73+
* > (3) <--2--< (2) <
74+
*/
75+
QueryGraph query_graph2;
76+
std::vector<std::vector<bool>> edge_filters2;
77+
std::tie(query_graph2, edge_filters2) =
78+
contractExcludableGraph(contracted_graph2,
79+
{{1}, {1}, {1}, {1}},
80+
{{true, true, true, true}, {true, true, true, true}});
81+
82+
REQUIRE_SIZE_RANGE(query_graph2.GetAdjacentEdgeRange(0), 0);
83+
BOOST_CHECK(query_graph2.FindEdge(0, 1) == SPECIAL_EDGEID);
84+
BOOST_CHECK(query_graph2.FindEdge(0, 3) == SPECIAL_EDGEID);
85+
REQUIRE_SIZE_RANGE(query_graph2.GetAdjacentEdgeRange(1), 1);
86+
BOOST_CHECK(query_graph2.FindEdge(1, 0) != SPECIAL_EDGEID);
87+
BOOST_CHECK(query_graph2.FindEdge(1, 2) == SPECIAL_EDGEID);
88+
REQUIRE_SIZE_RANGE(query_graph2.GetAdjacentEdgeRange(2), 2);
89+
BOOST_CHECK(query_graph2.FindEdge(2, 1) != SPECIAL_EDGEID);
90+
BOOST_CHECK(query_graph2.FindEdge(2, 3) != SPECIAL_EDGEID);
91+
REQUIRE_SIZE_RANGE(query_graph2.GetAdjacentEdgeRange(3), 1);
92+
BOOST_CHECK(query_graph2.FindEdge(3, 0) != SPECIAL_EDGEID);
93+
BOOST_CHECK(query_graph2.FindEdge(3, 2) == SPECIAL_EDGEID);
94+
}
95+
1596
BOOST_AUTO_TEST_CASE(contract_graph)
1697
{
1798
tbb::global_control scheduler(tbb::global_control::max_allowed_parallelism, 1);

0 commit comments

Comments
 (0)