procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve support template ordering.

This commit is contained in:
John Preston 2018-11-20 16:24:20 +04:00
parent 7e104805c0
commit 5c718c7c9a
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Telegram/SourceFiles/support/support_templates.cpp
View File

@ -657,7 +657,7 @@ auto Templates::matchFromEnd(QString query) const
for (const auto &key : question.normalizedKeys) { for (const auto &key : question.normalizedKeys) {
if (key.size() <= queries.size() if (key.size() <= queries.size()
&& queries[key.size() - 1] == key && queries[key.size() - 1] == key
&& (!result || result->key.size() < key.size())) { && (!result || result->key.size() <= key.size())) {
result = QuestionByKey{ question, key }; result = QuestionByKey{ question, key };
} }
} }
@ -688,7 +688,6 @@ auto Templates::query(const QString &text) const -> std::vector<Question> {
return _data.files.at(id.first).questions.at(id.second); return _data.files.at(id.first).questions.at(id.second);
}; };
using Pair = std::pair<Question, int>;
const auto computeWeight = [&](const Id &id) { const auto computeWeight = [&](const Id &id) {
auto result = 0; auto result = 0;
const auto full = _index.full.find(id); const auto full = _index.full.find(id);
@ -717,19 +716,31 @@ auto Templates::query(const QString &text) const -> std::vector<Question> {
} }
return result; return result;
}; };
using Pair = std::pair<Id, int>;
const auto pairById = [&](const Id &id) { const auto pairById = [&](const Id &id) {
return std::make_pair(questionById(id), computeWeight(id)); return std::make_pair(id, computeWeight(id));
};
const auto sorter = [](const Pair &a, const Pair &b) {
// weight DESC filename DESC question ASC
if (a.second > b.second) {
return true;
} else if (a.second < b.second) {
return false;
} else if (a.first.first > b.first.first) {
return true;
} else if (a.first.first < b.first.first) {
return false;
} else {
return (a.first.second < b.first.second);
}
}; };
const auto good = narrowed->second | ranges::view::transform( const auto good = narrowed->second | ranges::view::transform(
pairById pairById
) | ranges::view::filter([](const Pair &pair) { ) | ranges::view::filter([](const Pair &pair) {
return pair.second > 0; return pair.second > 0;
}) | ranges::to_vector | ranges::action::sort( }) | ranges::to_vector | ranges::action::stable_sort(sorter);
std::greater<>(), return good | ranges::view::transform([&](const Pair &pair) {
[](const Pair &pair) { return pair.second; } return questionById(pair.first);
);
return good | ranges::view::transform([](const Pair &pair) {
return pair.first;
}) | ranges::view::take(kQueryLimit) | ranges::to_vector; }) | ranges::view::take(kQueryLimit) | ranges::to_vector;
} }