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

Migrate to C++17. Update sol2 to 3.3.0. (#6279)

Browse Source 
* Migrate to C++17. Update sol2 to 3.3.0.
This commit is contained in:
Siarhei Fedartsou
2022-07-31 01:56:17 +02:00
committed by GitHub
parent 204fdaff6e
commit 4e8ee288d9
413 changed files with 30288 additions and 386664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/partitioner/bisection_graph.cpp
+4 -2
View File
@@ -4,6 +4,7 @@
#include "util/debug.hpp"
#include <algorithm>
#include <random>
#include <vector>
#include <boost/test/unit_test.hpp>
@@ -90,8 +91,9 @@ BOOST_AUTO_TEST_CASE(access_edges)
const auto coordinates = makeGridCoordinates(rows, cols, step_size, 0, 0);
auto grid_edges = makeGridEdges(rows, cols, 0);
std::random_shuffle(grid_edges.begin(), grid_edges.end());
std::random_device rd;
std::mt19937 rng(rd());
std::shuffle(grid_edges.begin(), grid_edges.end(), rng);
groupEdgesBySource(grid_edges.begin(), grid_edges.end());
const auto graph = makeBisectionGraph(coordinates, adaptToBisectionEdge(std::move(grid_edges)));
unit_tests/partitioner/bisection_graph_view.cpp
+11 -3
View File
@@ -6,6 +6,7 @@
#include <algorithm>
#include <climits>
#include <random>
#include <vector>
#include <boost/test/unit_test.hpp>
@@ -15,6 +16,13 @@ using namespace osrm::util;
BOOST_AUTO_TEST_SUITE(graph_view)
static void shuffle(std::vector<EdgeWithSomeAdditionalData> &grid_edges)
{
std::random_device rd;
std::mt19937 rng(rd());
std::shuffle(grid_edges.begin(), grid_edges.end(), rng);
}
BOOST_AUTO_TEST_CASE(separate_top_bottom)
{
// 40 entries of left/right edges
@@ -25,7 +33,7 @@ BOOST_AUTO_TEST_CASE(separate_top_bottom)
auto grid_edges = makeGridEdges(rows, cols, 0);
std::random_shuffle(grid_edges.begin(), grid_edges.end());
shuffle(grid_edges);
groupEdgesBySource(grid_edges.begin(), grid_edges.end());
auto graph = makeBisectionGraph(coordinates, adaptToBisectionEdge(std::move(grid_edges)));
@@ -74,7 +82,7 @@ BOOST_AUTO_TEST_CASE(separate_top_bottom_copy)
auto grid_edges = makeGridEdges(rows, cols, 0);
std::random_shuffle(grid_edges.begin(), grid_edges.end());
shuffle(grid_edges);
groupEdgesBySource(grid_edges.begin(), grid_edges.end());
auto graph = makeBisectionGraph(coordinates, adaptToBisectionEdge(std::move(grid_edges)));
@@ -125,7 +133,7 @@ BOOST_AUTO_TEST_CASE(separate_left_right)
auto grid_edges = makeGridEdges(rows, cols, 0);
std::random_shuffle(grid_edges.begin(), grid_edges.end());
shuffle(grid_edges);
groupEdgesBySource(grid_edges.begin(), grid_edges.end());
auto graph = makeBisectionGraph(coordinates, adaptToBisectionEdge(std::move(grid_edges)));