Merge "Fix performance-for-range-copy warnings" am: db2e4888f8
am: 947f8ee063
am: 535cd61e63
Change-Id: Ic8ee8523a644b283ef0c9592bb66bf09ca541485
main
commit
f7b80bb317
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue