commit 1a69ad5a107792cb01436d2156f8b518aaf0a4d6
author Jean Chalard <jchalard@google.com> Wed Jul 11 11:37:36 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Jul 12 11:27:55 2012 +0900
tree 9f13ec4395d71fb32eaf156f0245a80a098c3b31
parent b7d7c5a369cef80d4319de8e433501ab25b49615

Remove a constant parameter (A105)

Change-Id: I8a09fa2f0649880c943364699a07652e47dede22

native/jni/src/bigram_dictionary.cpp

diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp
index 2c3d165..0c1aa70 100644
--- a/native/jni/src/bigram_dictionary.cpp
+++ b/native/jni/src/bigram_dictionary.cpp
@@ -38,7 +38,7 @@
 }
 
 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 @@
 
     // 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 @@
         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 @@
             const int frequency =
                     BinaryFormat::computeFrequencyForBigram(unigramFreq, bigramFreqTemp);
             if (addWordBigram(
-                    bigramBuffer, length, frequency, maxBigrams, bigramFreq, bigramChars)) {
+                    bigramBuffer, length, frequency, bigramFreq, bigramChars)) {
                 ++bigramCount;
             }
         }