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

[search] Optimize searching in a trie.

Browse source
This commit is contained in:
Yury Melnichek 2011-08-27 17:31:16 +02:00 • committed by Alex Zolotarev
parent 02da2aec66
commit 16786ddac0
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
search/search_trie_matching.cpp
View file

@ -71,16 +71,24 @@ void search::MatchAgainstTrie(search::impl::Query & query, search::TrieIterator
size_t const featuresToMatch = 10;
while (!trieQueue.empty() &&
(featureQueue.size() < featuresToMatch ||
trieQueue.top().first >= featureQueue.top().first))
trieQueue.top().first > featureQueue.top().first))
{
scoped_ptr<search::TrieIterator> pIter(trieQueue.top().second);
trieQueue.pop();
for (size_t i = 0; i < pIter->m_value.size(); ++i)
featureQueue.push(make_pair(pIter->m_value[i].m_rank, pIter->m_value[i].m_featureId));
while (featureQueue.size() > featuresToMatch)
featureQueue.pop();
{
if (featureQueue.size() < featuresToMatch)
featureQueue.push(make_pair(pIter->m_value[i].m_rank, pIter->m_value[i].m_featureId));
else if (pIter->m_value[i].m_rank > featureQueue.top().first)
{
featureQueue.push(make_pair(pIter->m_value[i].m_rank, pIter->m_value[i].m_featureId));
featureQueue.pop();
}
}
for (size_t i = 0; i < pIter->m_edge.size(); ++i)
trieQueue.push(make_pair(pIter->m_edge[i].m_value, pIter->GoToEdge(i)));
if (featureQueue.size() < featuresToMatch ||
pIter->m_edge[i].m_value > featureQueue.top().first)
trieQueue.push(make_pair(pIter->m_edge[i].m_value, pIter->GoToEdge(i)));
}
while (!featureQueue.empty())
{