Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 947f8ee0 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix performance-for-range-copy warnings" 

am: db2e4888

Change-Id: I543e720cb8f79f4464a69a4365ca28c4942e160c
parents 49424a1b db2e4888

native/dicttoolkit/src/offdevice_intermediate_dict/offdevice_intermediate_dict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ const WordProperty *OffdeviceIntermediateDict::getWordProperty( 
    const OffdeviceIntermediateDictPtNodeArray *ptNodeArray = &mRootPtNodeArray;

    for (size_t i = 0; i < codePoints.size();) {

        bool foundNext = false;

        for (const auto ptNode : ptNodeArray->getPtNodeList()) {

        for (const auto& ptNode : ptNodeArray->getPtNodeList()) {

            const CodePointArrayView ptNodeCodePoints = ptNode->getPtNodeCodePoints();

            if (codePoints[i] < ptNodeCodePoints[0]) {

                continue;

native/jni/src/dictionary/structure/v4/ver4_patricia_trie_policy.cpp

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void Ver4PatriciaTriePolicy::iterateNgramEntries(const WordIdArrayView prevWordI 
    }

    const auto languageModelDictContent = mBuffers->getLanguageModelDictContent();

    for (size_t i = 1; i <= prevWordIds.size(); ++i) {

        for (const auto entry : languageModelDictContent->getProbabilityEntries(

        for (const auto& entry : languageModelDictContent->getProbabilityEntries(

                prevWordIds.limit(i))) {

            const ProbabilityEntry &probabilityEntry = entry.getProbabilityEntry();

            if (!probabilityEntry.isValid()) {
@@ -516,7 +516,7 @@ const WordProperty Ver4PatriciaTriePolicy::getWordProperty( 
    int ngramPrevWordsCodePoints[MAX_PREV_WORD_COUNT_FOR_N_GRAM][MAX_WORD_LENGTH];

    int ngramPrevWordsCodePointCount[MAX_PREV_WORD_COUNT_FOR_N_GRAM];

    bool ngramPrevWordIsBeginningOfSentense[MAX_PREV_WORD_COUNT_FOR_N_GRAM];

    for (const auto entry : languageModelDictContent->exportAllNgramEntriesRelatedToWord(

    for (const auto& entry : languageModelDictContent->exportAllNgramEntriesRelatedToWord(

            mHeaderPolicy, wordId)) {

        const int codePointCount = getCodePointsAndReturnCodePointCount(entry.getTargetWordId(),

                MAX_WORD_LENGTH, ngramTargetCodePoints);

native/jni/tests/dictionary/structure/v4/content/language_model_dict_content_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ TEST(LanguageModelDictContentTest, TestIterateProbabilityEntry) { 
        languageModelDictContent.setProbabilityEntry(wordId, &originalEntry);

    }

    std::unordered_set<int> wordIdSet(std::begin(wordIds), std::end(wordIds));

    for (const auto entry : languageModelDictContent.getProbabilityEntries(WordIdArrayView())) {

    for (const auto& entry : languageModelDictContent.getProbabilityEntries(WordIdArrayView())) {

        EXPECT_EQ(originalEntry.getFlags(), entry.getProbabilityEntry().getFlags());

        EXPECT_EQ(originalEntry.getProbability(), entry.getProbabilityEntry().getProbability());

        wordIdSet.erase(entry.getWordId());