nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small cleanups in binary_format.h 

Change-Id: I6049a2f312b7d53a3ffa688ddca5731004784ebe
main
Ken Wakasa 2013-01-30 23:44:22 +09:00
parent 99eae8e984
commit 5e21ac60b0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/jni/src/binary_format.h
View File

@ -18,9 +18,9 @@
#define LATINIME_BINARY_FORMAT_H #define LATINIME_BINARY_FORMAT_H
#include <cstdlib> #include <cstdlib>
#include <limits>
#include <map> #include <map>
#include <stdint.h> #include <stdint.h>
#include "bloom_filter.h" #include "bloom_filter.h"
#include "char_utils.h" #include "char_utils.h"
@ -66,8 +66,8 @@ class BinaryFormat {
static int detectFormat(const uint8_t *const dict); static int detectFormat(const uint8_t *const dict);
static int getHeaderSize(const uint8_t *const dict); static int getHeaderSize(const uint8_t *const dict);
static int getFlags(const uint8_t *const dict); static int getFlags(const uint8_t *const dict);
static void readHeaderValue(const uint8_t *const dict, const char *const key, static void readHeaderValue(const uint8_t *const dict, const char *const key, int *outValue,
int *outValue, const int outValueSize); const int outValueSize);
static int readHeaderValueInt(const uint8_t *const dict, const char *const key); static int readHeaderValueInt(const uint8_t *const dict, const char *const key);
static int getGroupCountAndForwardPointer(const uint8_t *const dict, int *pos); static int getGroupCountAndForwardPointer(const uint8_t *const dict, int *pos);
static uint8_t getFlagsAndForwardPointer(const uint8_t *const dict, int *pos); static uint8_t getFlagsAndForwardPointer(const uint8_t *const dict, int *pos);
@ -168,7 +168,7 @@ inline int BinaryFormat::getHeaderSize(const uint8_t *const dict) {
// See the format of the header in the comment in detectFormat() above // See the format of the header in the comment in detectFormat() above
return (dict[8] << 24) + (dict[9] << 16) + (dict[10] << 8) + dict[11]; return (dict[8] << 24) + (dict[9] << 16) + (dict[10] << 8) + dict[11];
default: default:
return std::numeric_limits<int>::max(); return S_INT_MAX;
} }
} }
@ -197,8 +197,7 @@ inline void BinaryFormat::readHeaderValue(const uint8_t *const dict, const char
if (codePoint == NOT_A_CODE_POINT && key[keyIndex] == 0) { if (codePoint == NOT_A_CODE_POINT && key[keyIndex] == 0) {
// We found the key! Copy and return the value. // We found the key! Copy and return the value.
codePoint = getCodePointAndForwardPointer(dict, &index); codePoint = getCodePointAndForwardPointer(dict, &index);
while (codePoint != NOT_A_CODE_POINT while (codePoint != NOT_A_CODE_POINT && outValueIndex < outValueSize) {
&& outValueIndex < outValueSize) {
outValue[outValueIndex++] = codePoint; outValue[outValueIndex++] = codePoint;
codePoint = getCodePointAndForwardPointer(dict, &index); codePoint = getCodePointAndForwardPointer(dict, &index);
} }
@ -664,9 +663,8 @@ inline int BinaryFormat::getProbability(const int position, const std::map<int,
if (bigramFreqIt != bigramMap->end()) { if (bigramFreqIt != bigramMap->end()) {
const int bigramFreq = bigramFreqIt->second; const int bigramFreq = bigramFreqIt->second;
return computeFrequencyForBigram(unigramFreq, bigramFreq); return computeFrequencyForBigram(unigramFreq, bigramFreq);
} else {
return backoff(unigramFreq);
} }
return backoff(unigramFreq);
} }
} // namespace latinime } // namespace latinime
#endif // LATINIME_BINARY_FORMAT_H #endif // LATINIME_BINARY_FORMAT_H