diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-06-27 17:31:09 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2012-06-27 17:31:09 +0900 |
| commit | 05efe576f976f5fa280f8d523f2935c15cbb9bd1 (patch) | |
| tree | 0ba2a270431128355e5c407e42e4aa6655770b24 /native/jni/src | |
| parent | c356df8e08581f7f9f92c15031b8dc3e46e9255a (diff) | |
| download | latinime-05efe576f976f5fa280f8d523f2935c15cbb9bd1.tar.gz latinime-05efe576f976f5fa280f8d523f2935c15cbb9bd1.tar.xz latinime-05efe576f976f5fa280f8d523f2935c15cbb9bd1.zip | |
Cleanup the dictionary type.
Stop storing an int in each of the different class types, and
just store a string in the top class.
Change-Id: I2af1832743e6fe78e5c1364f6d9cc21252bf5831
Diffstat (limited to 'native/jni/src')
| -rw-r--r-- | native/jni/src/dictionary.h | 4 | ||||
| -rw-r--r-- | native/jni/src/gesture/impl/gesture_decoder_impl.h | 2 | ||||
| -rw-r--r-- | native/jni/src/gesture/incremental_decoder_interface.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/native/jni/src/dictionary.h b/native/jni/src/dictionary.h index 708cb0909..8b4769431 100644 --- a/native/jni/src/dictionary.h +++ b/native/jni/src/dictionary.h @@ -36,14 +36,14 @@ class Dictionary { int getSuggestions(ProximityInfo *proximityInfo, int *xcoordinates, int *ycoordinates, int *times, int *pointerIds, int *codes, int codesSize, int *prevWordChars, - int prevWordLength, int commitPoint, bool isGesture, int dicTypeId, + int prevWordLength, int commitPoint, bool isGesture, bool useFullEditDistance, unsigned short *outWords, int *frequencies, int *spaceIndices) { int result = 0; if (isGesture) { mGestureDecoder->setPrevWord(prevWordChars, prevWordLength); result = mGestureDecoder->getSuggestions(proximityInfo, xcoordinates, ycoordinates, - times, pointerIds, codes, codesSize, commitPoint, dicTypeId == 1 /* main */, + times, pointerIds, codes, codesSize, commitPoint, outWords, frequencies, spaceIndices); } else { std::map<int, int> bigramMap; diff --git a/native/jni/src/gesture/impl/gesture_decoder_impl.h b/native/jni/src/gesture/impl/gesture_decoder_impl.h index be4e8b3c2..0ca89941c 100644 --- a/native/jni/src/gesture/impl/gesture_decoder_impl.h +++ b/native/jni/src/gesture/impl/gesture_decoder_impl.h @@ -30,7 +30,7 @@ class GestureDecoderImpl : public IncrementalDecoder { } int getSuggestions(ProximityInfo *pInfo, int *inputXs, int *inputYs, int *times, - int *pointerIds, int *codes, int inputSize, int commitPoint, bool isMainDict, + int *pointerIds, int *codes, int inputSize, int commitPoint, unsigned short *outWords, int *frequencies, int *outputIndices) { return 0; } diff --git a/native/jni/src/gesture/incremental_decoder_interface.h b/native/jni/src/gesture/incremental_decoder_interface.h index c5404a40c..565f89c90 100644 --- a/native/jni/src/gesture/incremental_decoder_interface.h +++ b/native/jni/src/gesture/incremental_decoder_interface.h @@ -28,7 +28,7 @@ class IncrementalDecoderInterface { public: virtual int getSuggestions(ProximityInfo *pInfo, int *inputXs, int *inputYs, int *times, - int *pointerIds, int *codes, int inputSize, int commitPoint, bool isMainDict, + int *pointerIds, int *codes, int inputSize, int commitPoint, unsigned short *outWords, int *frequencies, int *outputIndices) = 0; virtual void reset() = 0; virtual void setDict(const UnigramDictionary *dict, const BigramDictionary *bigram, |