Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/search
diff options
context:
space:
mode:
authorMaxim Pimenov <m@maps.me>2019-04-12 14:54:41 +0300
committerTatiana Yan <tatiana.kondakova@gmail.com>2019-04-15 16:47:25 +0300
commitb4e8f38c7c9b4e4c3dc2c9d413342d29d587889b (patch)
tree9fa9854c9c29eeb98e46a9fbb810eff932e679eb /search
parent375f664ca754ae24baf3fbb41dbf5cc5633e03f5 (diff)
[search] [assessment-tool] Minor fixes.
Diffstat (limited to 'search')
-rw-r--r--search/search_quality/assessment_tool/search_request_runner.cpp37
1 files changed, 20 insertions, 17 deletions
diff --git a/search/search_quality/assessment_tool/search_request_runner.cpp b/search/search_quality/assessment_tool/search_request_runner.cpp
index bba8b36ae9..a11956e93c 100644
--- a/search/search_quality/assessment_tool/search_request_runner.cpp
+++ b/search/search_quality/assessment_tool/search_request_runner.cpp
@@ -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);
+ vector<boost::optional<Edits::Relevance>> relevances;
+
+ 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_nonFoundResultsEdits.Reset(relevances);
- }
- context.m_initialized = true;
+ context.m_initialized = true;
+ }
if (background)
RunNextBackgroundRequest(timestamp);