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

clang-format codestyle fixes

Browse source
This commit is contained in:
Lev Dragunov 2015-03-23 14:58:27 +03:00 • committed by Alex Zolotarev
parent a0b9255925
commit 744796975c
9 changed files with 54 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
generator/routing_generator.cpp
View file

@ -314,7 +314,8 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
auto out = crossContext.GetOutgoingIterators();
MultiroutingTaskPointT sources(distance(in.first, in.second)), targets(distance(out.first, out.second));
size_t index = 0;
// Fill sources and targets with forward search task for ingoing (true) and backward search task (false) for outgoing nodes
// Fill sources and targets with start node task for ingoing (true) and target node task
// (false) for outgoing nodes
for (auto i = in.first; i != in.second; ++i, ++index)
{
OsrmRouter::GenerateRoutingTaskFromNodeId(i->m_nodeId, true, sources[index]);

2
indexer/features_offsets_table.cpp
View file

@ -13,7 +13,7 @@
namespace feature
{
void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
{
ASSERT(m_offsets.empty() || m_offsets.back() < offset, ());
m_offsets.push_back(offset);

15
indexer/features_offsets_table.hpp
View file

@ -30,10 +30,7 @@ namespace feature
void PushOffset(uint32_t offset);
/// \return number of already accumulated offsets
inline size_t size() const
{
return m_offsets.size();
}
inline size_t size() const { return m_offsets.size(); }
private:
friend class FeaturesOffsetsTable;
@ -90,18 +87,12 @@ namespace feature
size_t GetFeatureIndexbyOffset(uint32_t offset) const;
/// \return number of features offsets in a table.
inline size_t size() const
{
return static_cast<size_t>(m_table.num_ones());
}
inline size_t size() const { return static_cast<size_t>(m_table.num_ones()); }
/// \return byte size of a table, may be slightly different from a
/// real byte size in memory or on disk due to alignment, but
/// can be used in benchmarks, logging, etc.
inline size_t byte_size()
{
return succinct::mapper::size_of(m_table);
}
inline size_t byte_size() { return succinct::mapper::size_of(m_table); }
private:
FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder);

6
routing/osrm2feature_map.cpp
View file

@ -21,7 +21,6 @@
namespace routing
{
TOsrmNodeId const INVALID_NODE_ID = numeric_limits<TOsrmNodeId>::max();
OsrmMappingTypes::FtSeg::FtSeg(uint32_t fid, uint32_t ps, uint32_t pe)
@ -368,7 +367,8 @@ bool OsrmFtSegBackwardIndex::Load(string const & nodesFileName, string const & b
return true;
}
void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_t maxNodeId, FilesMappingContainer & routingFile)
void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_t maxNodeId,
FilesMappingContainer & routingFile)
{
Clear();
@ -403,7 +403,7 @@ void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, const uint32_
{
OsrmMappingTypes::FtSeg seg;
mapping.GetSegmentByIndex(indexes.first, seg);
temporaryBackwardIndex[seg.m_fid].push_back(i);;
temporaryBackwardIndex[seg.m_fid].push_back(i);
}
}

5
routing/osrm2feature_map.hpp
View file

@ -35,7 +35,7 @@ namespace OsrmMappingTypes {
uint16_t m_pointStart;
uint16_t m_pointEnd;
static const uint32_t INVALID_FID = numeric_limits<uint32_t>::max();
static constexpr uint32_t INVALID_FID = numeric_limits<uint32_t>::max();
// No need to initialize something her (for vector<FtSeg>).
FtSeg() {}
@ -109,7 +109,8 @@ class OsrmFtSegBackwardIndex
bool Load(string const & nodesFileName, string const & bitsFileName);
public:
void Construct(OsrmFtSegMapping & mapping, uint32_t const maxNodeId, FilesMappingContainer & routingFile);
void Construct(OsrmFtSegMapping & mapping, uint32_t const maxNodeId,
FilesMappingContainer & routingFile);
TNodesList const & GetNodeIdByFid(uint32_t const fid) const;

54
routing/osrm_router.cpp
View file

@ -343,11 +343,6 @@ public:
} // namespace
bool IsValidEdgeWeight(EdgeWeight const & w)
{
return w < INVALID_EDGE_WEIGHT;
}
RoutingMappingPtrT RoutingIndexManager::GetMappingByPoint(m2::PointD const & point, Index const * pIndex)
{
return GetMappingByName(m_countryFn(point), pIndex);
@ -498,6 +493,8 @@ bool IsRouteExist(RawRouteData const & r)
r.source_traversed_in_reverse.empty());
}
bool IsValidEdgeWeight(EdgeWeight const & w) { return w != INVALID_EDGE_WEIGHT; }
}
void OsrmRouter::FindWeightsMatrix(MultiroutingTaskPointT const & sources, MultiroutingTaskPointT const & targets,
@ -565,7 +562,8 @@ bool OsrmRouter::FindSingleRoute(FeatureGraphNodeVecT const & source, FeatureGra
return false;
}
void OsrmRouter::GenerateRoutingTaskFromNodeId(NodeID const nodeId, bool const isStartNode, FeatureGraphNode & taskNode)
void OsrmRouter::GenerateRoutingTaskFromNodeId(NodeID const nodeId, bool const isStartNode,
FeatureGraphNode & taskNode)
{
taskNode.m_node.forward_node_id = isStartNode ? nodeId : INVALID_NODE_ID;
taskNode.m_node.reverse_node_id = isStartNode ? INVALID_NODE_ID : nodeId;
@ -600,6 +598,7 @@ OsrmRouter::ResultCode OsrmRouter::MakeRouteFromCrossesPath(CheckedPathT const &
for (RoutePathCross const & cross: path)
{
RawRoutingResultT routingResult;
// TODO (Dragunov) refactor whole routing to single OSRM node in task instead vector.
FeatureGraphNodeVecT startTask(1), targetTask(1);
startTask[0] = cross.startNode;
@ -682,14 +681,14 @@ public:
size_t index = 0;
for (auto i = income_iterators.first; i < income_iterators.second; ++i, ++index)
OsrmRouter::GenerateRoutingTaskFromNodeId(i->m_nodeId, true /*start node*/, m_sources[index]);
OsrmRouter::GenerateRoutingTaskFromNodeId(i->m_nodeId, true /*isStartNode*/, m_sources[index]);
vector<EdgeWeight> weights;
for (auto const & t : targetTask)
{
targets[0] = t;
OsrmRouter::FindWeightsMatrix(m_sources, targets, mapping->m_dataFacade, weights);
if (find_if(weights.begin(), weights.end(), IsValidEdgeWeight) != weights.end())
if (find_if(weights.begin(), weights.end(), &IsValidEdgeWeight) != weights.end())
{
ASSERT_EQUAL(weights.size(), m_sources.size(), ());
m_target = t;
@ -707,9 +706,9 @@ public:
bool MakeLastCrossSegment(size_t const incomeNodeId, OsrmRouter::RoutePathCross & outCrossTask)
{
auto const ingoing = m_targetContext.GetIngoingIterators();
auto it = find_if(ingoing.first, ingoing.second, [&incomeNodeId](IngoingCrossNode const & node)
{
return node.m_nodeId == incomeNodeId;
auto const it = find_if(ingoing.first, ingoing.second, [&incomeNodeId](IngoingCrossNode const & node)
{
return node.m_nodeId == incomeNodeId;
});
ASSERT(it != ingoing.second, ());
size_t const targetNumber = distance(ingoing.first, it);
@ -791,7 +790,10 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
if (startMapping->GetName() == targetMapping->GetName())
{
LOG(LINFO, ("Single mwm routing case"));
m_indexManager.ForEachMapping([](pair<string, RoutingMappingPtrT> const & indexPair){indexPair.second->FreeCrossContext();});
m_indexManager.ForEachMapping([](pair<string, RoutingMappingPtrT> const & indexPair)
{
indexPair.second->FreeCrossContext();
});
if (!FindSingleRoute(startTask, m_CachedTargetTask, startMapping->m_dataFacade, routingResult))
{
return RouteNotFound;
@ -866,14 +868,14 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
size_t index = 0;
for (auto j = mwmOutsIter.first; j < mwmOutsIter.second; ++j, ++index)
OsrmRouter::GenerateRoutingTaskFromNodeId(j->m_nodeId, false /*end node*/, targets[index]);
OsrmRouter::GenerateRoutingTaskFromNodeId(j->m_nodeId, false /*isStartNode*/, targets[index]);
vector<EdgeWeight> weights;
for (auto const & t : startTask)
{
sources[0] = t;
LOG(LINFO, ("Start case"));
FindWeightsMatrix(sources, targets, startMapping->m_dataFacade, weights);
if (find_if(weights.begin(), weights.end(), IsValidEdgeWeight) != weights.end())
if (find_if(weights.begin(), weights.end(), &IsValidEdgeWeight) != weights.end())
break;
weights.clear();
}
@ -906,15 +908,16 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
continue;
if (m_requestCancel)
return Cancelled;
string const & nextMwm = startMapping->m_crossContext.getOutgoingMwmName((mwmOutsIter.first+j)->m_outgoingIndex);
string const & nextMwm =
startMapping->m_crossContext.getOutgoingMwmName((mwmOutsIter.first + j)->m_outgoingIndex);
RoutingMappingPtrT nextMapping;
nextMapping = m_indexManager.GetMappingByName(nextMwm, m_pIndex);
// If we don't this routing file, we skip this path
if (!nextMapping->IsValid())
continue;
nextMapping->LoadCrossContext();
size_t tNodeId = (mwmOutsIter.first+j)->m_nodeId;
size_t nextNodeId = FindNextMwmNode(*(mwmOutsIter.first+j), nextMapping);
size_t tNodeId = (mwmOutsIter.first + j)->m_nodeId;
size_t nextNodeId = FindNextMwmNode(*(mwmOutsIter.first + j), nextMapping);
if (nextNodeId == INVALID_NODE_ID)
continue;
checkedOuts.insert(make_pair(tNodeId, startMapping->GetName()));
@ -924,7 +927,7 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
if (nextMwm != targetMapping->GetName())
{
FeatureGraphNode tmpNode;
OsrmRouter::GenerateRoutingTaskFromNodeId(nextNodeId, true /*temporary node*/, tmpNode);
OsrmRouter::GenerateRoutingTaskFromNodeId(nextNodeId, true /*isStartNode*/, tmpNode);
tmpPath.push_back({nextMapping->GetName(), tmpNode, tmpNode, 0});
crossTasks.push(tmpPath);
}
@ -1005,15 +1008,17 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
continue;
CheckedPathT tmpPath(topTask);
FeatureGraphNode startNode, stopNode;
OsrmRouter::GenerateRoutingTaskFromNodeId(iit->m_nodeId, true /*start node*/, startNode);
OsrmRouter::GenerateRoutingTaskFromNodeId(tNodeId, false /*end node*/, stopNode);
OsrmRouter::GenerateRoutingTaskFromNodeId(iit->m_nodeId, true /*isStartNode*/,
startNode);
OsrmRouter::GenerateRoutingTaskFromNodeId(tNodeId, false /*isStartNode*/, stopNode);
tmpPath.back() = {currentMapping->GetName(), startNode, stopNode, outWeight};
if (nextMwm != targetMapping->GetName())
{
FeatureGraphNode tmpNode;
OsrmRouter::GenerateRoutingTaskFromNodeId(nextNodeId, true /*temporary node*/, tmpNode);
OsrmRouter::GenerateRoutingTaskFromNodeId(nextNodeId, true /*isStartNode*/,
tmpNode);
tmpPath.push_back({nextMapping->GetName(), tmpNode, tmpNode, 0});
crossTasks.emplace(tmpPath);
crossTasks.emplace(move(tmpPath));
}
else
{
@ -1043,7 +1048,10 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRouteImpl(m2::PointD const & startPt
if (finalWeight < INVALID_EDGE_WEIGHT)
{
// Manually free all cross context allocations before geometry unpacking
m_indexManager.ForEachMapping([](pair<string, RoutingMappingPtrT> const & indexPair){indexPair.second->FreeCrossContext();});
m_indexManager.ForEachMapping([](pair<string, RoutingMappingPtrT> const & indexPair)
{
indexPair.second->FreeCrossContext();
});
auto code = MakeRouteFromCrossesPath(finalPath, route);
LOG(LINFO, ("Make final route", timer.ElapsedNano()));
timer.Reset();

5
routing/osrm_router.hpp
View file

@ -74,7 +74,7 @@ public:
RoutingMappingPtrT GetMappingByPoint(m2::PointD const & point, Index const * pIndex);
RoutingMappingPtrT GetMappingByName(string const & fName, Index const * pIndex);
template <class TFunctor>
void ForEachMapping(TFunctor toDo)
{
@ -141,7 +141,8 @@ public:
* \param isStartNode true if this node will first in the path
* \param taskNode output point task for router
*/
static void GenerateRoutingTaskFromNodeId(const NodeID nodeId, bool const isStartNode, FeatureGraphNode & taskNode);
static void GenerateRoutingTaskFromNodeId(const NodeID nodeId, bool const isStartNode,
FeatureGraphNode & taskNode);
void ActivateAdditionalFeatures() {m_additionalFeatures = true;}

9
routing/routing_mapping.cpp
View file

@ -14,10 +14,13 @@
namespace routing
{
RoutingMapping::RoutingMapping(string const & fName, Index const * pIndex)
: m_mapCounter(0), m_facadeCounter(0), m_crossContextLoaded(0), m_baseName(fName),
m_isValid(true), m_error(IRouter::ResultCode::NoError)
: m_mapCounter(0),
m_facadeCounter(0),
m_crossContextLoaded(0),
m_baseName(fName),
m_isValid(true),
m_error(IRouter::ResultCode::NoError)
{
Platform & pl = GetPlatform();
string const mwmName = m_baseName + DATA_FILE_EXTENSION;

4
routing/routing_mapping.h
View file

@ -41,9 +41,9 @@ struct RoutingMapping
IRouter::ResultCode GetError() const {return m_error;}
string const & GetName() const {return m_baseName;}
string const & GetName() const { return m_baseName; }
Index::MwmId const & GetMwmId() const {return m_mwmId;}
Index::MwmId const & GetMwmId() const { return m_mwmId; }
private:
size_t m_mapCounter;