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

[search] Fixed address results emitting (include partially matched).

Browse source
This commit is contained in:
vng 2014-03-25 15:51:35 +03:00 • committed by Alex Zolotarev
parent 9fbee7a876
commit 861926410e
3 changed files with 64 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
search/house_detector.cpp
View file

@ -961,11 +961,28 @@ public:
m_results[ind] = ScoredHouse(p.m_house, p.m_distance);
}
void FlushResults(vector<AddressSearchResult> & res, MergedStreet const & st) const
template <class TCont>
void FlushResults(TCont & cont) const
{
size_t const baseScore = 1 << (ARRAY_SIZE(m_results) - 2);
for (size_t i = 0; i < ARRAY_SIZE(m_results) - 1; ++i)
if (m_results[i].house)
res.push_back(AddressSearchResult(m_results[i].house, &st));
{
// Scores are: 4, 2, 1 according to the matching.
size_t const score = baseScore >> i;
size_t j = 0;
for (; j < cont.size(); ++j)
if (cont[j].first == m_results[i].house)
{
cont[j].second += score;
break;
}
if (j == cont.size())
cont.push_back(make_pair(m_results[i].house, score));
}
}
House const * GetBestMatchHouse() const
@ -973,11 +990,8 @@ public:
return m_results[0].house;
}
bool HasBestMatch() const { return (m_results[0].house != 0); }
House const * GetNearbyCandidate() const { return (HasBestMatch() ? 0 : m_results[3].house); }
};
void ProcessNearbyHouses(vector<HouseProjection const *> const & v, ResultAccumulator & acc)
@ -1086,12 +1100,11 @@ pair <int, int> GetBestHouseFromChains(vector<HouseChain> & houseChains, string
struct Competitiors
{
int m_candidateIndex;
int m_chainIndex;
double m_score;
Competitiors(int candidateIndex, int chainIndex, double score):
m_candidateIndex(candidateIndex), m_chainIndex(chainIndex), m_score(score)
Competitiors(int candidateIndex, int chainIndex, double score)
: m_candidateIndex(candidateIndex), m_chainIndex(chainIndex), m_score(score)
{}
bool operator<(Competitiors const & c) const
{
@ -1249,57 +1262,49 @@ void GetLSHouse(MergedStreet const & st, double offsetMeters, ResultAccumulator
ProcessNearbyHouses(v, acc);
}
}
void ProduceVoting(vector <ResultAccumulator> const & acc, vector<AddressSearchResult> & res, MergedStreet const & st)
struct GreaterSecond
{
vector < pair<House const *, vector<size_t> > > voting;
template <class T>
bool operator() (T const & t1, T const & t2) const { return t1.second > t2.second; }
};
void ProduceVoting(vector<ResultAccumulator> const & acc,
vector<AddressSearchResult> & res,
MergedStreet const & st)
{
buffer_vector<pair<House const *, size_t>, 4> voting;
// Calculate score for every house.
for (size_t i = 0; i < acc.size(); ++i)
if (acc[i].HasBestMatch())
{
size_t j = 0;
for (; j < voting.size(); ++j)
if (voting[j].first == acc[i].GetBestMatchHouse())
{
voting[j].second.push_back(i);
break;
}
if (j == voting.size())
voting.push_back(make_pair(acc[i].GetBestMatchHouse(), vector <size_t> (1, i)));
}
if (!voting.empty())
{
if (voting[0].second.size() > 1)
{
acc[voting[0].second.front()].FlushResults(res, st);
return;
}
if (voting.size() > 1 && voting[1].second.size() > 1)
{
acc[voting[1].second.front()].FlushResults(res, st);
return;
}
}
else
acc[i].FlushResults(voting);
if (voting.empty())
return;
for (size_t i = 0; i < acc.size(); ++i)
if (acc[i].HasBestMatch())
{
acc[i].FlushResults(res, st);
return;
}
acc[0].FlushResults(res, st);
// Sort according to the score (bigger is better).
sort(voting.begin(), voting.end(), GreaterSecond());
// Emit results with equal best score.
size_t const score = voting[0].second;
for (size_t i = 0; i < voting.size(); ++i)
{
if (score == voting[i].second)
res.push_back(AddressSearchResult(voting[i].first, &st));
else
break;
}
}
void HouseDetector::GetHouseForName(string const & houseNumber, vector<AddressSearchResult> &res)
}
void HouseDetector::GetHouseForName(string const & houseNumber, vector<AddressSearchResult> & res)
{
size_t const count = m_streets.size();
res.reserve(count);
LOG(LDEBUG, ("Streets count", count));
vector <ResultAccumulator> acc(3, ResultAccumulator(houseNumber));
vector<ResultAccumulator> acc(3, ResultAccumulator(houseNumber));
for (size_t i = 0; i < count; ++i)
{
@ -1333,6 +1338,7 @@ void HouseDetector::GetHouseForName(string const & houseNumber, vector<AddressSe
}
ProduceVoting(acc, res, m_streets[i]);
for (size_t j = 0; j < acc.size(); ++j)
acc[j].Reset();
}

23
search/house_detector.hpp
View file

@ -246,7 +246,7 @@ public:
static int const DEFAULT_OFFSET_M = 200;
void ReadAllHouses(double offsetMeters = DEFAULT_OFFSET_M);
void GetHouseForName(string const & houseNumber, vector<AddressSearchResult> &res);
void GetHouseForName(string const & houseNumber, vector<AddressSearchResult> & res);
void ClearCaches();
};
@ -256,20 +256,17 @@ struct AddressSearchResult
House const * m_house;
MergedStreet const * m_street;
AddressSearchResult(House const * house, MergedStreet const * street):m_house(house), m_street(street)
AddressSearchResult(House const * house, MergedStreet const * street)
: m_house(house), m_street(street)
{}
bool operator<(AddressSearchResult const & a) const
{
if (m_house == a.m_house)
return m_street < a.m_street;
return m_house < a.m_house;
}
bool operator==(AddressSearchResult const & a) const
{
return (m_house == a.m_house && m_street == a.m_street);
}
inline bool operator<(AddressSearchResult const & a) const { return m_house < a.m_house; }
inline bool operator==(AddressSearchResult const & a) const { return m_house == a.m_house; }
};
inline string DebugPrint(AddressSearchResult const & r)
{
return r.m_house->GetNumber() + ", " + r.m_street->GetName();
}
}

2
search/search_tests/house_detector_tests.cpp
View file

@ -262,7 +262,7 @@ m2::PointD FindHouse(Index & index, vector<string> const & streets,
vector<search::AddressSearchResult> houses;
houser.GetHouseForName(houseName, houses);
TEST_EQUAL(houses.size(), 1, ());
TEST_EQUAL(houses.size(), 1, (houses));
return houses[0].m_house->GetPosition();
}