Skip to content

Commit

Permalink
[routing] Remove unused parameter.
Browse files Browse the repository at this point in the history
  • Loading branch information
tatiana-yan authored and mesozoic-drones committed Apr 22, 2021
1 parent 4840203 commit 1100e03
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
9 changes: 4 additions & 5 deletions routing/index_router.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ RouterResultCode IndexRouter::CalculateSubrouteJointsMode(

RoutingResult<Vertex, Weight> routingResult;
RouterResultCode const result =
FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult, WorldGraphMode::Joints);
FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult);

if (result != RouterResultCode::NoError)
return result;
Expand All @@ -827,8 +827,7 @@ RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(

RoutingResult<Vertex, Weight> routingResult;
set<NumMwmId> const mwmIds = starter.GetMwms();
RouterResultCode const result =
FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult, WorldGraphMode::NoLeaps);
RouterResultCode const result = FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult);

if (result != RouterResultCode::NoError)
return result;
Expand Down Expand Up @@ -863,7 +862,7 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(

RoutingResult<Vertex, Weight> routingResult;
RouterResultCode const result =
FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult, WorldGraphMode::LeapsOnly);
FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult);

progress->PushAndDropLastSubProgress();

Expand Down Expand Up @@ -1351,7 +1350,7 @@ RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
nullptr /* prevRoute */, delegate.GetCancellable(), move(visitor),
AStarLengthChecker(starter));

resultCode = FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult, mode);
resultCode = FindPath<Vertex, Edge, Weight>(params, mwmIds, routingResult);
return resultCode;
};

Expand Down
5 changes: 2 additions & 3 deletions routing/index_router.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,8 @@ class IndexRouter : public IRouter
}

template <typename Vertex, typename Edge, typename Weight, typename AStarParams>
RouterResultCode FindPath(
AStarParams & params, std::set<NumMwmId> const & mwmIds,
RoutingResult<Vertex, Weight> & routingResult, WorldGraphMode mode) const
RouterResultCode FindPath(AStarParams & params, std::set<NumMwmId> const & mwmIds,
RoutingResult<Vertex, Weight> & routingResult) const
{
AStarAlgorithm<Vertex, Edge, Weight> algorithm;
return ConvertTransitResult(
Expand Down

0 comments on commit 1100e03

Please sign in to comment.