Merge "Change name of DecayingUtils." (52c20927) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -85,8 +85,8 @@ LATIN_IME_CORE_SRC_FILES := \
		$(addprefix suggest/policyimpl/dictionary/utils/, \
		buffer_with_extendable_buffer.cpp \
		byte_array_utils.cpp \
		decaying_utils.cpp \
		dict_file_writing_utils.cpp \
		forgetting_curve_utils.cpp \
		format_utils.cpp) \
		suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \
		$(addprefix suggest/policyimpl/typing/, \

native/jni/src/suggest/policyimpl/dictionary/bigram/dynamic_bigram_list_policy.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		#include "suggest/policyimpl/dictionary/dynamic_patricia_trie_node_reader.h"
		#include "suggest/policyimpl/dictionary/dynamic_patricia_trie_writing_helper.h"
		#include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
		#include "suggest/policyimpl/dictionary/utils/decaying_utils.h"
		#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"

		namespace latinime {

		@@ -43,7 +43,7 @@ void DynamicBigramListPolicy::getNextBigram(int const outBigramPos, int const
		}
		*outProbability = BigramListReadWriteUtils::getProbabilityFromFlags(bigramFlags);
		*outHasNext = BigramListReadWriteUtils::hasNext(bigramFlags);
		if (mIsDecayingDict && !DecayingUtils::isValidBigram(*outProbability)) {
		if (mIsDecayingDict && !ForgettingCurveUtils::isValidBigram(*outProbability)) {
		// This bigram is too weak to output.
		*outBigramPos = NOT_A_DICT_POS;
		} else {
		@@ -261,7 +261,7 @@ bool DynamicBigramListPolicy::addNewBigramEntryToBigramList(const int bigramTarg
		const int originalProbability = BigramListReadWriteUtils::getProbabilityFromFlags(
		bigramFlags);
		const int probabilityToWrite = mIsDecayingDict ?
		DecayingUtils::getUpdatedBigramProbabilityDelta(
		ForgettingCurveUtils::getUpdatedBigramProbabilityDelta(
		originalProbability, probability) : probability;
		const BigramListReadWriteUtils::BigramFlags updatedFlags =
		BigramListReadWriteUtils::setProbabilityInFlags(bigramFlags,
		@@ -294,7 +294,7 @@ bool DynamicBigramListPolicy::writeNewBigramEntry(const int bigramTargetPos, con
		int *const writingPos) {
		// hasNext is false because we are adding a new bigram entry at the end of the bigram list.
		const int probabilityToWrite = mIsDecayingDict ?
		DecayingUtils::getUpdatedBigramProbabilityDelta(NOT_A_PROBABILITY, probability) :
		ForgettingCurveUtils::getUpdatedBigramProbabilityDelta(NOT_A_PROBABILITY, probability) :
		probability;
		return BigramListReadWriteUtils::createAndWriteBigramEntry(mBuffer, bigramTargetPos,
		probabilityToWrite, false /* hasNext */, writingPos);
		@@ -365,9 +365,9 @@ bool DynamicBigramListPolicy::updateProbabilityForDecay(
		*outRemoved = false;
		if (mIsDecayingDict) {
		// Update bigram probability for decaying.
		const int newProbability = DecayingUtils::getBigramProbabilityDeltaToSave(
		const int newProbability = ForgettingCurveUtils::getBigramProbabilityDeltaToSave(
		BigramListReadWriteUtils::getProbabilityFromFlags(bigramFlags));
		if (DecayingUtils::isValidBigram(newProbability)) {
		if (ForgettingCurveUtils::isValidBigram(newProbability)) {
		// Write new probability.
		const BigramListReadWriteUtils::BigramFlags updatedBigramFlags =
		BigramListReadWriteUtils::setProbabilityInFlags(

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_gc_event_listeners.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@

		#include "suggest/policyimpl/dictionary/dynamic_patricia_trie_gc_event_listeners.h"

		#include "suggest/policyimpl/dictionary/utils/decaying_utils.h"
		#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"

		namespace latinime {

		@@ -29,14 +29,14 @@ bool DynamicPatriciaTrieGcEventListeners
		bool isUselessPtNode = !node->isTerminal();
		if (node->isTerminal() && mIsDecayingDict) {
		const int newProbability =
		DecayingUtils::getUnigramProbabilityToSave(node->getProbability());
		ForgettingCurveUtils::getUnigramProbabilityToSave(node->getProbability());
		int writingPos = node->getProbabilityFieldPos();
		// Update probability.
		if (!DynamicPatriciaTrieWritingUtils::writeProbabilityAndAdvancePosition(
		mBuffer, newProbability, &writingPos)) {
		return false;
		}
		if (!DecayingUtils::isValidUnigram(newProbability)) {
		if (!ForgettingCurveUtils::isValidUnigram(newProbability)) {
		isUselessPtNode = false;
		}
		}

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_policy.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		#include "suggest/policyimpl/dictionary/dynamic_patricia_trie_reading_utils.h"
		#include "suggest/policyimpl/dictionary/dynamic_patricia_trie_writing_helper.h"
		#include "suggest/policyimpl/dictionary/patricia_trie_reading_utils.h"
		#include "suggest/policyimpl/dictionary/utils/decaying_utils.h"
		#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
		#include "suggest/policyimpl/dictionary/utils/probability_utils.h"

		namespace latinime {
		@@ -154,7 +154,7 @@ int DynamicPatriciaTriePolicy::getTerminalNodePositionOfWord(const int *const in
		int DynamicPatriciaTriePolicy::getProbability(const int unigramProbability,
		const int bigramProbability) const {
		if (mHeaderPolicy.isDecayingDict()) {
		return DecayingUtils::getProbability(unigramProbability, bigramProbability);
		return ForgettingCurveUtils::getProbability(unigramProbability, bigramProbability);
		} else {
		if (unigramProbability == NOT_A_PROBABILITY) {
		return NOT_A_PROBABILITY;
		@@ -344,10 +344,10 @@ bool DynamicPatriciaTriePolicy::needsToRunGC(const bool mindsBlockByGC) const {
		// Needs to reduce dictionary size.
		return true;
		} else if (mHeaderPolicy.isDecayingDict()) {
		if (mUnigramCount >= DecayingUtils::MAX_UNIGRAM_COUNT) {
		if (mUnigramCount >= ForgettingCurveUtils::MAX_UNIGRAM_COUNT) {
		// Unigram count exceeds the limit.
		return true;
		} else if (mBigramCount >= DecayingUtils::MAX_BIGRAM_COUNT) {
		} else if (mBigramCount >= ForgettingCurveUtils::MAX_BIGRAM_COUNT) {
		// Bigram count exceeds the limit.
		return true;
		} else if (mindsBlockByGC && needsToDecay()) {

native/jni/src/suggest/policyimpl/dictionary/dynamic_patricia_trie_writing_helper.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@
		#include "suggest/policyimpl/dictionary/header/header_policy.h"
		#include "suggest/policyimpl/dictionary/patricia_trie_reading_utils.h"
		#include "suggest/policyimpl/dictionary/shortcut/dynamic_shortcut_list_policy.h"
		#include "suggest/policyimpl/dictionary/utils/decaying_utils.h"
		#include "suggest/policyimpl/dictionary/utils/dict_file_writing_utils.h"
		#include "suggest/policyimpl/dictionary/utils/forgetting_curve_utils.h"
		#include "utils/hash_map_compat.h"

		namespace latinime {
		@@ -494,7 +494,7 @@ bool DynamicPatriciaTrieWritingHelper::runGC(const int rootPtNodeArrayPos,
		return false;
		}
		if (mNeedsToDecay && traversePolicyToUpdateUnigramProbabilityAndMarkUselessPtNodesAsDeleted
		.getValidUnigramCount() > DecayingUtils::MAX_UNIGRAM_COUNT_AFTER_GC) {
		.getValidUnigramCount() > ForgettingCurveUtils::MAX_UNIGRAM_COUNT_AFTER_GC) {
		// TODO: Remove more unigrams.
		}

		@@ -507,7 +507,7 @@ bool DynamicPatriciaTrieWritingHelper::runGC(const int rootPtNodeArrayPos,
		}

		if (mNeedsToDecay && traversePolicyToUpdateBigramProbability.getValidBigramEntryCount()
		> DecayingUtils::MAX_BIGRAM_COUNT_AFTER_GC) {
		> ForgettingCurveUtils::MAX_BIGRAM_COUNT_AFTER_GC) {
		// TODO: Remove more bigrams.
		}

		@@ -545,7 +545,8 @@ bool DynamicPatriciaTrieWritingHelper::runGC(const int rootPtNodeArrayPos,
		int DynamicPatriciaTrieWritingHelper::getUpdatedProbability(const int originalProbability,
		const int newProbability) {
		if (mNeedsToDecay) {
		return DecayingUtils::getUpdatedUnigramProbability(originalProbability, newProbability);
		return ForgettingCurveUtils::getUpdatedUnigramProbability(originalProbability,
		newProbability);
		} else {
		return newProbability;
		}