commit b7d7c5a369cef80d4319de8e433501ab25b49615
author Jean Chalard <jchalard@google.com> Wed Jul 11 11:31:48 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Jul 12 11:16:30 2012 +0900
tree abb68897b773536366ff84aaaa3fd6f5e29f0d5e
parent 8f7f04fead0a7ce9cabaa6e4ed310d53510b5cd0

Make a constant really constant (A104)

Change-Id: Ied1f9f96a574b1e6a8ee0a71bfb1604d9c962e1c

native/jni/src/bigram_dictionary.cpp

diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp
index 3bfbfad..2c3d165 100644
--- a/native/jni/src/bigram_dictionary.cpp
+++ b/native/jni/src/bigram_dictionary.cpp
@@ -27,8 +27,8 @@
 
 namespace latinime {
 
-BigramDictionary::BigramDictionary(const unsigned char *dict, int maxWordLength)
-        : DICT(dict), MAX_WORD_LENGTH(maxWordLength) {
+BigramDictionary::BigramDictionary(const unsigned char *dict, int maxWordLength, int maxPredictions)
+        : DICT(dict), MAX_WORD_LENGTH(maxWordLength), MAX_PREDICTIONS(maxPredictions) {
     if (DEBUG_DICT) {
         AKLOGI("BigramDictionary - constructor");
     }

native/jni/src/bigram_dictionary.h

diff --git a/native/jni/src/bigram_dictionary.h b/native/jni/src/bigram_dictionary.h
index 5372276..fe5bd94 100644
--- a/native/jni/src/bigram_dictionary.h
+++ b/native/jni/src/bigram_dictionary.h
@@ -27,7 +27,7 @@
 class Dictionary;
 class BigramDictionary {
  public:
-    BigramDictionary(const unsigned char *dict, int maxWordLength);
+    BigramDictionary(const unsigned char *dict, int maxWordLength, int maxPredictions);
     int getBigrams(const int32_t *word, int length, int *inputCodes, int codesSize,
             unsigned short *outWords, int *frequencies, int maxWordLength, int maxBigrams) const;
     int getBigramListPositionForWord(const int32_t *prevWord, const int prevWordLength,
@@ -49,6 +49,7 @@
 
     const unsigned char *DICT;
     const int MAX_WORD_LENGTH;
+    const int MAX_PREDICTIONS;
     // TODO: Re-implement proximity correction for bigram correction
     static const int MAX_ALTERNATIVES = 1;
 };

native/jni/src/dictionary.cpp

diff --git a/native/jni/src/dictionary.cpp b/native/jni/src/dictionary.cpp
index 628a169..f3166e7 100644
--- a/native/jni/src/dictionary.cpp
+++ b/native/jni/src/dictionary.cpp
@@ -29,7 +29,7 @@
 // TODO: Change the type of all keyCodes to uint32_t
 Dictionary::Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust,
         int typedLetterMultiplier, int fullWordMultiplier,
-        int maxWordLength, int maxWords)
+        int maxWordLength, int maxWords, int maxPredictions)
     : mDict((unsigned char*) dict), mDictSize(dictSize),
       mMmapFd(mmapFd), mDictBufAdjust(dictBufAdjust) {
     if (DEBUG_DICT) {
@@ -43,7 +43,7 @@
     const unsigned int options = BinaryFormat::getFlags(mDict);
     mUnigramDictionary = new UnigramDictionary(mDict + headerSize, typedLetterMultiplier,
             fullWordMultiplier, maxWordLength, maxWords, options);
-    mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength);
+    mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength, maxPredictions);
     mGestureDecoder = new GestureDecoderWrapper(maxWordLength, maxWords);
     mGestureDecoder->setDict(mUnigramDictionary, mBigramDictionary,
             mDict + headerSize /* dict root */, 0 /* root pos */);

native/jni/src/dictionary.h

diff --git a/native/jni/src/dictionary.h b/native/jni/src/dictionary.h
index 431f103..6742b48 100644
--- a/native/jni/src/dictionary.h
+++ b/native/jni/src/dictionary.h
@@ -32,7 +32,7 @@
 class Dictionary {
  public:
     Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust, int typedLetterMultipler,
-            int fullWordMultiplier, int maxWordLength, int maxWords);
+            int fullWordMultiplier, int maxWordLength, int maxWords, int maxPredictions);
 
     int getSuggestions(ProximityInfo *proximityInfo, int *xcoordinates, int *ycoordinates,
             int *times, int *pointerIds, int *codes, int codesSize, int *prevWordChars,