am 4fd1ffdb: Merge "Add/Get n-gram probability entry in languageModelDictContent" into lmp-dev (a7be110d) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.cpp

+18 −7

Original line number	Diff line number	Diff line
		@@ -32,11 +32,11 @@ bool LanguageModelDictContent::runGC(

		ProbabilityEntry LanguageModelDictContent::getNgramProbabilityEntry(
		const WordIdArrayView prevWordIds, const int wordId) const {
		if (!prevWordIds.empty()) {
		// TODO: Read n-gram entry.
		const int bitmapEntryIndex = getBitmapEntryIndex(prevWordIds);
		if (bitmapEntryIndex == TrieMap::INVALID_INDEX) {
		return ProbabilityEntry();
		}
		const TrieMap::Result result = mTrieMap.getRoot(wordId);
		const TrieMap::Result result = mTrieMap.get(wordId, bitmapEntryIndex);
		if (!result.mIsValid) {
		// Not found.
		return ProbabilityEntry();
		@@ -46,14 +46,13 @@ ProbabilityEntry LanguageModelDictContent::getNgramProbabilityEntry(

		bool LanguageModelDictContent::setNgramProbabilityEntry(const WordIdArrayView prevWordIds,
		const int terminalId, const ProbabilityEntry *const probabilityEntry) {
		if (!prevWordIds.empty()) {
		// TODO: Add n-gram entry.
		const int bitmapEntryIndex = getBitmapEntryIndex(prevWordIds);
		if (bitmapEntryIndex == TrieMap::INVALID_INDEX) {
		return false;
		}
		return mTrieMap.putRoot(terminalId, probabilityEntry->encode(mHasHistoricalInfo));
		return mTrieMap.put(terminalId, probabilityEntry->encode(mHasHistoricalInfo), bitmapEntryIndex);
		}


		bool LanguageModelDictContent::runGCInner(
		const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
		const TrieMap::TrieMapRange trieMapRange,
		@@ -81,4 +80,16 @@ bool LanguageModelDictContent::runGCInner(
		return true;
		}

		int LanguageModelDictContent::getBitmapEntryIndex(const WordIdArrayView prevWordIds) const {
		int bitmapEntryIndex = mTrieMap.getRootBitmapEntryIndex();
		for (const int wordId : prevWordIds) {
		const TrieMap::Result result = mTrieMap.get(wordId, bitmapEntryIndex);
		if (!result.mIsValid) {
		return TrieMap::INVALID_INDEX;
		}
		bitmapEntryIndex = result.mNextLevelBitmapEntryIndex;
		}
		return bitmapEntryIndex;
		}

		} // namespace latinime

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@ class LanguageModelDictContent {
		bool runGCInner(const TerminalPositionLookupTable::TerminalIdMap *const terminalIdMap,
		const TrieMap::TrieMapRange trieMapRange, const int nextLevelBitmapEntryIndex,
		int *const outNgramCount);

		int getBitmapEntryIndex(const WordIdArrayView prevWordIds) const;
		};
		} // namespace latinime
		#endif /* LATINIME_LANGUAGE_MODEL_DICT_CONTENT_H */

native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,10 @@ class TrieMap {
		return mBuffer.isNearSizeLimit();
		}

		int getRootBitmapEntryIndex() const {
		return ROOT_BITMAP_ENTRY_INDEX;
		}

		// Returns bitmapEntryIndex. Create the next level map if it doesn't exist.
		int getNextLevelBitmapEntryIndex(const int key) {
		return getNextLevelBitmapEntryIndex(key, ROOT_BITMAP_ENTRY_INDEX);

native/jni/src/utils/int_array_view.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,14 @@ class IntArrayView {
		return mPtr;
		}

		AK_FORCE_INLINE const int *begin() const {
		return mPtr;
		}

		AK_FORCE_INLINE const int *end() const {
		return mPtr + mSize;
		}

		private:
		DISALLOW_ASSIGNMENT_OPERATOR(IntArrayView);

native/jni/tests/utils/int_array_view_test.cpp

+12 −3

Original line number	Diff line number	Diff line
		@@ -24,15 +24,24 @@ namespace latinime {
		namespace {

		TEST(MemoryViewTest, TestAccess) {
		static const int DATA_SIZE = 10000;

		std::vector<int> intVector = {3, 2, 1, 0, -1, -2};
		IntArrayView intArrayView(intVector);
		EXPECT_EQ(intVector.size(), intArrayView.size());
		for (int i = 0; i < DATA_SIZE; ++i) {
		for (int i = 0; i < static_cast<int>(intVector.size()); ++i) {
		EXPECT_EQ(intVector[i], intArrayView[i]);
		}
		}

		TEST(MemoryViewTest, TestIteration) {
		std::vector<int> intVector = {3, 2, 1, 0, -1, -2};
		IntArrayView intArrayView(intVector);
		std::set<int> intSet(intVector.begin(), intVector.end());
		for (const int i : intArrayView) {
		EXPECT_TRUE(intSet.count(i) > 0);
		intSet.erase(i);
		}
		EXPECT_TRUE(intSet.empty());
		}

		} // namespace
		} // namespace latinime