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

Rename GraphView -> BisectionGraphView to avoid name conflicts

Browse Source
This commit is contained in:
Patrick Niklaus
2017-08-22 19:52:42 +00:00
committed by Patrick Niklaus
parent e23dc8977f
commit 53f87c08b5
14 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/partition/graph_view.cpp → unit_tests/partition/bisection_graph_view.cpp
+8 -8
View File
@@ -1,4 +1,4 @@
#include "partition/graph_view.hpp"
#include "partition/bisection_graph_view.hpp"
#include "partition/graph_generator.hpp"
#include "partition/recursive_bisection_state.hpp"
@@ -33,8 +33,8 @@ BOOST_AUTO_TEST_CASE(separate_top_bottom)
partition[4] = partition[5] = partition[6] = partition[7] = true;
const auto center = bisection_state.ApplyBisection(graph.Begin(), graph.End(), 0, partition);
GraphView left(graph, graph.Begin(), center);
GraphView right(graph, center, graph.End());
BisectionGraphView left(graph, graph.Begin(), center);
BisectionGraphView right(graph, center, graph.End());
BOOST_CHECK_EQUAL(left.NumberOfNodes(), 4);
for (const auto &node : left.Nodes())
@@ -82,10 +82,10 @@ BOOST_AUTO_TEST_CASE(separate_top_bottom_copy)
partition[4] = partition[5] = partition[6] = partition[7] = true;
const auto center = bisection_state.ApplyBisection(graph.Begin(), graph.End(), 0, partition);
GraphView total(graph, graph.Begin(), graph.End());
BisectionGraphView total(graph, graph.Begin(), graph.End());
GraphView left(total, total.Begin(), center);
GraphView right(total, center, total.End());
BisectionGraphView left(total, total.Begin(), center);
BisectionGraphView right(total, center, total.End());
BOOST_CHECK_EQUAL(left.NumberOfNodes(), 4);
for (const auto &node : left.Nodes())
@@ -134,8 +134,8 @@ BOOST_AUTO_TEST_CASE(separate_left_right)
partition[0] = partition[4] = false;
const auto center = bisection_state.ApplyBisection(graph.Begin(), graph.End(), 0, partition);
GraphView left(graph, graph.Begin(), center);
GraphView right(graph, center, graph.End());
BisectionGraphView left(graph, graph.Begin(), center);
BisectionGraphView right(graph, center, graph.End());
BOOST_CHECK_EQUAL(left.NumberOfNodes(), 2);
std::vector<Coordinate> left_coordinates;
unit_tests/partition/dinic.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "partition/dinic_max_flow.hpp"
#include "partition/graph_generator.hpp"
#include "partition/graph_view.hpp"
#include "partition/bisection_graph_view.hpp"
#include "partition/recursive_bisection_state.hpp"
#include <algorithm>
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(horizontal_cut_between_two_grids)
}();
RecursiveBisectionState bisection_state(graph);
GraphView view(graph);
BisectionGraphView view(graph);
DinicMaxFlow::SourceSinkNodes sources, sinks;
unit_tests/partition/scc_integration.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
#include "partition/graph_generator.hpp"
#include "partition/graph_view.hpp"
#include "partition/bisection_graph_view.hpp"
#include "partition/recursive_bisection_state.hpp"
#include <algorithm>