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

[routing] Add final point candidates cache in routing algorithm

Browse source
This commit is contained in:
Denis Koronchik 2014-10-02 16:10:22 +03:00 • committed by Alex Zolotarev
parent 35a76a8ea4
commit 7ab2f762c4
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
routing/osrm2feature_map.cpp
View file

@ -148,8 +148,9 @@ void OsrmFtSegMapping::DumpSegmentByNode(OsrmNodeIdT nodeId) const
void OsrmFtSegMapping::GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res) const
{
auto addResFn = [&res](uint64_t seg, OsrmNodeIdT nodeId, bool forward)
auto addResFn = [&](uint64_t seg, size_t idx, bool forward)
{
OsrmNodeIdT const nodeId = GetNodeId(idx);
auto it = res.insert({ seg, { forward ? nodeId : INVALID_NODE_ID,
forward ? INVALID_NODE_ID : nodeId } });
if (it.second)
@ -185,7 +186,7 @@ void OsrmFtSegMapping::GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res) cons
{
if (seg.m_pointStart >= s.m_pointStart && seg.m_pointEnd <= s.m_pointEnd)
{
if (addResFn(seg.Store(), GetNodeId(i), true))
if (addResFn(seg.Store(), i, true))
{
segments.erase(it);
break;
@ -196,7 +197,7 @@ void OsrmFtSegMapping::GetOsrmNodes(FtSegSetT & segments, OsrmNodesT & res) cons
{
if (seg.m_pointStart >= s.m_pointEnd && seg.m_pointEnd <= s.m_pointStart)
{
if (addResFn(seg.Store(), GetNodeId(i), false))
if (addResFn(seg.Store(), i, false))
{
segments.erase(it);
break;

31
routing/osrm_router.cpp
View file

@ -99,17 +99,19 @@ public:
m_candidates[m_ptIdx].push_back(res);
}
void MakeResult(OsrmRouter::FeatureGraphNodeVecT & res, size_t maxCount, uint32_t & mwmId)
void MakeResult(OsrmRouter::FeatureGraphNodeVecT & res, size_t maxCount, uint32_t & mwmId, bool needFinal)
{
mwmId = m_mwmId;
if (mwmId == numeric_limits<uint32_t>::max())
return;
vector<OsrmFtSegMapping::FtSeg> segments;
segments.resize(maxCount * 2);
size_t const processPtCount = needFinal ? 2 : 1;
segments.resize(maxCount * processPtCount);
OsrmFtSegMapping::FtSegSetT segmentSet;
for (size_t i = 0; i < 2; ++i)
for (size_t i = 0; i < processPtCount; ++i)
{
sort(m_candidates[i].begin(), m_candidates[i].end(), [] (Candidate const & r1, Candidate const & r2)
{
@ -136,11 +138,14 @@ public:
res.clear();
res.resize(maxCount * 2);
for (size_t i = 0; i < 2; ++i)
for (size_t i = 0; i < processPtCount; ++i)
for (size_t j = 0; j < maxCount; ++j)
{
size_t const idx = i * maxCount + j;
if (!segments[idx].IsValid())
continue;
auto it = nodes.find(segments[idx].Store());
if (it != nodes.end())
{
@ -171,6 +176,7 @@ string OsrmRouter::GetName() const
void OsrmRouter::SetFinalPoint(m2::PointD const & finalPt)
{
m_finalPt = finalPt;
m_cachedFinalNodes.clear();
}
void OsrmRouter::CalculateRoute(m2::PointD const & startingPt, ReadyCallback const & callback)
@ -394,11 +400,20 @@ IRouter::ResultCode OsrmRouter::FindPhantomNodes(string const & fPath, m2::Point
if (!getter.HasCandidates(0))
return StartPointNotFound;
processPt(finalPt, 1);
if (!getter.HasCandidates(1))
return EndPointNotFound;
bool const hasFinalCache = !m_cachedFinalNodes.empty();
if (!hasFinalCache)
{
processPt(finalPt, 1);
if (!getter.HasCandidates(1))
return EndPointNotFound;
}
getter.MakeResult(res, maxCount, mwmId, !hasFinalCache);
if (hasFinalCache)
copy(m_cachedFinalNodes.begin(), m_cachedFinalNodes.end(), res.begin() + maxCount);
else
m_cachedFinalNodes.assign(res.begin() + maxCount, res.end());
getter.MakeResult(res, maxCount, mwmId);
return NoError;
}

2
routing/osrm_router.hpp
View file

@ -55,6 +55,8 @@ private:
OsrmFtSegMapping m_mapping;
FilesMappingContainer m_container;
FeatureGraphNodeVecT m_cachedFinalNodes;
};
}