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

[search] [assessment-tool] Minor fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2019-04-12 14:54:41 +03:00 • committed by Tatiana Yan
parent 375f664ca7
commit b4e8f38c7c
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
search/search_quality/assessment_tool/search_request_runner.cpp
View file

@ -136,29 +136,32 @@ void SearchRequestRunner::RunRequest(size_t index, bool background, size_t times
m_updateSampleSearchState(index);
}
if (results.IsEndedNormal() && !context.m_initialized)
if (results.IsEndedNormal())
{
context.m_foundResultsEdits.Reset(relevances);
context.m_goldenMatching = goldenMatching;
context.m_actualMatching = actualMatching;
if (!context.m_initialized)
{
vector<boost::optional<Edits::Relevance>> relevances;
context.m_foundResultsEdits.Reset(relevances);
context.m_goldenMatching = goldenMatching;
context.m_actualMatching = actualMatching;
auto & nonFound = context.m_nonFoundResults;
CHECK(nonFound.empty(), ());
for (size_t i = 0; i < context.m_goldenMatching.size(); ++i)
{
auto const j = context.m_goldenMatching[i];
if (j != search::Matcher::kInvalidId)
continue;
nonFound.push_back(context.m_sample.m_results[i]);
relevances.emplace_back(nonFound.back().m_relevance);
}
context.m_nonFoundResultsEdits.Reset(relevances);
}
vector<boost::optional<Edits::Relevance>> relevances;
context.m_initialized = true;
auto & nonFound = context.m_nonFoundResults;
CHECK(nonFound.empty(), ());
for (size_t i = 0; i < context.m_goldenMatching.size(); ++i)
{
auto const j = context.m_goldenMatching[i];
if (j != search::Matcher::kInvalidId)
continue;
nonFound.push_back(context.m_sample.m_results[i]);
relevances.emplace_back(nonFound.back().m_relevance);
}
context.m_nonFoundResultsEdits.Reset(relevances);
}
context.m_initialized = true;
}
if (background)
RunNextBackgroundRequest(timestamp);