Removes unused code and fixes a typo.
This commit is contained in:
parent
abdf97f652
commit
84fc2f068b
|
@ -58,8 +58,6 @@ namespace Formosa {
|
|||
vector<string> readingsAtRange(size_t begin, size_t end) const;
|
||||
|
||||
Grid& grid();
|
||||
|
||||
bool checkIfUnigramExistInVector(Unigram& unigram, vector<Unigram>vector);
|
||||
|
||||
protected:
|
||||
void build();
|
||||
|
@ -198,16 +196,6 @@ namespace Formosa {
|
|||
return m_grid;
|
||||
}
|
||||
|
||||
inline bool BlockReadingBuilder::checkIfUnigramExistInVector(Unigram& unigram, vector<Unigram>vector)
|
||||
{
|
||||
for (std::vector<Unigram>::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) {
|
||||
|
|
|
@ -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<Bigram> McBopomofoLM::bigramsForKeys(const string& preceedingKey, const string& key)
|
||||
|
@ -40,35 +40,35 @@ const vector<Unigram> McBopomofoLM::unigramsForKey(const string& key)
|
|||
{
|
||||
vector<Unigram> unigrams;
|
||||
vector<Unigram> userUnigrams;
|
||||
|
||||
|
||||
// Use unordered_set so that you don't have to do O(n*m)
|
||||
unordered_set<string> excludedValues;
|
||||
unordered_set<string> userValues;
|
||||
|
||||
if (m_excluddePhrases.hasUnigramsForKey(key)) {
|
||||
vector<Unigram> excludedUnigrams = m_excluddePhrases.unigramsForKey(key);
|
||||
|
||||
if (m_excludedPhrases.hasUnigramsForKey(key)) {
|
||||
vector<Unigram> 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<Unigram> 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<Unigram> 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<Unigram> 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;
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ public:
|
|||
protected:
|
||||
FastLM m_languageModel;
|
||||
FastLM m_userPhrases;
|
||||
FastLM m_excluddePhrases;
|
||||
FastLM m_excludedPhrases;
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue