diff --git a/libs/base/levenshtein_dfa.cpp b/libs/base/levenshtein_dfa.cpp index eeeea960a..89005ea4e 100644 --- a/libs/base/levenshtein_dfa.cpp +++ b/libs/base/levenshtein_dfa.cpp @@ -21,7 +21,7 @@ size_t AbsDiff(size_t a, size_t b) class TransitionTable { public: - TransitionTable(UniString const & s, std::vector const & prefixMisprints, size_t prefixSize) + TransitionTable(UniString const & s, std::array const & prefixMisprints, size_t prefixSize) : m_s(s) , m_size(s.size()) , m_prefixMisprints(prefixMisprints) @@ -108,7 +108,7 @@ private: UniString const & m_s; size_t const m_size; - std::vector const m_prefixMisprints; + std::array const m_prefixMisprints; size_t const m_prefixSize; }; } // namespace @@ -190,7 +190,7 @@ void LevenshteinDFA::State::Normalize() // LevenshteinDFA ---------------------------------------------------------------------------------- // static -LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize, std::vector const & prefixMisprints, +LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize, std::array const & prefixMisprints, size_t maxErrors) : m_size(s.size()) , m_maxErrors(maxErrors) diff --git a/libs/base/levenshtein_dfa.hpp b/libs/base/levenshtein_dfa.hpp index 5c7329928..5af19fe2e 100644 --- a/libs/base/levenshtein_dfa.hpp +++ b/libs/base/levenshtein_dfa.hpp @@ -98,7 +98,7 @@ public: LevenshteinDFA(LevenshteinDFA &&) = default; LevenshteinDFA & operator=(LevenshteinDFA &&) = default; - LevenshteinDFA(UniString const & s, size_t prefixSize, std::vector const & prefixMisprints, + LevenshteinDFA(UniString const & s, size_t prefixSize, std::array const & prefixMisprints, size_t maxErrors); LevenshteinDFA(std::string const & s, size_t prefixSize, size_t maxErrors); LevenshteinDFA(UniString const & s, size_t maxErrors); diff --git a/libs/indexer/search_string_utils.cpp b/libs/indexer/search_string_utils.cpp index 64d5bfabf..5822c4228 100644 --- a/libs/indexer/search_string_utils.cpp +++ b/libs/indexer/search_string_utils.cpp @@ -21,7 +21,7 @@ using namespace strings; namespace { -std::vector const kAllowedMisprints = { +std::array const kAllowedMisprints = { MakeUniString("ckq"), MakeUniString("eyjiu"), MakeUniString("gh"), MakeUniString("pf"), MakeUniString("vw"), // Russian @@ -118,11 +118,12 @@ static std::pair const kPreprocessReplacements[] = { {MakeUniString("ι.ν"), MakeUniString("ιερός ναός")}, {MakeUniString("κων/νου"), MakeUniString("κωνσταντίνου")}, {MakeUniString("д-р"), MakeUniString("доктор")}, - {MakeUniString("ж.к"), MakeUniString("жилищен комплекс")}, + {MakeUniString("ж.к."), MakeUniString("жилищен комплекс")}, {MakeUniString("м-н"), MakeUniString("микрорайон")}, {MakeUniString("наб-я"), MakeUniString("набережная")}, {MakeUniString("пр-д"), MakeUniString("проезд")}, {MakeUniString("пр-т"), MakeUniString("проспект")}, + {MakeUniString("আ/এ"), MakeUniString("আবাসিক এলাকা")}, }; void TransliterateHiraganaToKatakana(UniString & s) diff --git a/libs/search/query_params.cpp b/libs/search/query_params.cpp index 25f3b5e9a..96e25791d 100644 --- a/libs/search/query_params.cpp +++ b/libs/search/query_params.cpp @@ -55,7 +55,7 @@ unordered_map> const kSynonyms = { {"accs", {"access"}}, {"aceq", {"acequia"}}, {"ach", {"ancien chemin"}}, - {"a.d", {"auf der", "an der"}}, + //{"a.d", {"auf der", "an der"}}, // unreachable {"adi", {"ambodi"}}, {"adm", {"admirała", "admirał"}}, {"afb", {"air force base"}}, @@ -901,7 +901,7 @@ unordered_map> const kSynonyms = { {"prk", {"purok"}}, {"prm", {"promenade"}}, {"profª", {"professora"}}, - {"prof", {"professora", "professor", "profesora", "profesorky", "profesora (profesor)"}}, + {"prof", {"professora", "professor", "profesora", "profesorky", "profesor"}}, {"proj", {"projectada", "projetada"}}, {"prolng", {"prolongamento"}}, {"prol", {"prolongación"}}, @@ -1359,7 +1359,6 @@ unordered_map> const kSynonyms = { {"туп", {"тупик", "тупік"}}, {"ул", {"улица"}}, {"ш", {"шаша", "шосе", "шоссе"}}, - {"আ/এ", {"আবাসিক এলাকা"}}, {"ইউপি", {"ইউনিয়ন পরিষদ"}}, {"একনেক", {"জাতীয় অর্থনৈতিক পরিষদের নির্বাহী কমিটি"}}, {"টেশিস", {"টেলিফোন শিল্প সংস্থা"}},