From 5b0761e6a94227d6ef788f589fb6edcd44ed791f Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 6 Apr 2012 17:52:18 +0900 Subject: [PATCH] Remove write-only stuff Change-Id: I5ac8ab64c77a298502b3d063ea70db9b4da41716 --- native/jni/src/bigram_dictionary.cpp | 5 +---- native/jni/src/bigram_dictionary.h | 5 +---- native/jni/src/binary_format.h | 2 +- native/jni/src/dictionary.cpp | 9 +++------ native/jni/src/dictionary.h | 2 -- native/jni/src/unigram_dictionary.cpp | 4 +--- native/jni/src/unigram_dictionary.h | 4 +--- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index 8d6c3d179..926a0d44e 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -26,11 +26,8 @@ namespace latinime { BigramDictionary::BigramDictionary(const unsigned char *dict, int maxWordLength, - const bool isLatestDictVersion, const bool hasBigram, Dictionary *parentDictionary) - : DICT(dict), MAX_WORD_LENGTH(maxWordLength), - IS_LATEST_DICT_VERSION(isLatestDictVersion), - HAS_BIGRAM(hasBigram), mParentDictionary(parentDictionary) { + : DICT(dict), MAX_WORD_LENGTH(maxWordLength), mParentDictionary(parentDictionary) { if (DEBUG_DICT) { AKLOGI("BigramDictionary - constructor"); AKLOGI("Has Bigram : %d", hasBigram); diff --git a/native/jni/src/bigram_dictionary.h b/native/jni/src/bigram_dictionary.h index 8132fbc59..af89e3255 100644 --- a/native/jni/src/bigram_dictionary.h +++ b/native/jni/src/bigram_dictionary.h @@ -22,8 +22,7 @@ namespace latinime { class Dictionary; class BigramDictionary { public: - BigramDictionary(const unsigned char *dict, int maxWordLength, - const bool isLatestDictVersion, const bool hasBigram, Dictionary *parentDictionary); + BigramDictionary(const unsigned char *dict, int maxWordLength, Dictionary *parentDictionary); int getBigrams(unsigned short *word, int length, int *codes, int codesSize, unsigned short *outWords, int *frequencies, int maxWordLength, int maxBigrams); ~BigramDictionary(); @@ -40,8 +39,6 @@ class BigramDictionary { const int MAX_WORD_LENGTH; // TODO: Re-implement proximity correction for bigram correction static const int MAX_ALTERNATIVES = 1; - const bool IS_LATEST_DICT_VERSION; - const bool HAS_BIGRAM; Dictionary *mParentDictionary; int *mBigramFreq; diff --git a/native/jni/src/binary_format.h b/native/jni/src/binary_format.h index 2ac6e053f..16d57a6ce 100644 --- a/native/jni/src/binary_format.h +++ b/native/jni/src/binary_format.h @@ -81,7 +81,7 @@ inline int BinaryFormat::detectFormat(const uint8_t* const dict) { // Format 2 header is as follows: // Magic number (4 bytes) 0x9B 0xC1 0x3A 0xFE // Version number (2 bytes) 0x00 0x02 - // Options (2 bytes) must be 0x00 0x00 + // Options (2 bytes) // Header size (4 bytes) : integer, big endian return (dict[4] << 8) + dict[5]; default: diff --git a/native/jni/src/dictionary.cpp b/native/jni/src/dictionary.cpp index 981a983ee..9c13aa429 100644 --- a/native/jni/src/dictionary.cpp +++ b/native/jni/src/dictionary.cpp @@ -29,9 +29,7 @@ Dictionary::Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust, int typedLetterMultiplier, int fullWordMultiplier, int maxWordLength, int maxWords) : mDict((unsigned char*) dict), mDictSize(dictSize), - mMmapFd(mmapFd), mDictBufAdjust(dictBufAdjust), - // Checks whether it has the latest dictionary or the old dictionary - IS_LATEST_DICT_VERSION((((unsigned char*) dict)[0] & 0xFF) >= DICTIONARY_VERSION_MIN) { + mMmapFd(mmapFd), mDictBufAdjust(dictBufAdjust) { if (DEBUG_DICT) { if (MAX_WORD_LENGTH_INTERNAL < maxWordLength) { AKLOGI("Max word length (%d) is greater than %d", @@ -44,9 +42,8 @@ Dictionary::Dictionary(void *dict, int dictSize, int mmapFd, int dictBufAdjust, maxWords, SUB_QUEUE_MAX_WORDS, maxWordLength); const unsigned int headerSize = BinaryFormat::getHeaderSize(mDict); mUnigramDictionary = new UnigramDictionary(mDict + headerSize, typedLetterMultiplier, - fullWordMultiplier, maxWordLength, maxWords, IS_LATEST_DICT_VERSION); - mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength, - IS_LATEST_DICT_VERSION, true /* hasBigram */, this); + fullWordMultiplier, maxWordLength, maxWords); + mBigramDictionary = new BigramDictionary(mDict + headerSize, maxWordLength, this); } Dictionary::~Dictionary() { diff --git a/native/jni/src/dictionary.h b/native/jni/src/dictionary.h index 139d3f0d7..f026a9ef1 100644 --- a/native/jni/src/dictionary.h +++ b/native/jni/src/dictionary.h @@ -39,7 +39,6 @@ class Dictionary { codesSize, flags, outWords, frequencies); } - // TODO: Call mBigramDictionary instead of mUnigramDictionary int getBigrams(unsigned short *word, int length, int *codes, int codesSize, unsigned short *outWords, int *frequencies, int maxWordLength, int maxBigrams) { return mBigramDictionary->getBigrams(word, length, codes, codesSize, outWords, frequencies, @@ -68,7 +67,6 @@ class Dictionary { const int mMmapFd; const int mDictBufAdjust; - const bool IS_LATEST_DICT_VERSION; UnigramDictionary *mUnigramDictionary; BigramDictionary *mBigramDictionary; WordsPriorityQueuePool *mWordsPriorityQueuePool; diff --git a/native/jni/src/unigram_dictionary.cpp b/native/jni/src/unigram_dictionary.cpp index 50805ad87..ea10e58a7 100644 --- a/native/jni/src/unigram_dictionary.cpp +++ b/native/jni/src/unigram_dictionary.cpp @@ -40,10 +40,8 @@ const UnigramDictionary::digraph_t UnigramDictionary::FRENCH_LIGATURES_DIGRAPHS[ // TODO: check the header UnigramDictionary::UnigramDictionary(const uint8_t* const streamStart, int typedLetterMultiplier, - int fullWordMultiplier, int maxWordLength, int maxWords, - const bool isLatestDictVersion) + int fullWordMultiplier, int maxWordLength, int maxWords) : DICT_ROOT(streamStart), MAX_WORD_LENGTH(maxWordLength), MAX_WORDS(maxWords), - IS_LATEST_DICT_VERSION(isLatestDictVersion), TYPED_LETTER_MULTIPLIER(typedLetterMultiplier), FULL_WORD_MULTIPLIER(fullWordMultiplier), // TODO : remove this variable. ROOT_POS(0), diff --git a/native/jni/src/unigram_dictionary.h b/native/jni/src/unigram_dictionary.h index d501d5019..c61b02620 100644 --- a/native/jni/src/unigram_dictionary.h +++ b/native/jni/src/unigram_dictionary.h @@ -70,8 +70,7 @@ class UnigramDictionary { static const int MAX_ERRORS_FOR_TWO_WORDS = 1; UnigramDictionary(const uint8_t* const streamStart, int typedLetterMultipler, - int fullWordMultiplier, int maxWordLength, int maxWords, - const bool isLatestDictVersion); + int fullWordMultiplier, int maxWordLength, int maxWords); bool isValidWord(const uint16_t* const inWord, const int length) const; int getBigramPosition(int pos, unsigned short *word, int offset, int length) const; int getSuggestions(ProximityInfo *proximityInfo, WordsPriorityQueuePool *queuePool, @@ -139,7 +138,6 @@ class UnigramDictionary { const uint8_t* const DICT_ROOT; const int MAX_WORD_LENGTH; const int MAX_WORDS; - const bool IS_LATEST_DICT_VERSION; const int TYPED_LETTER_MULTIPLIER; const int FULL_WORD_MULTIPLIER; const int ROOT_POS;