gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

git-clang-format

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-12-01 13:43:18 +03:00
parent c5c9eb5c06
commit 106a440c9e
12 changed files with 59 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/framework.cpp
View file

@ -356,8 +356,7 @@ Framework::Framework()
, m_isRenderingEnabled(true)
, m_trackingReporter(platform::CreateSocket(), TRACKING_REALTIME_HOST, TRACKING_REALTIME_PORT,
tracking::Reporter::kPushDelayMs)
, m_trafficManager(bind(&Framework::GetMwmsByRect, this, _1),
kMaxTrafficCacheSizeBytes,
, m_trafficManager(bind(&Framework::GetMwmsByRect, this, _1), kMaxTrafficCacheSizeBytes,
// Note. |m_routingSession| should be declared before |m_trafficManager|.
m_routingSession)
, m_displacementModeManager([this](bool show) {

3
map/traffic_manager.cpp
View file

@ -37,8 +37,7 @@ TrafficManager::CacheEntry::CacheEntry(time_point<steady_clock> const & requestT
, m_lastAvailability(traffic::TrafficInfo::Availability::Unknown)
{}
TrafficManager::TrafficManager(GetMwmsByRectFn const & getMwmsByRectFn,
size_t maxCacheSizeBytes,
TrafficManager::TrafficManager(GetMwmsByRectFn const & getMwmsByRectFn, size_t maxCacheSizeBytes,
traffic::RoutingObserver & routingObserver)
: m_getMwmsByRectFn(getMwmsByRectFn)
, m_routingObserver(routingObserver)

7
routing/edge_estimator.cpp
View file

@ -51,9 +51,12 @@ double CarEdgeEstimator::CalcEdgesWeight(uint32_t featureId, RoadGeometry const
double factor = 1.0;
if (m_trafficInfo)
{
SpeedGroup const speedGroup = m_trafficInfo->GetSpeedGroup(TrafficInfo::RoadSegmentId(featureId, i, dir));
SpeedGroup const speedGroup =
m_trafficInfo->GetSpeedGroup(TrafficInfo::RoadSegmentId(featureId, i, dir));
CHECK_LESS(speedGroup, SpeedGroup::Count, ());
double const percentage = 0.01 * static_cast<double>(kSpeedGroupThresholdPercentage[static_cast<size_t>(speedGroup)]);
double const percentage =
0.01 *
static_cast<double>(kSpeedGroupThresholdPercentage[static_cast<size_t>(speedGroup)]);
factor = 1.0 / percentage;
}
result += factor * TimeBetweenSec(road.GetPoint(i), road.GetPoint(i + 1), speedMPS);

4
routing/edge_estimator.hpp
View file

@ -17,8 +17,8 @@ class EdgeEstimator
public:
virtual ~EdgeEstimator() = default;
virtual double CalcEdgesWeight(uint32_t featureId, RoadGeometry const & road,
uint32_t pointFrom, uint32_t pointTo) const = 0;
virtual double CalcEdgesWeight(uint32_t featureId, RoadGeometry const & road, uint32_t pointFrom,
uint32_t pointTo) const = 0;
virtual double CalcHeuristic(m2::PointD const & from, m2::PointD const & to) const = 0;
void SetTrafficInfo(shared_ptr<traffic::TrafficInfo> trafficInfo);

4
routing/index_graph.cpp
View file

@ -72,8 +72,8 @@ void IndexGraph::GetNeighboringEdge(RoadGeometry const & road, RoadPoint const &
pair<Joint::Id, uint32_t> const & neighbor = m_roadIndex.FindNeighbor(rp, forward);
if (neighbor.first != Joint::kInvalidId)
{
double const distance = m_estimator->CalcEdgesWeight(rp.GetFeatureId(), road,
rp.GetPointId(), neighbor.second);
double const distance =
m_estimator->CalcEdgesWeight(rp.GetFeatureId(), road, rp.GetPointId(), neighbor.second);
edges.push_back({neighbor.first, distance});
}
}

8
routing/index_graph_starter.cpp
View file

@ -154,12 +154,12 @@ void IndexGraphStarter::FindPointsWithCommonFeature(Joint::Id jointId0, Joint::I
// CalcEdgesWeight is very expensive.
// So calculate it only if second common feature found.
RoadGeometry const & prevRoad = m_graph.GetGeometry().GetRoad(result0.GetFeatureId());
minWeight = m_graph.GetEstimator().CalcEdgesWeight(rp0.GetFeatureId(),prevRoad,
result0.GetPointId(), result1.GetPointId());
minWeight = m_graph.GetEstimator().CalcEdgesWeight(
rp0.GetFeatureId(), prevRoad, result0.GetPointId(), result1.GetPointId());
}
double const weight = m_graph.GetEstimator().CalcEdgesWeight(rp0.GetFeatureId(), road,
rp0.GetPointId(), rp1.GetPointId());
double const weight = m_graph.GetEstimator().CalcEdgesWeight(
rp0.GetFeatureId(), road, rp0.GetPointId(), rp1.GetPointId());
if (weight < minWeight)
{
minWeight = weight;

5
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -83,8 +83,8 @@ namespace integration
return infoGetter.GetRegionCountryId(pt);
};
auto carRouter = make_unique<CarRouter>(
index, countryFileGetter, SingleMwmRouter::CreateCarRouter(index, trafficGetter));
auto carRouter = make_unique<CarRouter>(index, countryFileGetter,
SingleMwmRouter::CreateCarRouter(index, trafficGetter));
return carRouter;
}
@ -112,7 +112,6 @@ namespace integration
}
IRouter * GetRouter() const override { return m_carRouter.get(); }
private:
TrafficInfoGetterTest m_trafficGetter;
unique_ptr<CarRouter> m_carRouter;

38
routing/routing_integration_tests/routing_test_tools.hpp
View file

@ -56,8 +56,7 @@ class IRouterComponents
{
public:
IRouterComponents(vector<LocalCountryFile> const & localFiles)
: m_featuresFetcher(CreateFeaturesFetcher(localFiles))
, m_infoGetter(CreateCountryInfoGetter())
: m_featuresFetcher(CreateFeaturesFetcher(localFiles)), m_infoGetter(CreateCountryInfoGetter())
{
}
@ -65,12 +64,8 @@ public:
virtual IRouter * GetRouter() const = 0;
storage::CountryInfoGetter const & GetCountryInfoGetter() const noexcept
{
return *m_infoGetter;
}
protected:
storage::CountryInfoGetter const & GetCountryInfoGetter() const noexcept { return *m_infoGetter; }
protected:
shared_ptr<model::FeaturesFetcher> m_featuresFetcher;
unique_ptr<storage::CountryInfoGetter> m_infoGetter;
};
@ -92,11 +87,13 @@ void TestOnlineFetcher(ms::LatLon const & startPoint, ms::LatLon const & finalPo
/// Gets OSRM router components
IRouterComponents & GetOsrmComponents();
shared_ptr<IRouterComponents> GetOsrmComponents(vector<platform::LocalCountryFile> const & localFiles);
shared_ptr<IRouterComponents> GetOsrmComponents(
vector<platform::LocalCountryFile> const & localFiles);
/// Gets pedestrian router components
IRouterComponents & GetPedestrianComponents();
shared_ptr<IRouterComponents> GetPedestrianComponents(vector<platform::LocalCountryFile> const & localFiles);
shared_ptr<IRouterComponents> GetPedestrianComponents(
vector<platform::LocalCountryFile> const & localFiles);
/// Gets bicycle router components.
IRouterComponents & GetBicycleComponents();
@ -114,10 +111,8 @@ void TestTurnCount(Route const & route, uint32_t expectedTurnCount);
/// A created route will pass the test iff
/// expectedRouteMeters - expectedRouteMeters * relativeError <= route->GetDistance()
/// && expectedRouteMeters + expectedRouteMeters * relativeError >= route->GetDistance()
void TestRouteLength(Route const & route, double expectedRouteMeters,
double relativeError = 0.01);
void TestRouteTime(Route const & route, double expectedRouteSeconds,
double relativeError = 0.01);
void TestRouteLength(Route const & route, double expectedRouteMeters, double relativeError = 0.01);
void TestRouteTime(Route const & route, double expectedRouteSeconds, double relativeError = 0.01);
void CalculateRouteAndTestRouteLength(IRouterComponents const & routerComponents,
m2::PointD const & startPoint,
@ -135,24 +130,21 @@ class TestTurn
bool const m_isValid;
TestTurn()
: m_point({0., 0.}),
m_direction(TurnDirection::NoTurn),
m_roundAboutExitNum(0),
m_isValid(false)
: m_point({0., 0.})
, m_direction(TurnDirection::NoTurn)
, m_roundAboutExitNum(0)
, m_isValid(false)
{
}
TestTurn(m2::PointD const & pnt, TurnDirection direction, uint32_t roundAboutExitNum)
: m_point(pnt),
m_direction(direction),
m_roundAboutExitNum(roundAboutExitNum),
m_isValid(true)
: m_point(pnt), m_direction(direction), m_roundAboutExitNum(roundAboutExitNum), m_isValid(true)
{
}
public:
const TestTurn & TestValid() const;
const TestTurn & TestNotValid() const;
const TestTurn & TestPoint(m2::PointD const & expectedPoint, double inaccuracyMeters = 3.) const;
const TestTurn & TestPoint(m2::PointD const & expectedPoint, double inaccuracyMeters = 3.) const;
const TestTurn & TestDirection(TurnDirection expectedDirection) const;
const TestTurn & TestOneOfDirections(set<TurnDirection> const & expectedDirections) const;
const TestTurn & TestRoundAboutExitNum(uint32_t expectedRoundAboutExitNum) const;

3
routing/routing_session.cpp
View file

@ -594,8 +594,7 @@ void RoutingSession::OnTrafficInfoAdded(TrafficInfo const & info)
UNUSED_VALUE(guard);
// @TODO(bykoianko) It's worth considering moving a big |info.GetColoring()|
// not copying as it's done now.
m_trafficInfo.insert(make_pair(info.GetMwmId(),
make_shared<TrafficInfo>(info)));
m_trafficInfo.insert(make_pair(info.GetMwmId(), make_shared<TrafficInfo>(info)));
}
void RoutingSession::OnTrafficInfoRemoved(MwmSet::MwmId const & mwmId)

41
routing/routing_tests/applying_traffic_test.cpp
View file

@ -68,8 +68,8 @@ AStarAlgorithm<IndexGraphStarter>::Result CalculateRoute(IndexGraphStarter & sta
{
AStarAlgorithm<IndexGraphStarter> algorithm;
RoutingResult<Joint::Id> routingResult;
auto const resultCode = algorithm.FindPath(
starter, starter.GetStartJoint(), starter.GetFinishJoint(), routingResult, {}, {});
auto const resultCode = algorithm.FindPath(starter, starter.GetStartJoint(),
starter.GetFinishJoint(), routingResult, {}, {});
starter.RedressRoute(routingResult.path, roadPoints);
return resultCode;
@ -135,15 +135,15 @@ unique_ptr<IndexGraph> BuildXXGraph(shared_ptr<EdgeEstimator> estimator)
RoadGeometry::Points({{3.0, 0.0}, {3.0, 1.0}}));
vector<Joint> const joints = {
MakeJoint({{0 /* feature id */, 0 /* point id */}}), /* joint at point (0, 0) */
MakeJoint({{1, 0}, {7, 0}}), /* joint at point (2, 0) */
MakeJoint({{0, 1}, {1, 1}, {2, 0}, {3, 0}}), /* joint at point (1, 1) */
MakeJoint({{2, 1}}), /* joint at point (0, 2) */
MakeJoint({{3, 1}, {4, 1}, {5, 0}, {6, 0}}), /* joint at point (2, 2) */
MakeJoint({{4, 0}, {8, 1}}), /* joint at point (3, 1) */
MakeJoint({{5, 1}}), /* joint at point (1, 3) */
MakeJoint({{6, 1}}), /* joint at point (3, 3) */
MakeJoint({{7, 1}, {8, 0}}), /* joint at point (3, 0) */
MakeJoint({{0 /* feature id */, 0 /* point id */}}), /* joint at point (0, 0) */
MakeJoint({{1, 0}, {7, 0}}), /* joint at point (2, 0) */
MakeJoint({{0, 1}, {1, 1}, {2, 0}, {3, 0}}), /* joint at point (1, 1) */
MakeJoint({{2, 1}}), /* joint at point (0, 2) */
MakeJoint({{3, 1}, {4, 1}, {5, 0}, {6, 0}}), /* joint at point (2, 2) */
MakeJoint({{4, 0}, {8, 1}}), /* joint at point (3, 1) */
MakeJoint({{5, 1}}), /* joint at point (1, 3) */
MakeJoint({{6, 1}}), /* joint at point (3, 3) */
MakeJoint({{7, 1}, {8, 0}}), /* joint at point (3, 0) */
};
unique_ptr<IndexGraph> graph = make_unique<IndexGraph>(move(loader), estimator);
@ -170,8 +170,9 @@ UNIT_TEST(XXGraph_G0onF3)
classificator::Load();
shared_ptr<EdgeEstimator> estimator =
EdgeEstimator::CreateForCar(*make_shared<CarModelFactory>()->GetVehicleModel());
TrafficInfo::Coloring coloring =
{{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0}};
TrafficInfo::Coloring coloring = {
{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
SpeedGroup::G0}};
shared_ptr<TrafficInfo> trafficInfo = make_shared<TrafficInfo>();
trafficInfo->SetColoringForTesting(coloring);
estimator->SetTrafficInfo(trafficInfo);
@ -187,11 +188,15 @@ UNIT_TEST(XXGraph_G0onF3andF6andG4onF8andF4)
{
shared_ptr<EdgeEstimator> estimator =
EdgeEstimator::CreateForCar(*make_shared<CarModelFactory>()->GetVehicleModel());
TrafficInfo::Coloring coloring =
{{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0},
{{6 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0},
{{8 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G4},
{{7 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G4}};
TrafficInfo::Coloring coloring = {
{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
SpeedGroup::G0},
{{6 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
SpeedGroup::G0},
{{8 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
SpeedGroup::G4},
{{7 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
SpeedGroup::G4}};
shared_ptr<TrafficInfo> trafficInfo = make_shared<TrafficInfo>();
trafficInfo->SetColoringForTesting(coloring);
estimator->SetTrafficInfo(trafficInfo);

4
routing/single_mwm_router.cpp
View file

@ -214,8 +214,8 @@ bool SingleMwmRouter::LoadIndex(MwmSet::MwmId const & mwmId, string const & coun
}
// static
unique_ptr<SingleMwmRouter> SingleMwmRouter::CreateCarRouter(Index const & index,
traffic::TrafficInfoGetter const & getter)
unique_ptr<SingleMwmRouter> SingleMwmRouter::CreateCarRouter(
Index const & index, traffic::TrafficInfoGetter const & getter)
{
auto vehicleModelFactory = make_shared<CarModelFactory>();
// @TODO Bicycle turn generation engine is used now. It's ok for the time being.

3
traffic/traffic_info.hpp
View file

@ -69,7 +69,6 @@ public:
TrafficInfo(MwmSet::MwmId const & mwmId, int64_t currentDataVersion);
void SetColoringForTesting(Coloring & coloring) { m_coloring = coloring; }
// Fetches the latest traffic data from the server and updates the coloring.
// Construct the url by passing an MwmId.
// *NOTE* This method must not be called on the UI thread.
@ -109,6 +108,6 @@ class TrafficInfoGetter
public:
virtual ~TrafficInfoGetter() = default;
virtual shared_ptr<traffic::TrafficInfo>GetTrafficInfo(MwmSet::MwmId const & mwmId) const = 0;
virtual shared_ptr<traffic::TrafficInfo> GetTrafficInfo(MwmSet::MwmId const & mwmId) const = 0;
};
} // namespace traffic