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

[search] Fix interjector logic.

Browse source
This commit is contained in:
Yury Melnichek 2012-02-07 11:35:28 +01:00 • committed by Alex Zolotarev
parent f541b83d13
commit 0fe193a38d
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
search/feature_offset_match.hpp
View file

@ -124,25 +124,31 @@ template <class FilterT> struct OffsetIntersecter
typedef unordered_set<uint32_t> SetType;
FilterT const & m_filter;
SetType m_prevSet;
SetType m_set;
scoped_ptr<SetType> m_prevSet;
scoped_ptr<SetType> m_set;
bool m_bFirstStep;
explicit OffsetIntersecter(FilterT const & filter)
: m_filter(filter), m_bFirstStep(true) {}
: m_filter(filter), m_bFirstStep(true), m_set(new SetType()) {}
void operator() (uint32_t offset)
{
if (m_prevSet && !m_prevSet->count(offset))
return;
if (!m_filter(offset))
return;
m_set.insert(offset);
m_set->insert(offset);
}
void NextStep()
{
if (!m_prevSet)
m_prevSet.reset(new SetType());
m_prevSet.swap(m_set);
m_set.clear();
m_set->clear();
m_bFirstStep = false;
}
};
@ -178,7 +184,7 @@ void MatchFeaturesInTrie(vector<vector<strings::UniString> > const & tokens,
}
typedef typename impl::OffsetIntersecter<FilterT>::SetType::const_iterator IT;
for (IT it = intersecter.m_prevSet.begin(); it != intersecter.m_prevSet.end(); ++it)
for (IT it = intersecter.m_prevSet->begin(); it != intersecter.m_prevSet->end(); ++it)
toDo(*it);
}