floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a bug on building the vector for unigrams from both global language model and user phrases.

This commit is contained in:
zonble 2022-01-10 00:44:08 +08:00 committed by Lukhnos Liu
parent 1e5bad20c2
commit b4276f0488
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Engine/Gramambular/BlockReadingBuilder.h
View File

@ -221,16 +221,22 @@ namespace Formosa {
for (size_t p = begin ; p < end ; p++) { for (size_t p = begin ; p < end ; p++) {
for (size_t q = 1 ; q <= MaximumBuildSpanLength && p+q <= end ; q++) { for (size_t q = 1 ; q <= MaximumBuildSpanLength && p+q <= end ; q++) {
string combinedReading = Join(m_readings.begin() + p, m_readings.begin() + p + q, m_joinSeparator); string combinedReading = Join(m_readings.begin() + p, m_readings.begin() + p + q, m_joinSeparator);
if (m_UserPhraseLM != NULL) { if (!m_grid.hasNodeAtLocationSpanningLengthMatchingKey(p, q, combinedReading)) {
if (m_UserPhraseLM->hasUnigramsForKey(combinedReading) && !m_grid.hasNodeAtLocationSpanningLengthMatchingKey(p, q, combinedReading)) { vector<Unigram> unigrams;
Node n(combinedReading, m_UserPhraseLM->unigramsForKeys(combinedReading), vector<Bigram>());
m_grid.insertNode(n, p, q); if (m_UserPhraseLM != NULL) {
continue; if (m_UserPhraseLM->hasUnigramsForKey(combinedReading)) {
vector<Unigram> userUnigrams = m_UserPhraseLM->unigramsForKeys(combinedReading);
unigrams.insert(unigrams.end(), userUnigrams.begin(), userUnigrams.end());
}
} }
}
if (m_LM->hasUnigramsForKey(combinedReading)) {
if (m_LM->hasUnigramsForKey(combinedReading) && !m_grid.hasNodeAtLocationSpanningLengthMatchingKey(p, q, combinedReading)) { vector<Unigram> globalUnigrams = m_LM->unigramsForKeys(combinedReading);
Node n(combinedReading, m_LM->unigramsForKeys(combinedReading), vector<Bigram>()); unigrams.insert(unigrams.end(), globalUnigrams.begin(), globalUnigrams.end());
}
Node n(combinedReading, unigrams, vector<Bigram>());
m_grid.insertNode(n, p, q); m_grid.insertNode(n, p, q);
} }
} }