diff options
6 files changed, 10 insertions, 6 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h index 564811560..9a26fe051 100644 --- a/native/jni/src/defines.h +++ b/native/jni/src/defines.h @@ -298,6 +298,7 @@ static inline void prof_out(void) { #define NOT_AN_INDEX (-1) #define NOT_A_PROBABILITY (-1) #define NOT_A_DICT_POS (S_INT_MIN) +#define NOT_A_TIMESTAMP (-1) // A special value to mean the first word confidence makes no sense in this case, // e.g. this is not a multi-word suggestion. diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp index 04c80a76c..2c814424a 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.cpp @@ -27,7 +27,7 @@ const BigramEntry BigramDictContent::getBigramEntryAndAdvancePosition( Ver4DictConstants::BIGRAM_FLAGS_FIELD_SIZE, bigramEntryPos); const bool hasNext = (bigramFlags & Ver4DictConstants::BIGRAM_HAS_NEXT_MASK) != 0; int probability = NOT_A_PROBABILITY; - int timestamp = Ver4DictConstants::NOT_A_TIME_STAMP; + int timestamp = NOT_A_TIMESTAMP; int level = 0; int count = 0; if (mHasHistoricalInfo) { diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_entry.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_entry.h index 10b3ec8dc..3618ba7d2 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_entry.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/bigram_entry.h @@ -32,7 +32,7 @@ class BigramEntry { // Entry with historical information. BigramEntry(const bool hasNext, const int probability, const int targetTerminalId) : mHasNext(hasNext), mProbability(probability), - mTimestamp(Ver4DictConstants::NOT_A_TIME_STAMP), mLevel(0), mCount(0), + mTimestamp(NOT_A_TIMESTAMP), mLevel(0), mCount(0), mTargetTerminalId(targetTerminalId) {} // Entry with historical information. diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h index 274c46537..2a25bb8fb 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/probability_entry.h @@ -32,12 +32,12 @@ class ProbabilityEntry { // Dummy entry ProbabilityEntry() : mFlags(0), mProbability(NOT_A_PROBABILITY), - mTimestamp(Ver4DictConstants::NOT_A_TIME_STAMP), mLevel(0), mCount(0) {} + mTimestamp(NOT_A_TIMESTAMP), mLevel(0), mCount(0) {} // Entry without historical information ProbabilityEntry(const int flags, const int probability) : mFlags(flags), mProbability(probability), - mTimestamp(Ver4DictConstants::NOT_A_TIME_STAMP), mLevel(0), mCount(0) {} + mTimestamp(NOT_A_TIMESTAMP), mLevel(0), mCount(0) {} // Entry with historical information. ProbabilityEntry(const int flags, const int probability, const int timestamp, @@ -49,6 +49,11 @@ class ProbabilityEntry { return ProbabilityEntry(mFlags, probability, mTimestamp, mLevel, mCount); } + const ProbabilityEntry createEntryWithUpdatedHistoricalInfo(const int timestamp, + const int level, const int count) const { + return ProbabilityEntry(mFlags, mProbability, timestamp, level, count); + } + int getFlags() const { return mFlags; } diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp index d359caa5b..066d6ed80 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.cpp @@ -38,7 +38,6 @@ const int Ver4DictConstants::MAX_DICTIONARY_SIZE = 2 * 1024 * 1024; const int Ver4DictConstants::MAX_DICT_EXTENDED_REGION_SIZE = 1 * 1024 * 1024; const int Ver4DictConstants::NOT_A_TERMINAL_ID = -1; -const int Ver4DictConstants::NOT_A_TIME_STAMP = -1; const int Ver4DictConstants::PROBABILITY_SIZE = 1; const int Ver4DictConstants::FLAGS_IN_PROBABILITY_FILE_SIZE = 1; const int Ver4DictConstants::TERMINAL_ADDRESS_TABLE_ADDRESS_SIZE = 3; diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h index 5764bed95..7afdc86ed 100644 --- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h +++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_constants.h @@ -38,7 +38,6 @@ class Ver4DictConstants { static const int MAX_DICT_EXTENDED_REGION_SIZE; static const int NOT_A_TERMINAL_ID; - static const int NOT_A_TIME_STAMP; static const int PROBABILITY_SIZE; static const int FLAGS_IN_PROBABILITY_FILE_SIZE; static const int TERMINAL_ADDRESS_TABLE_ADDRESS_SIZE; |