Merge pull request #67 from lukhnos/uom-fix

Fix a bug in how UOM ignores punctuations
openvanilla · Jul 20, 2022 · b2da409 · b2da409
2 parents ae738d4 + 4c8a39c
commit b2da409
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/Engine/UserOverrideModel.cpp b/src/Engine/UserOverrideModel.cpp
@@ -278,7 +278,11 @@ static std::string FormObservationKey(std::vector<Formosa::Gramambular2::Reading
     std::string anteriorStr;
     if (head != end && !prevIsPunctuation) {
         --head;
-        anteriorStr = CombineReadingValue((*head)->reading(), (*head)->currentUnigram().value());
+        if (IsPunctuation((*head))) {
+            anteriorStr = kEmptyNodeString;
+        } else {
+            anteriorStr = CombineReadingValue((*head)->reading(), (*head)->currentUnigram().value());
+        }
     } else {
         anteriorStr = kEmptyNodeString;
     }

diff --git a/src/Engine/UserOverrideModel.h b/src/Engine/UserOverrideModel.h
@@ -37,7 +37,7 @@ class UserOverrideModel {
     UserOverrideModel(size_t capacity, double decayConstant);
 
     struct Suggestion {
-        Suggestion() { }
+        Suggestion() = default;
         Suggestion(std::string c, bool f)
             : candidate(std::move(c))
             , forceHighScoreOverride(f)
@@ -46,7 +46,7 @@ class UserOverrideModel {
         std::string candidate;
         bool forceHighScoreOverride = false;
 
-        bool empty()
+        [[nodiscard]] bool empty() const
         {
             return candidate.empty();
         }
@@ -93,6 +93,6 @@ class UserOverrideModel {
     std::map<std::string, std::list<KeyObservationPair>::iterator> m_lruMap;
 };
 
-}; // namespace McBopomofo
+} // namespace McBopomofo
 
 #endif