Merge "Refactoring method to get code points and code point count." (7313b0de) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/src/suggest/core/dictionary/dictionary.cpp

+2 −4

Original line number	Diff line number	Diff line
		@@ -77,10 +77,8 @@ void Dictionary::NgramListenerForPrediction::onVisitEntry(const int ngramProbabi
		return;
		}
		int targetWordCodePoints[MAX_WORD_LENGTH];
		int unigramProbability = 0;
		const int codePointCount = mDictStructurePolicy->
		getCodePointsAndProbabilityAndReturnCodePointCount(targetWordId, MAX_WORD_LENGTH,
		targetWordCodePoints, &unigramProbability);
		const int codePointCount = mDictStructurePolicy->getCodePointsAndReturnCodePointCount(
		targetWordId, MAX_WORD_LENGTH, targetWordCodePoints);
		if (codePointCount <= 0) {
		return;
		}

native/jni/src/suggest/core/policy/dictionary_structure_with_buffer_policy.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -51,9 +51,8 @@ class DictionaryStructureWithBufferPolicy {
		virtual void createAndGetAllChildDicNodes(const DicNode *const dicNode,
		DicNodeVector *const childDicNodes) const = 0;

		virtual int getCodePointsAndProbabilityAndReturnCodePointCount(
		const int wordId, const int maxCodePointCount, int *const outCodePoints,
		int *const outUnigramProbability) const = 0;
		virtual int getCodePointsAndReturnCodePointCount(const int wordId, const int maxCodePointCount,
		int *const outCodePoints) const = 0;

		virtual int getWordId(const CodePointArrayView wordCodePoints,
		const bool forceLowerCaseSearch) const = 0;

native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.cpp

+8 −13

Original line number	Diff line number	Diff line
		@@ -87,14 +87,13 @@ void Ver4PatriciaTriePolicy::createAndGetAllChildDicNodes(const DicNode *const d
		}
		}

		int Ver4PatriciaTriePolicy::getCodePointsAndProbabilityAndReturnCodePointCount(
		const int wordId, const int maxCodePointCount, int *const outCodePoints,
		int *const outUnigramProbability) const {
		int Ver4PatriciaTriePolicy::getCodePointsAndReturnCodePointCount(const int wordId,
		const int maxCodePointCount, int *const outCodePoints) const {
		DynamicPtReadingHelper readingHelper(&mNodeReader, &mPtNodeArrayReader);
		const int ptNodePos = getTerminalPtNodePosFromWordId(wordId);
		readingHelper.initWithPtNodePos(ptNodePos);
		const int codePointCount = readingHelper.getCodePointsAndProbabilityAndReturnCodePointCount(
		maxCodePointCount, outCodePoints, outUnigramProbability);
		const int codePointCount = readingHelper.getCodePointsAndReturnCodePointCount(
		maxCodePointCount, outCodePoints);
		if (readingHelper.isError()) {
		mIsCorrupted = true;
		AKLOGE("Dictionary reading error in getCodePointsAndProbabilityAndReturnCodePointCount().");
		@@ -521,11 +520,9 @@ const WordProperty Ver4PatriciaTriePolicy::getWordProperty(
		if (word1TerminalPtNodePos == NOT_A_DICT_POS) {
		continue;
		}
		// Word (unigram) probability
		int word1Probability = NOT_A_PROBABILITY;
		const int codePointCount = getCodePointsAndProbabilityAndReturnCodePointCount(
		const int codePointCount = getCodePointsAndReturnCodePointCount(
		getWordIdFromTerminalPtNodePos(word1TerminalPtNodePos), MAX_WORD_LENGTH,
		bigramWord1CodePoints, &word1Probability);
		bigramWord1CodePoints);
		const std::vector<int> word1(bigramWord1CodePoints,
		bigramWord1CodePoints + codePointCount);
		const HistoricalInfo *const historicalInfo = bigramEntry.getHistoricalInfo();
		@@ -580,10 +577,8 @@ int Ver4PatriciaTriePolicy::getNextWordAndNextToken(const int token, int *const
		return 0;
		}
		const int terminalPtNodePos = mTerminalPtNodePositionsForIteratingWords[token];
		int unigramProbability = NOT_A_PROBABILITY;
		*outCodePointCount = getCodePointsAndProbabilityAndReturnCodePointCount(
		getWordIdFromTerminalPtNodePos(terminalPtNodePos), MAX_WORD_LENGTH, outCodePoints,
		&unigramProbability);
		*outCodePointCount = getCodePointsAndReturnCodePointCount(
		getWordIdFromTerminalPtNodePos(terminalPtNodePos), MAX_WORD_LENGTH, outCodePoints);
		const int nextToken = token + 1;
		if (nextToken >= terminalPtNodePositionsVectorSize) {
		// All words have been iterated.

native/jni/src/suggest/policyimpl/dictionary/structure/backward/v402/ver4_patricia_trie_policy.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -85,9 +85,8 @@ class Ver4PatriciaTriePolicy : public DictionaryStructureWithBufferPolicy {
		void createAndGetAllChildDicNodes(const DicNode *const dicNode,
		DicNodeVector *const childDicNodes) const;

		int getCodePointsAndProbabilityAndReturnCodePointCount(
		const int wordId, const int maxCodePointCount, int *const outCodePoints,
		int *const outUnigramProbability) const;
		int getCodePointsAndReturnCodePointCount(const int wordId, const int maxCodePointCount,
		int *const outCodePoints) const;

		int getWordId(const CodePointArrayView wordCodePoints, const bool forceLowerCaseSearch) const;

native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.cpp

+2 −7

Original line number	Diff line number	Diff line
		@@ -175,8 +175,8 @@ bool DynamicPtReadingHelper::traverseAllPtNodesInPtNodeArrayLevelPreorderDepthFi
		return !isError();
		}

		int DynamicPtReadingHelper::getCodePointsAndProbabilityAndReturnCodePointCount(
		const int maxCodePointCount, int const outCodePoints, int const outUnigramProbability) {
		int DynamicPtReadingHelper::getCodePointsAndReturnCodePointCount(const int maxCodePointCount,
		int *const outCodePoints) {
		// This method traverses parent nodes from the terminal by following parent pointers; thus,
		// node code points are stored in the buffer in the reverse order.
		int reverseCodePoints[maxCodePointCount];
		@@ -184,11 +184,8 @@ int DynamicPtReadingHelper::getCodePointsAndProbabilityAndReturnCodePointCount(
		// First, read the terminal node and get its probability.
		if (!isValidTerminalNode(terminalPtNodeParams)) {
		// Node at the ptNodePos is not a valid terminal node.
		*outUnigramProbability = NOT_A_PROBABILITY;
		return 0;
		}
		// Store terminal node probability.
		*outUnigramProbability = terminalPtNodeParams.getProbability();
		// Then, following parent node link to the dictionary root and fetch node code points.
		int totalCodePointCount = 0;
		while (!isEnd()) {
		@@ -196,7 +193,6 @@ int DynamicPtReadingHelper::getCodePointsAndProbabilityAndReturnCodePointCount(
		totalCodePointCount = getTotalCodePointCount(ptNodeParams);
		if (!ptNodeParams.isValid() \|\| totalCodePointCount > maxCodePointCount) {
		// The ptNodePos is not a valid terminal node position in the dictionary.
		*outUnigramProbability = NOT_A_PROBABILITY;
		return 0;
		}
		// Store node code points to buffer in the reverse order.
		@@ -207,7 +203,6 @@ int DynamicPtReadingHelper::getCodePointsAndProbabilityAndReturnCodePointCount(
		}
		if (isError()) {
		// The node position or the dictionary is invalid.
		*outUnigramProbability = NOT_A_PROBABILITY;
		return 0;
		}
		// Reverse the stored code points to output them.