diff --git a/Source/Engine/Gramambular/BlockReadingBuilder.h b/Source/Engine/Gramambular/BlockReadingBuilder.h index 145a0185..76d681a3 100644 --- a/Source/Engine/Gramambular/BlockReadingBuilder.h +++ b/Source/Engine/Gramambular/BlockReadingBuilder.h @@ -58,8 +58,6 @@ namespace Formosa { vector readingsAtRange(size_t begin, size_t end) const; Grid& grid(); - - bool checkIfUnigramExistInVector(Unigram& unigram, vectorvector); protected: void build(); @@ -198,16 +196,6 @@ namespace Formosa { return m_grid; } - inline bool BlockReadingBuilder::checkIfUnigramExistInVector(Unigram& unigram, vectorvector) - { - for (std::vector::iterator it=vector.begin(); it!=vector.end(); ++it) { - if (it->keyValue.value == unigram.keyValue.value) { - return true; - } - } - return false; - } - inline void BlockReadingBuilder::build() { if (!m_LM) { diff --git a/Source/Engine/McBopomofoLM.cpp b/Source/Engine/McBopomofoLM.cpp index e5bc741f..b7bfd1b5 100644 --- a/Source/Engine/McBopomofoLM.cpp +++ b/Source/Engine/McBopomofoLM.cpp @@ -13,7 +13,7 @@ McBopomofoLM::~McBopomofoLM() { m_languageModel.close(); m_userPhrases.close(); - m_excluddePhrases.close(); + m_excludedPhrases.close(); } void McBopomofoLM::loadLanguageModel(const char* languageModelDataPath) @@ -27,8 +27,8 @@ void McBopomofoLM::loadUserPhrases(const char* userPhrasesDataPath, { m_userPhrases.close(); m_userPhrases.open(userPhrasesDataPath); - m_excluddePhrases.close(); - m_excluddePhrases.open(excludedPhrasesDataPath); + m_excludedPhrases.close(); + m_excludedPhrases.open(excludedPhrasesDataPath); } const vector McBopomofoLM::bigramsForKeys(const string& preceedingKey, const string& key) @@ -40,35 +40,35 @@ const vector McBopomofoLM::unigramsForKey(const string& key) { vector unigrams; vector userUnigrams; - + // Use unordered_set so that you don't have to do O(n*m) unordered_set excludedValues; unordered_set userValues; - - if (m_excluddePhrases.hasUnigramsForKey(key)) { - vector excludedUnigrams = m_excluddePhrases.unigramsForKey(key); + + if (m_excludedPhrases.hasUnigramsForKey(key)) { + vector excludedUnigrams = m_excludedPhrases.unigramsForKey(key); transform(excludedUnigrams.begin(), excludedUnigrams.end(), inserter(excludedValues, excludedValues.end()), [](const Unigram &u) { return u.keyValue.value; }); } - + if (m_userPhrases.hasUnigramsForKey(key)) { vector rawUserUnigrams = m_userPhrases.unigramsForKey(key); - + for (auto&& unigram : rawUserUnigrams) { if (excludedValues.find(unigram.keyValue.value) == excludedValues.end()) { userUnigrams.push_back(unigram); } } - + transform(userUnigrams.begin(), userUnigrams.end(), inserter(userValues, userValues.end()), [](const Unigram &u) { return u.keyValue.value; }); } - + if (m_languageModel.hasUnigramsForKey(key)) { vector globalUnigrams = m_languageModel.unigramsForKey(key); - + for (auto&& unigram : globalUnigrams) { if (excludedValues.find(unigram.keyValue.value) == excludedValues.end() && userValues.find(unigram.keyValue.value) == userValues.end()) { @@ -76,17 +76,17 @@ const vector McBopomofoLM::unigramsForKey(const string& key) } } } - + unigrams.insert(unigrams.begin(), userUnigrams.begin(), userUnigrams.end()); return unigrams; } bool McBopomofoLM::hasUnigramsForKey(const string& key) { - if (!m_excluddePhrases.hasUnigramsForKey(key)) { + if (!m_excludedPhrases.hasUnigramsForKey(key)) { return m_userPhrases.hasUnigramsForKey(key) || m_languageModel.hasUnigramsForKey(key); } - + return unigramsForKey(key).size() > 0; } diff --git a/Source/Engine/McBopomofoLM.h b/Source/Engine/McBopomofoLM.h index 19ad8246..292fbf61 100644 --- a/Source/Engine/McBopomofoLM.h +++ b/Source/Engine/McBopomofoLM.h @@ -24,7 +24,7 @@ public: protected: FastLM m_languageModel; FastLM m_userPhrases; - FastLM m_excluddePhrases; + FastLM m_excludedPhrases; }; };