mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-20 13:53:07 +00:00
Code Issues Releases Wiki Activity

Change type of search weight from double to size_t, and revise sorting logic

Browse source
This commit is contained in:
ddbb07 2025-11-17 21:12:53 +01:00
parent 336a9e7da1
commit 63166aaa10
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/openmw/mwgui/settingswindow.cpp
View file

@ -951,16 +951,16 @@ namespace MWGui
std::istringstream stringStream(inputString); std::istringstream stringStream(inputString);
return { std::istream_iterator<std::string>(stringStream), std::istream_iterator<std::string>() }; return { std::istream_iterator<std::string>(stringStream), std::istream_iterator<std::string>() };
} }
double weightedSearch(std::string corpus, const std::vector<std::string>& patternArray) size_t weightedSearch(std::string corpus, const std::vector<std::string>& patternArray)
{ {
if (patternArray.empty()) if (patternArray.empty())
return 1.0; return 1;
Misc::StringUtils::lowerCaseInPlace(corpus); Misc::StringUtils::lowerCaseInPlace(corpus);
double numberOfMatches = 0.0; size_t numberOfMatches = 0;
for (const std::string& word : patternArray) for (const std::string& word : patternArray)
numberOfMatches += corpus.find(word) != std::string::npos ? 1.0 : 0.0; numberOfMatches += corpus.find(word) != std::string::npos ? 1 : 0;
return numberOfMatches; return numberOfMatches;
} }
@ -977,12 +977,17 @@ namespace MWGui
{ {
size_t mIndex; size_t mIndex;
std::string mName; std::string mName;
double mNameWeight; size_t mNameWeight;
double mHintWeight; size_t mHintWeight;
constexpr auto tie() const { return std::tie(mNameWeight, mHintWeight, mName); } constexpr bool operator<(const WeightedPage& rhs) const
{
constexpr bool operator<(const WeightedPage& rhs) const { return tie() < rhs.tie(); } if (mNameWeight != rhs.mNameWeight)
return mNameWeight > rhs.mNameWeight;
if (mHintWeight != rhs.mHintWeight)
return mHintWeight > rhs.mHintWeight;
return mName < rhs.mName;
}
}; };
const std::vector<std::string> patternArray = generatePatternArray(mScriptFilter->getCaption()); const std::vector<std::string> patternArray = generatePatternArray(mScriptFilter->getCaption());
@ -991,10 +996,10 @@ namespace MWGui
for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i) for (size_t i = 0; i < LuaUi::scriptSettingsPageCount(); ++i)
{ {
LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i); LuaUi::ScriptSettingsPage page = LuaUi::scriptSettingsPageAt(i);
double nameWeight = weightedSearch(page.mName, patternArray); size_t nameWeight = weightedSearch(page.mName, patternArray);
double hintWeight = weightedSearch(page.mSearchHints, patternArray); size_t hintWeight = weightedSearch(page.mSearchHints, patternArray);
if ((nameWeight + hintWeight) > 0) if ((nameWeight + hintWeight) > 0)
weightedPages.push_back({ i, page.mName, -nameWeight, -hintWeight }); weightedPages.push_back({ i, page.mName, nameWeight, hintWeight });
} }
std::sort(weightedPages.begin(), weightedPages.end()); std::sort(weightedPages.begin(), weightedPages.end());
for (const WeightedPage& weightedPage : weightedPages) for (const WeightedPage& weightedPage : weightedPages)