diff options
| author | Maxim Pimenov <m@maps.me> | 2015-04-17 17:35:12 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:47:07 +0300 |
| commit | 651d788c1f1fa9e28fd697b1e1b35b964d9e9233 (patch) | |
| tree | cc983ce72335f6def9bde77da58b52e3a3189f4e /routing/routing_tests/astar_router_test.cpp | |
| parent | 29e003b1e5ab07371376ab448213040727936d1d (diff) | |
[pedestrian] Dispose of M2M in favour of P2P.
Diffstat (limited to 'routing/routing_tests/astar_router_test.cpp')
| -rw-r--r-- | routing/routing_tests/astar_router_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/routing/routing_tests/astar_router_test.cpp b/routing/routing_tests/astar_router_test.cpp index 3a5bc7fb09..7459bd1684 100644 --- a/routing/routing_tests/astar_router_test.cpp +++ b/routing/routing_tests/astar_router_test.cpp @@ -15,7 +15,7 @@ using namespace routing; using namespace routing_test; -void TestAStarRouterMock(vector<RoadPos> const & startPos, vector<RoadPos> const & finalPos, +void TestAStarRouterMock(RoadPos const & startPos, RoadPos const & finalPos, m2::PolylineD const & expected) { AStarRouter router; @@ -25,7 +25,7 @@ void TestAStarRouterMock(vector<RoadPos> const & startPos, vector<RoadPos> const router.SetRoadGraph(move(graph)); } vector<RoadPos> result; - TEST_EQUAL(IRouter::NoError, router.CalculateRouteM2M(startPos, finalPos, result), ()); + TEST_EQUAL(IRouter::NoError, router.CalculateRouteP2P(startPos, finalPos, result), ()); Route route(router.GetName()); router.GetGraph()->ReconstructPath(result, route); @@ -36,8 +36,8 @@ UNIT_TEST(AStarRouter_Graph2_Simple1) { classificator::Load(); - vector<RoadPos> startPos = {RoadPos(1, true /* forward */, 0, m2::PointD(0, 0))}; - vector<RoadPos> finalPos = {RoadPos(7, true /* forward */, 0, m2::PointD(80, 55))}; + RoadPos startPos(1, true /* forward */, 0, m2::PointD(0, 0)); + RoadPos finalPos(7, true /* forward */, 0, m2::PointD(80, 55)); m2::PolylineD expected = {m2::PointD(0, 0), m2::PointD(5, 10), m2::PointD(5, 40), m2::PointD(18, 55), m2::PointD(39, 55), m2::PointD(80, 55)}; @@ -46,8 +46,8 @@ UNIT_TEST(AStarRouter_Graph2_Simple1) UNIT_TEST(AStarRouter_Graph2_Simple2) { - vector<RoadPos> startPos = {RoadPos(7, false /* forward */, 0, m2::PointD(80, 55))}; - vector<RoadPos> finalPos = {RoadPos(0, true /* forward */, 4, m2::PointD(80, 0))}; + RoadPos startPos(7, false /* forward */, 0, m2::PointD(80, 55)); + RoadPos finalPos(0, true /* forward */, 4, m2::PointD(80, 0)); m2::PolylineD expected = {m2::PointD(80, 55), m2::PointD(39, 55), m2::PointD(37, 30), m2::PointD(70, 30), m2::PointD(70, 10), m2::PointD(70, 0), m2::PointD(80, 0)}; |