diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-07-11 11:37:36 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-07-12 11:27:55 +0900 |
| commit | 1a69ad5a107792cb01436d2156f8b518aaf0a4d6 (patch) | |
| tree | 9f13ec4395d71fb32eaf156f0245a80a098c3b31 | |
| parent | b7d7c5a369cef80d4319de8e433501ab25b49615 (diff) | |
| download | latinime-1a69ad5a107792cb01436d2156f8b518aaf0a4d6.tar.gz latinime-1a69ad5a107792cb01436d2156f8b518aaf0a4d6.tar.xz latinime-1a69ad5a107792cb01436d2156f8b518aaf0a4d6.zip | |
Remove a constant parameter (A105)
Change-Id: I8a09fa2f0649880c943364699a07652e47dede22
| -rw-r--r-- | native/jni/src/bigram_dictionary.cpp | 14 | ||||
| -rw-r--r-- | native/jni/src/bigram_dictionary.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index 2c3d16583..0c1aa70cb 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -38,7 +38,7 @@ BigramDictionary::~BigramDictionary() { } bool BigramDictionary::addWordBigram(unsigned short *word, int length, int frequency, - const int maxBigrams, int *bigramFreq, unsigned short *bigramChars) const { + int *bigramFreq, unsigned short *bigramChars) const { word[length] = 0; if (DEBUG_DICT) { #ifdef FLAG_DBG @@ -50,7 +50,7 @@ bool BigramDictionary::addWordBigram(unsigned short *word, int length, int frequ // Find the right insertion point int insertAt = 0; - while (insertAt < maxBigrams) { + while (insertAt < MAX_PREDICTIONS) { if (frequency > bigramFreq[insertAt] || (bigramFreq[insertAt] == frequency && length < Dictionary::wideStrLen(bigramChars + insertAt * MAX_WORD_LENGTH))) { break; @@ -58,16 +58,16 @@ bool BigramDictionary::addWordBigram(unsigned short *word, int length, int frequ insertAt++; } if (DEBUG_DICT) { - AKLOGI("Bigram: InsertAt -> %d maxBigrams: %d", insertAt, maxBigrams); + AKLOGI("Bigram: InsertAt -> %d MAX_PREDICTIONS: %d", insertAt, MAX_PREDICTIONS); } - if (insertAt < maxBigrams) { + if (insertAt < MAX_PREDICTIONS) { memmove((char*) bigramFreq + (insertAt + 1) * sizeof(bigramFreq[0]), (char*) bigramFreq + insertAt * sizeof(bigramFreq[0]), - (maxBigrams - insertAt - 1) * sizeof(bigramFreq[0])); + (MAX_PREDICTIONS - insertAt - 1) * sizeof(bigramFreq[0])); bigramFreq[insertAt] = frequency; memmove((char*) bigramChars + (insertAt + 1) * MAX_WORD_LENGTH * sizeof(short), (char*) bigramChars + (insertAt ) * MAX_WORD_LENGTH * sizeof(short), - (maxBigrams - insertAt - 1) * sizeof(short) * MAX_WORD_LENGTH); + (MAX_PREDICTIONS - insertAt - 1) * sizeof(short) * MAX_WORD_LENGTH); unsigned short *dest = bigramChars + (insertAt ) * MAX_WORD_LENGTH; while (length--) { *dest++ = *word++; @@ -137,7 +137,7 @@ int BigramDictionary::getBigrams(const int32_t *prevWord, int prevWordLength, in const int frequency = BinaryFormat::computeFrequencyForBigram(unigramFreq, bigramFreqTemp); if (addWordBigram( - bigramBuffer, length, frequency, maxBigrams, bigramFreq, bigramChars)) { + bigramBuffer, length, frequency, bigramFreq, bigramChars)) { ++bigramCount; } } diff --git a/native/jni/src/bigram_dictionary.h b/native/jni/src/bigram_dictionary.h index fe5bd9436..3f397af4d 100644 --- a/native/jni/src/bigram_dictionary.h +++ b/native/jni/src/bigram_dictionary.h @@ -38,7 +38,7 @@ class BigramDictionary { ~BigramDictionary(); private: DISALLOW_IMPLICIT_CONSTRUCTORS(BigramDictionary); - bool addWordBigram(unsigned short *word, int length, int frequency, const int maxBigrams, + bool addWordBigram(unsigned short *word, int length, int frequency, int *bigramFreq, unsigned short *bigramChars) const; int getBigramAddress(int *pos, bool advance); int getBigramFreq(int *pos); |