2011-07-15 04:49:00 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <assert.h>
|
2011-10-03 10:21:13 +00:00
|
|
|
#include <ctype.h>
|
2012-01-12 09:44:40 +00:00
|
|
|
#include <math.h>
|
2011-07-15 04:49:00 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
#define LOG_TAG "LatinIME: correction.cpp"
|
2011-07-15 04:49:00 +00:00
|
|
|
|
2011-11-11 05:26:13 +00:00
|
|
|
#include "char_utils.h"
|
2011-08-10 05:30:10 +00:00
|
|
|
#include "correction.h"
|
2012-02-03 12:24:53 +00:00
|
|
|
#include "defines.h"
|
2011-08-11 16:05:27 +00:00
|
|
|
#include "dictionary.h"
|
2011-08-01 10:35:27 +00:00
|
|
|
#include "proximity_info.h"
|
2011-07-15 04:49:00 +00:00
|
|
|
|
|
|
|
namespace latinime {
|
|
|
|
|
2011-10-13 06:26:45 +00:00
|
|
|
/////////////////////////////
|
|
|
|
// edit distance funcitons //
|
|
|
|
/////////////////////////////
|
|
|
|
|
|
|
|
inline static void initEditDistance(int *editDistanceTable) {
|
|
|
|
for (int i = 0; i <= MAX_WORD_LENGTH_INTERNAL; ++i) {
|
|
|
|
editDistanceTable[i] = i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-17 06:58:23 +00:00
|
|
|
inline static void dumpEditDistance10ForDebug(int *editDistanceTable,
|
|
|
|
const int editDistanceTableWidth, const int outputLength) {
|
2011-12-16 14:15:06 +00:00
|
|
|
if (DEBUG_DICT) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("EditDistanceTable");
|
2011-12-16 14:15:06 +00:00
|
|
|
for (int i = 0; i <= 10; ++i) {
|
|
|
|
int c[11];
|
|
|
|
for (int j = 0; j <= 10; ++j) {
|
2012-01-17 06:58:23 +00:00
|
|
|
if (j < editDistanceTableWidth + 1 && i < outputLength + 1) {
|
|
|
|
c[j] = (editDistanceTable + i * (editDistanceTableWidth + 1))[j];
|
2011-12-16 14:15:06 +00:00
|
|
|
} else {
|
|
|
|
c[j] = -1;
|
|
|
|
}
|
|
|
|
}
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("[ %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d ]",
|
2011-12-16 14:15:06 +00:00
|
|
|
c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7], c[8], c[9], c[10]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-13 06:26:45 +00:00
|
|
|
inline static void calcEditDistanceOneStep(int *editDistanceTable, const unsigned short *input,
|
|
|
|
const int inputLength, const unsigned short *output, const int outputLength) {
|
2011-12-16 14:15:06 +00:00
|
|
|
// TODO: Make sure that editDistance[0 ~ MAX_WORD_LENGTH_INTERNAL] is not touched.
|
2011-10-13 06:26:45 +00:00
|
|
|
// Let dp[i][j] be editDistanceTable[i * (inputLength + 1) + j].
|
|
|
|
// Assuming that dp[0][0] ... dp[outputLength - 1][inputLength] are already calculated,
|
|
|
|
// and calculate dp[ouputLength][0] ... dp[outputLength][inputLength].
|
|
|
|
int *const current = editDistanceTable + outputLength * (inputLength + 1);
|
|
|
|
const int *const prev = editDistanceTable + (outputLength - 1) * (inputLength + 1);
|
|
|
|
const int *const prevprev =
|
2011-10-28 08:02:09 +00:00
|
|
|
outputLength >= 2 ? editDistanceTable + (outputLength - 2) * (inputLength + 1) : 0;
|
2011-10-13 06:26:45 +00:00
|
|
|
current[0] = outputLength;
|
2011-11-11 05:26:13 +00:00
|
|
|
const uint32_t co = toBaseLowerCase(output[outputLength - 1]);
|
|
|
|
const uint32_t prevCO = outputLength >= 2 ? toBaseLowerCase(output[outputLength - 2]) : 0;
|
2011-10-13 06:26:45 +00:00
|
|
|
for (int i = 1; i <= inputLength; ++i) {
|
2011-11-11 05:26:13 +00:00
|
|
|
const uint32_t ci = toBaseLowerCase(input[i - 1]);
|
2011-10-13 06:26:45 +00:00
|
|
|
const uint16_t cost = (ci == co) ? 0 : 1;
|
|
|
|
current[i] = min(current[i - 1] + 1, min(prev[i] + 1, prev[i - 1] + cost));
|
2011-11-11 05:26:13 +00:00
|
|
|
if (i >= 2 && prevprev && ci == prevCO && co == toBaseLowerCase(input[i - 2])) {
|
2011-10-13 06:26:45 +00:00
|
|
|
current[i] = min(current[i], prevprev[i - 2] + 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-17 06:58:23 +00:00
|
|
|
inline static int getCurrentEditDistance(int *editDistanceTable, const int editDistanceTableWidth,
|
|
|
|
const int outputLength, const int inputLength) {
|
2012-01-17 06:59:15 +00:00
|
|
|
if (DEBUG_EDIT_DISTANCE) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("getCurrentEditDistance %d, %d", inputLength, outputLength);
|
2011-12-16 14:15:06 +00:00
|
|
|
}
|
2012-01-17 06:58:23 +00:00
|
|
|
return editDistanceTable[(editDistanceTableWidth + 1) * (outputLength) + inputLength];
|
2011-10-13 06:26:45 +00:00
|
|
|
}
|
|
|
|
|
2011-08-04 09:31:57 +00:00
|
|
|
//////////////////////
|
|
|
|
// inline functions //
|
|
|
|
//////////////////////
|
|
|
|
static const char QUOTE = '\'';
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
inline bool Correction::isQuote(const unsigned short c) {
|
2011-08-04 09:31:57 +00:00
|
|
|
const unsigned short userTypedChar = mProximityInfo->getPrimaryCharAt(mInputIndex);
|
2011-08-05 12:21:01 +00:00
|
|
|
return (c == QUOTE && userTypedChar != QUOTE);
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
////////////////
|
|
|
|
// Correction //
|
|
|
|
////////////////
|
2011-08-04 09:31:57 +00:00
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
Correction::Correction(const int typedLetterMultiplier, const int fullWordMultiplier)
|
2011-08-01 10:35:27 +00:00
|
|
|
: TYPED_LETTER_MULTIPLIER(typedLetterMultiplier), FULL_WORD_MULTIPLIER(fullWordMultiplier) {
|
2011-10-13 06:26:45 +00:00
|
|
|
initEditDistance(mEditDistanceTable);
|
2011-07-15 04:49:00 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
void Correction::initCorrection(const ProximityInfo *pi, const int inputLength,
|
2011-08-04 09:31:57 +00:00
|
|
|
const int maxDepth) {
|
2011-07-15 04:49:00 +00:00
|
|
|
mProximityInfo = pi;
|
2011-08-01 10:35:27 +00:00
|
|
|
mInputLength = inputLength;
|
2011-08-04 09:31:57 +00:00
|
|
|
mMaxDepth = maxDepth;
|
|
|
|
mMaxEditDistance = mInputLength < 5 ? 2 : mInputLength / 2;
|
2011-12-16 14:15:06 +00:00
|
|
|
// TODO: This is not supposed to be required. Check what's going wrong with
|
|
|
|
// editDistance[0 ~ MAX_WORD_LENGTH_INTERNAL]
|
|
|
|
initEditDistance(mEditDistanceTable);
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 06:44:08 +00:00
|
|
|
void Correction::initCorrectionState(
|
|
|
|
const int rootPos, const int childCount, const bool traverseAll) {
|
2011-08-10 13:19:33 +00:00
|
|
|
latinime::initCorrectionState(mCorrectionStates, rootPos, childCount, traverseAll);
|
2011-08-11 07:27:28 +00:00
|
|
|
// TODO: remove
|
2011-08-17 08:55:16 +00:00
|
|
|
mCorrectionStates[0].mTransposedPos = mTransposedPos;
|
|
|
|
mCorrectionStates[0].mExcessivePos = mExcessivePos;
|
2011-08-11 07:27:28 +00:00
|
|
|
mCorrectionStates[0].mSkipPos = mSkipPos;
|
2011-08-10 06:44:08 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
void Correction::setCorrectionParams(const int skipPos, const int excessivePos,
|
2011-09-29 09:36:56 +00:00
|
|
|
const int transposedPos, const int spaceProximityPos, const int missingSpacePos,
|
2011-12-15 05:53:19 +00:00
|
|
|
const bool useFullEditDistance, const bool doAutoCompletion, const int maxErrors) {
|
2011-08-11 07:27:28 +00:00
|
|
|
// TODO: remove
|
2011-08-17 08:55:16 +00:00
|
|
|
mTransposedPos = transposedPos;
|
|
|
|
mExcessivePos = excessivePos;
|
2011-07-15 04:49:00 +00:00
|
|
|
mSkipPos = skipPos;
|
2011-08-11 07:27:28 +00:00
|
|
|
// TODO: remove
|
2011-08-17 08:55:16 +00:00
|
|
|
mCorrectionStates[0].mTransposedPos = transposedPos;
|
|
|
|
mCorrectionStates[0].mExcessivePos = excessivePos;
|
2011-08-11 07:27:28 +00:00
|
|
|
mCorrectionStates[0].mSkipPos = skipPos;
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2011-08-01 10:35:27 +00:00
|
|
|
mSpaceProximityPos = spaceProximityPos;
|
|
|
|
mMissingSpacePos = missingSpacePos;
|
2011-09-29 09:36:56 +00:00
|
|
|
mUseFullEditDistance = useFullEditDistance;
|
2011-12-14 12:38:11 +00:00
|
|
|
mDoAutoCompletion = doAutoCompletion;
|
2011-12-15 05:53:19 +00:00
|
|
|
mMaxErrors = maxErrors;
|
2011-07-15 04:49:00 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
void Correction::checkState() {
|
2011-07-15 04:49:00 +00:00
|
|
|
if (DEBUG_DICT) {
|
|
|
|
int inputCount = 0;
|
|
|
|
if (mSkipPos >= 0) ++inputCount;
|
|
|
|
if (mExcessivePos >= 0) ++inputCount;
|
|
|
|
if (mTransposedPos >= 0) ++inputCount;
|
|
|
|
// TODO: remove this assert
|
|
|
|
assert(inputCount <= 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-26 13:49:13 +00:00
|
|
|
int Correction::getFreqForSplitTwoWords(const int *freqArray, const int *wordLengthArray,
|
|
|
|
const bool isSpaceProximity, const unsigned short *word) {
|
|
|
|
return Correction::RankingAlgorithm::calcFreqForSplitTwoWords(freqArray, wordLengthArray, this,
|
|
|
|
isSpaceProximity, word);
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
int Correction::getFinalFreq(const int freq, unsigned short **word, int *wordLength) {
|
2012-01-17 06:58:23 +00:00
|
|
|
return getFinalFreqInternal(freq, word, wordLength, mInputLength);
|
|
|
|
}
|
|
|
|
|
|
|
|
int Correction::getFinalFreqForSubQueue(const int freq, unsigned short **word, int *wordLength,
|
|
|
|
const int inputLength) {
|
|
|
|
return getFinalFreqInternal(freq, word, wordLength, inputLength);
|
|
|
|
}
|
|
|
|
|
|
|
|
int Correction::getFinalFreqInternal(const int freq, unsigned short **word, int *wordLength,
|
|
|
|
const int inputLength) {
|
2011-08-05 12:21:01 +00:00
|
|
|
const int outputIndex = mTerminalOutputIndex;
|
|
|
|
const int inputIndex = mTerminalInputIndex;
|
2011-08-04 09:31:57 +00:00
|
|
|
*wordLength = outputIndex + 1;
|
Stop avoiding adding what the user typed to candidates
There does not seem to be any reason other than a historical
one to avoid doing this, but it takes processing power and
makes things more complicated.
This has a very limited impact on regression tests:
5 -> 3 [He, the]
5 -> 3 [An, an]
5 -> 3 [Where, where]
5 -> 3 [This, this]
7 -> 1 [wAtch, watch]
6 -> 4 [oveNs, oceans]
5 -> 1 [Ahere, Where]
7 -> 1 [Hast, Hast]
7 -> 5 [bjp, bill]
5 -> 1 [What, What]
5 -> 3 [Sound, So und]
7 -> 3 [causalities, casualties]
7 -> 3 [discontentment, discontent]
7 -> 3 [irregardless, regardless]
5 -> 1 : 2
5 -> 3 : 5
6 -> 4 : 1
7 -> 1 : 2
7 -> 3 : 3
7 -> 5 : 1
+1 4
-1 0
+2 0
-2 0
+3 8
-3 0
+4 1
-4 0
+5 1
-5 7
+6 0
-6 1
+7 0
-7 6
Change-Id: I6407cf922f27bbd3992df11d63690e71fc61111b
2012-01-16 09:48:19 +00:00
|
|
|
if (outputIndex < MIN_SUGGEST_DEPTH) {
|
|
|
|
return NOT_A_FREQUENCY;
|
2011-08-03 14:27:32 +00:00
|
|
|
}
|
2011-08-10 13:19:33 +00:00
|
|
|
|
2011-08-04 09:31:57 +00:00
|
|
|
*word = mWord;
|
2012-01-17 06:58:23 +00:00
|
|
|
int finalFreq = Correction::RankingAlgorithm::calculateFinalFreq(
|
|
|
|
inputIndex, outputIndex, freq, mEditDistanceTable, this, inputLength);
|
|
|
|
return finalFreq;
|
2011-08-02 17:19:44 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 06:44:08 +00:00
|
|
|
bool Correction::initProcessState(const int outputIndex) {
|
|
|
|
if (mCorrectionStates[outputIndex].mChildCount <= 0) {
|
|
|
|
return false;
|
|
|
|
}
|
2011-08-03 14:27:32 +00:00
|
|
|
mOutputIndex = outputIndex;
|
2011-08-10 06:44:08 +00:00
|
|
|
--(mCorrectionStates[outputIndex].mChildCount);
|
|
|
|
mInputIndex = mCorrectionStates[outputIndex].mInputIndex;
|
2011-08-10 13:19:33 +00:00
|
|
|
mNeedsToTraverseAllNodes = mCorrectionStates[outputIndex].mNeedsToTraverseAllNodes;
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2011-10-05 05:55:07 +00:00
|
|
|
mEquivalentCharCount = mCorrectionStates[outputIndex].mEquivalentCharCount;
|
2011-08-11 12:25:39 +00:00
|
|
|
mProximityCount = mCorrectionStates[outputIndex].mProximityCount;
|
2011-08-17 08:55:16 +00:00
|
|
|
mTransposedCount = mCorrectionStates[outputIndex].mTransposedCount;
|
|
|
|
mExcessiveCount = mCorrectionStates[outputIndex].mExcessiveCount;
|
2011-08-10 13:19:33 +00:00
|
|
|
mSkippedCount = mCorrectionStates[outputIndex].mSkippedCount;
|
2011-08-17 08:55:16 +00:00
|
|
|
mLastCharExceeded = mCorrectionStates[outputIndex].mLastCharExceeded;
|
|
|
|
|
|
|
|
mTransposedPos = mCorrectionStates[outputIndex].mTransposedPos;
|
|
|
|
mExcessivePos = mCorrectionStates[outputIndex].mExcessivePos;
|
2011-08-11 07:27:28 +00:00
|
|
|
mSkipPos = mCorrectionStates[outputIndex].mSkipPos;
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2011-08-10 13:19:33 +00:00
|
|
|
mMatching = false;
|
2011-08-17 08:55:16 +00:00
|
|
|
mProximityMatching = false;
|
2012-02-02 09:49:22 +00:00
|
|
|
mAdditionalProximityMatching = false;
|
2011-08-17 08:55:16 +00:00
|
|
|
mTransposing = false;
|
|
|
|
mExceeding = false;
|
|
|
|
mSkipping = false;
|
|
|
|
|
2011-08-10 06:44:08 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
int Correction::goDownTree(
|
|
|
|
const int parentIndex, const int childCount, const int firstChildPos) {
|
|
|
|
mCorrectionStates[mOutputIndex].mParentIndex = parentIndex;
|
|
|
|
mCorrectionStates[mOutputIndex].mChildCount = childCount;
|
|
|
|
mCorrectionStates[mOutputIndex].mSiblingPos = firstChildPos;
|
|
|
|
return mOutputIndex;
|
2011-08-02 17:19:44 +00:00
|
|
|
}
|
|
|
|
|
2011-08-03 14:27:32 +00:00
|
|
|
// TODO: remove
|
2011-08-10 05:30:10 +00:00
|
|
|
int Correction::getInputIndex() {
|
2011-08-03 14:27:32 +00:00
|
|
|
return mInputIndex;
|
2011-08-02 17:19:44 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
void Correction::incrementInputIndex() {
|
2011-08-03 14:27:32 +00:00
|
|
|
++mInputIndex;
|
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
void Correction::incrementOutputIndex() {
|
2011-08-03 14:27:32 +00:00
|
|
|
++mOutputIndex;
|
2011-08-10 06:44:08 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mParentIndex = mCorrectionStates[mOutputIndex - 1].mParentIndex;
|
|
|
|
mCorrectionStates[mOutputIndex].mChildCount = mCorrectionStates[mOutputIndex - 1].mChildCount;
|
|
|
|
mCorrectionStates[mOutputIndex].mSiblingPos = mCorrectionStates[mOutputIndex - 1].mSiblingPos;
|
|
|
|
mCorrectionStates[mOutputIndex].mInputIndex = mInputIndex;
|
2011-08-10 13:19:33 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mNeedsToTraverseAllNodes = mNeedsToTraverseAllNodes;
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2011-10-05 05:55:07 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mEquivalentCharCount = mEquivalentCharCount;
|
2011-08-11 12:25:39 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mProximityCount = mProximityCount;
|
2011-08-17 08:55:16 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mTransposedCount = mTransposedCount;
|
|
|
|
mCorrectionStates[mOutputIndex].mExcessiveCount = mExcessiveCount;
|
2011-08-10 13:19:33 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mSkippedCount = mSkippedCount;
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2011-08-11 07:27:28 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mSkipPos = mSkipPos;
|
2011-08-17 08:55:16 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mTransposedPos = mTransposedPos;
|
|
|
|
mCorrectionStates[mOutputIndex].mExcessivePos = mExcessivePos;
|
|
|
|
|
|
|
|
mCorrectionStates[mOutputIndex].mLastCharExceeded = mLastCharExceeded;
|
|
|
|
|
2011-08-10 13:19:33 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mMatching = mMatching;
|
2011-08-11 16:05:27 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mProximityMatching = mProximityMatching;
|
2012-02-02 09:49:22 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mAdditionalProximityMatching = mAdditionalProximityMatching;
|
2011-08-17 08:55:16 +00:00
|
|
|
mCorrectionStates[mOutputIndex].mTransposing = mTransposing;
|
|
|
|
mCorrectionStates[mOutputIndex].mExceeding = mExceeding;
|
|
|
|
mCorrectionStates[mOutputIndex].mSkipping = mSkipping;
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 13:19:33 +00:00
|
|
|
void Correction::startToTraverseAllNodes() {
|
|
|
|
mNeedsToTraverseAllNodes = true;
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
bool Correction::needsToPrune() const {
|
2011-10-13 06:26:45 +00:00
|
|
|
// TODO: use edit distance here
|
2011-12-14 12:38:11 +00:00
|
|
|
return mOutputIndex - 1 >= mMaxDepth || mProximityCount > mMaxEditDistance
|
|
|
|
// Allow one char longer word for missing character
|
2012-01-23 07:52:37 +00:00
|
|
|
|| (!mDoAutoCompletion && (mOutputIndex > mInputLength));
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
|
|
|
|
2011-10-13 06:26:45 +00:00
|
|
|
void Correction::addCharToCurrentWord(const int32_t c) {
|
|
|
|
mWord[mOutputIndex] = c;
|
|
|
|
const unsigned short *primaryInputWord = mProximityInfo->getPrimaryInputWord();
|
|
|
|
calcEditDistanceOneStep(mEditDistanceTable, primaryInputWord, mInputLength,
|
|
|
|
mWord, mOutputIndex + 1);
|
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
Correction::CorrectionType Correction::processSkipChar(
|
2011-08-19 13:05:59 +00:00
|
|
|
const int32_t c, const bool isTerminal, const bool inputIndexIncremented) {
|
2011-10-13 06:26:45 +00:00
|
|
|
addCharToCurrentWord(c);
|
2012-01-16 07:21:21 +00:00
|
|
|
mTerminalInputIndex = mInputIndex - (inputIndexIncremented ? 1 : 0);
|
|
|
|
mTerminalOutputIndex = mOutputIndex;
|
|
|
|
if (mNeedsToTraverseAllNodes && isTerminal) {
|
2011-08-05 12:21:01 +00:00
|
|
|
incrementOutputIndex();
|
|
|
|
return TRAVERSE_ALL_ON_TERMINAL;
|
|
|
|
} else {
|
|
|
|
incrementOutputIndex();
|
|
|
|
return TRAVERSE_ALL_NOT_ON_TERMINAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-16 07:21:21 +00:00
|
|
|
Correction::CorrectionType Correction::processUnrelatedCorrectionType() {
|
|
|
|
// Needs to set mTerminalInputIndex and mTerminalOutputIndex before returning any CorrectionType
|
|
|
|
mTerminalInputIndex = mInputIndex;
|
|
|
|
mTerminalOutputIndex = mOutputIndex;
|
|
|
|
return UNRELATED;
|
|
|
|
}
|
|
|
|
|
2011-09-28 03:59:43 +00:00
|
|
|
inline bool isEquivalentChar(ProximityInfo::ProximityType type) {
|
2011-10-05 05:55:07 +00:00
|
|
|
return type == ProximityInfo::EQUIVALENT_CHAR;
|
2011-09-28 03:59:43 +00:00
|
|
|
}
|
|
|
|
|
2012-02-02 09:49:22 +00:00
|
|
|
inline bool isProximityCharOrEquivalentChar(ProximityInfo::ProximityType type) {
|
|
|
|
return type == ProximityInfo::EQUIVALENT_CHAR
|
|
|
|
|| type == ProximityInfo::NEAR_PROXIMITY_CHAR;
|
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
Correction::CorrectionType Correction::processCharAndCalcState(
|
2011-08-04 09:31:57 +00:00
|
|
|
const int32_t c, const bool isTerminal) {
|
2011-08-24 07:30:36 +00:00
|
|
|
const int correctionCount = (mSkippedCount + mExcessiveCount + mTransposedCount);
|
2011-12-15 05:53:19 +00:00
|
|
|
if (correctionCount > mMaxErrors) {
|
2012-01-16 07:21:21 +00:00
|
|
|
return processUnrelatedCorrectionType();
|
2011-12-15 05:53:19 +00:00
|
|
|
}
|
|
|
|
|
2011-08-24 07:30:36 +00:00
|
|
|
// TODO: Change the limit if we'll allow two or more corrections
|
|
|
|
const bool noCorrectionsHappenedSoFar = correctionCount == 0;
|
|
|
|
const bool canTryCorrection = noCorrectionsHappenedSoFar;
|
2011-10-06 10:12:20 +00:00
|
|
|
int proximityIndex = 0;
|
|
|
|
mDistances[mOutputIndex] = NOT_A_DISTANCE;
|
2011-08-19 08:27:46 +00:00
|
|
|
|
2011-12-15 05:53:19 +00:00
|
|
|
// Skip checking this node
|
2011-08-19 08:27:46 +00:00
|
|
|
if (mNeedsToTraverseAllNodes || isQuote(c)) {
|
2011-08-19 13:05:59 +00:00
|
|
|
bool incremented = false;
|
|
|
|
if (mLastCharExceeded && mInputIndex == mInputLength - 1) {
|
|
|
|
// TODO: Do not check the proximity if EditDistance exceeds the threshold
|
2011-09-28 03:59:43 +00:00
|
|
|
const ProximityInfo::ProximityType matchId =
|
2011-10-06 10:12:20 +00:00
|
|
|
mProximityInfo->getMatchedProximityId(mInputIndex, c, true, &proximityIndex);
|
2011-09-28 03:59:43 +00:00
|
|
|
if (isEquivalentChar(matchId)) {
|
2011-08-19 13:05:59 +00:00
|
|
|
mLastCharExceeded = false;
|
|
|
|
--mExcessiveCount;
|
2011-10-06 10:12:20 +00:00
|
|
|
mDistances[mOutputIndex] =
|
|
|
|
mProximityInfo->getNormalizedSquaredDistance(mInputIndex, 0);
|
2011-08-19 13:05:59 +00:00
|
|
|
} else if (matchId == ProximityInfo::NEAR_PROXIMITY_CHAR) {
|
|
|
|
mLastCharExceeded = false;
|
|
|
|
--mExcessiveCount;
|
|
|
|
++mProximityCount;
|
2011-10-06 10:12:20 +00:00
|
|
|
mDistances[mOutputIndex] =
|
|
|
|
mProximityInfo->getNormalizedSquaredDistance(mInputIndex, proximityIndex);
|
2011-08-19 13:05:59 +00:00
|
|
|
}
|
|
|
|
incrementInputIndex();
|
|
|
|
incremented = true;
|
2011-08-19 09:22:28 +00:00
|
|
|
}
|
2011-08-19 13:05:59 +00:00
|
|
|
return processSkipChar(c, isTerminal, incremented);
|
2011-08-19 08:27:46 +00:00
|
|
|
}
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2011-12-15 05:53:19 +00:00
|
|
|
// Check possible corrections.
|
2011-08-17 08:55:16 +00:00
|
|
|
if (mExcessivePos >= 0) {
|
|
|
|
if (mExcessiveCount == 0 && mExcessivePos < mOutputIndex) {
|
2011-08-19 08:27:46 +00:00
|
|
|
mExcessivePos = mOutputIndex;
|
2011-08-17 08:55:16 +00:00
|
|
|
}
|
|
|
|
if (mExcessivePos < mInputLength - 1) {
|
2011-08-24 07:30:36 +00:00
|
|
|
mExceeding = mExcessivePos == mInputIndex && canTryCorrection;
|
2011-08-17 08:55:16 +00:00
|
|
|
}
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
|
|
|
|
2011-08-05 12:21:01 +00:00
|
|
|
if (mSkipPos >= 0) {
|
2011-08-11 07:27:28 +00:00
|
|
|
if (mSkippedCount == 0 && mSkipPos < mOutputIndex) {
|
|
|
|
if (DEBUG_DICT) {
|
|
|
|
assert(mSkipPos == mOutputIndex - 1);
|
|
|
|
}
|
2011-08-19 08:27:46 +00:00
|
|
|
mSkipPos = mOutputIndex;
|
2011-08-11 07:27:28 +00:00
|
|
|
}
|
2011-08-24 07:30:36 +00:00
|
|
|
mSkipping = mSkipPos == mOutputIndex && canTryCorrection;
|
2011-08-17 08:55:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mTransposedPos >= 0) {
|
|
|
|
if (mTransposedCount == 0 && mTransposedPos < mOutputIndex) {
|
2011-08-19 08:27:46 +00:00
|
|
|
mTransposedPos = mOutputIndex;
|
|
|
|
}
|
2011-08-17 08:55:16 +00:00
|
|
|
if (mTransposedPos < mInputLength - 1) {
|
2011-08-24 07:30:36 +00:00
|
|
|
mTransposing = mInputIndex == mTransposedPos && canTryCorrection;
|
2011-08-17 08:55:16 +00:00
|
|
|
}
|
2011-08-05 12:21:01 +00:00
|
|
|
}
|
|
|
|
|
2011-08-19 08:27:46 +00:00
|
|
|
bool secondTransposing = false;
|
|
|
|
if (mTransposedCount % 2 == 1) {
|
2011-09-28 03:59:43 +00:00
|
|
|
if (isEquivalentChar(mProximityInfo->getMatchedProximityId(mInputIndex - 1, c, false))) {
|
2011-08-19 08:27:46 +00:00
|
|
|
++mTransposedCount;
|
|
|
|
secondTransposing = true;
|
|
|
|
} else if (mCorrectionStates[mOutputIndex].mExceeding) {
|
|
|
|
--mTransposedCount;
|
|
|
|
++mExcessiveCount;
|
2011-08-19 13:05:59 +00:00
|
|
|
--mExcessivePos;
|
2011-08-19 08:27:46 +00:00
|
|
|
incrementInputIndex();
|
|
|
|
} else {
|
|
|
|
--mTransposedCount;
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
2011-08-19 13:05:59 +00:00
|
|
|
DUMP_WORD(mWord, mOutputIndex);
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("UNRELATED(0): %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
2011-08-19 13:05:59 +00:00
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
2012-01-16 07:21:21 +00:00
|
|
|
return processUnrelatedCorrectionType();
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
2011-08-19 08:27:46 +00:00
|
|
|
}
|
2011-08-04 09:31:57 +00:00
|
|
|
|
2011-08-24 07:30:36 +00:00
|
|
|
// TODO: Change the limit if we'll allow two or more proximity chars with corrections
|
2011-12-15 05:53:19 +00:00
|
|
|
// Work around: When the mMaxErrors is 1, we only allow just one error
|
|
|
|
// including proximity correction.
|
|
|
|
const bool checkProximityChars = (mMaxErrors > 1)
|
|
|
|
? (noCorrectionsHappenedSoFar || mProximityCount == 0)
|
|
|
|
: (noCorrectionsHappenedSoFar && mProximityCount == 0);
|
|
|
|
|
2011-10-06 03:24:59 +00:00
|
|
|
ProximityInfo::ProximityType matchedProximityCharId = secondTransposing
|
2011-10-05 05:55:07 +00:00
|
|
|
? ProximityInfo::EQUIVALENT_CHAR
|
2011-10-06 10:12:20 +00:00
|
|
|
: mProximityInfo->getMatchedProximityId(
|
|
|
|
mInputIndex, c, checkProximityChars, &proximityIndex);
|
2011-08-19 08:27:46 +00:00
|
|
|
|
2012-01-31 08:15:43 +00:00
|
|
|
if (ProximityInfo::UNRELATED_CHAR == matchedProximityCharId
|
|
|
|
|| ProximityInfo::ADDITIONAL_PROXIMITY_CHAR == matchedProximityCharId) {
|
2011-10-06 03:24:59 +00:00
|
|
|
if (canTryCorrection && mOutputIndex > 0
|
|
|
|
&& mCorrectionStates[mOutputIndex].mProximityMatching
|
2011-08-19 13:05:59 +00:00
|
|
|
&& mCorrectionStates[mOutputIndex].mExceeding
|
2011-09-28 03:59:43 +00:00
|
|
|
&& isEquivalentChar(mProximityInfo->getMatchedProximityId(
|
2011-10-06 03:24:59 +00:00
|
|
|
mInputIndex, mWord[mOutputIndex - 1], false))) {
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("CONVERSION p->e %c", mWord[mOutputIndex - 1]);
|
2011-10-06 03:24:59 +00:00
|
|
|
}
|
2011-08-24 07:30:36 +00:00
|
|
|
// Conversion p->e
|
2011-10-06 03:24:59 +00:00
|
|
|
// Example:
|
|
|
|
// wearth -> earth
|
|
|
|
// px -> (E)mmmmm
|
2011-08-19 13:05:59 +00:00
|
|
|
++mExcessiveCount;
|
|
|
|
--mProximityCount;
|
2011-10-06 03:24:59 +00:00
|
|
|
mExcessivePos = mOutputIndex - 1;
|
|
|
|
++mInputIndex;
|
|
|
|
// Here, we are doing something equivalent to matchedProximityCharId,
|
|
|
|
// but we already know that "excessive char correction" just happened
|
|
|
|
// so that we just need to check "mProximityCount == 0".
|
2011-10-06 10:12:20 +00:00
|
|
|
matchedProximityCharId = mProximityInfo->getMatchedProximityId(
|
|
|
|
mInputIndex, c, mProximityCount == 0, &proximityIndex);
|
2011-10-06 03:24:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-31 08:15:43 +00:00
|
|
|
if (ProximityInfo::UNRELATED_CHAR == matchedProximityCharId
|
|
|
|
|| ProximityInfo::ADDITIONAL_PROXIMITY_CHAR == matchedProximityCharId) {
|
2012-02-02 09:49:22 +00:00
|
|
|
if (ProximityInfo::ADDITIONAL_PROXIMITY_CHAR == matchedProximityCharId) {
|
|
|
|
mAdditionalProximityMatching = true;
|
|
|
|
}
|
2011-10-06 03:24:59 +00:00
|
|
|
// TODO: Optimize
|
|
|
|
// As the current char turned out to be an unrelated char,
|
|
|
|
// we will try other correction-types. Please note that mCorrectionStates[mOutputIndex]
|
|
|
|
// here refers to the previous state.
|
|
|
|
if (mInputIndex < mInputLength - 1 && mOutputIndex > 0 && mTransposedCount > 0
|
2011-08-19 13:05:59 +00:00
|
|
|
&& !mCorrectionStates[mOutputIndex].mTransposing
|
|
|
|
&& mCorrectionStates[mOutputIndex - 1].mTransposing
|
2011-09-28 03:59:43 +00:00
|
|
|
&& isEquivalentChar(mProximityInfo->getMatchedProximityId(
|
|
|
|
mInputIndex, mWord[mOutputIndex - 1], false))
|
|
|
|
&& isEquivalentChar(
|
|
|
|
mProximityInfo->getMatchedProximityId(mInputIndex + 1, c, false))) {
|
2011-08-24 07:30:36 +00:00
|
|
|
// Conversion t->e
|
2011-08-19 13:05:59 +00:00
|
|
|
// Example:
|
|
|
|
// occaisional -> occa sional
|
|
|
|
// mmmmttx -> mmmm(E)mmmmmm
|
|
|
|
mTransposedCount -= 2;
|
|
|
|
++mExcessiveCount;
|
|
|
|
++mInputIndex;
|
2011-08-24 07:30:36 +00:00
|
|
|
} else if (mOutputIndex > 0 && mInputIndex > 0 && mTransposedCount > 0
|
2011-08-19 13:05:59 +00:00
|
|
|
&& !mCorrectionStates[mOutputIndex].mTransposing
|
|
|
|
&& mCorrectionStates[mOutputIndex - 1].mTransposing
|
2011-09-28 03:59:43 +00:00
|
|
|
&& isEquivalentChar(
|
|
|
|
mProximityInfo->getMatchedProximityId(mInputIndex - 1, c, false))) {
|
2011-08-24 07:30:36 +00:00
|
|
|
// Conversion t->s
|
2011-08-19 13:05:59 +00:00
|
|
|
// Example:
|
|
|
|
// chcolate -> chocolate
|
|
|
|
// mmttx -> mmsmmmmmm
|
|
|
|
mTransposedCount -= 2;
|
|
|
|
++mSkippedCount;
|
|
|
|
--mInputIndex;
|
2011-08-24 07:30:36 +00:00
|
|
|
} else if (canTryCorrection && mInputIndex > 0
|
|
|
|
&& mCorrectionStates[mOutputIndex].mProximityMatching
|
|
|
|
&& mCorrectionStates[mOutputIndex].mSkipping
|
2011-09-28 03:59:43 +00:00
|
|
|
&& isEquivalentChar(
|
|
|
|
mProximityInfo->getMatchedProximityId(mInputIndex - 1, c, false))) {
|
2011-08-24 07:30:36 +00:00
|
|
|
// Conversion p->s
|
|
|
|
// Note: This logic tries saving cases like contrst --> contrast -- "a" is one of
|
|
|
|
// proximity chars of "s", but it should rather be handled as a skipped char.
|
|
|
|
++mSkippedCount;
|
|
|
|
--mProximityCount;
|
|
|
|
return processSkipChar(c, isTerminal, false);
|
2012-02-02 09:49:22 +00:00
|
|
|
} else if (mInputIndex - 1 < mInputLength
|
|
|
|
&& mSkippedCount > 0
|
|
|
|
&& mCorrectionStates[mOutputIndex].mSkipping
|
|
|
|
&& mCorrectionStates[mOutputIndex].mAdditionalProximityMatching
|
|
|
|
&& isProximityCharOrEquivalentChar(
|
|
|
|
mProximityInfo->getMatchedProximityId(mInputIndex + 1, c, false))) {
|
|
|
|
// Conversion s->a
|
|
|
|
incrementInputIndex();
|
|
|
|
--mSkippedCount;
|
|
|
|
mProximityMatching = true;
|
|
|
|
++mProximityCount;
|
|
|
|
mDistances[mOutputIndex] = ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO;
|
2011-08-24 07:30:36 +00:00
|
|
|
} else if ((mExceeding || mTransposing) && mInputIndex - 1 < mInputLength
|
2011-09-28 03:59:43 +00:00
|
|
|
&& isEquivalentChar(
|
|
|
|
mProximityInfo->getMatchedProximityId(mInputIndex + 1, c, false))) {
|
2011-08-24 07:30:36 +00:00
|
|
|
// 1.2. Excessive or transpose correction
|
2011-08-19 08:27:46 +00:00
|
|
|
if (mTransposing) {
|
|
|
|
++mTransposedCount;
|
2011-08-05 12:21:01 +00:00
|
|
|
} else {
|
2011-08-19 08:27:46 +00:00
|
|
|
++mExcessiveCount;
|
|
|
|
incrementInputIndex();
|
2011-08-05 12:21:01 +00:00
|
|
|
}
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
|
|
|
DUMP_WORD(mWord, mOutputIndex);
|
|
|
|
if (mTransposing) {
|
|
|
|
AKLOGI("TRANSPOSE: %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
} else {
|
|
|
|
AKLOGI("EXCEED: %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
|
|
|
}
|
2011-08-24 07:30:36 +00:00
|
|
|
} else if (mSkipping) {
|
|
|
|
// 3. Skip correction
|
2011-08-19 08:27:46 +00:00
|
|
|
++mSkippedCount;
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
|
|
|
AKLOGI("SKIP: %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
2011-08-19 13:05:59 +00:00
|
|
|
return processSkipChar(c, isTerminal, false);
|
2012-01-31 08:15:43 +00:00
|
|
|
} else if (ProximityInfo::ADDITIONAL_PROXIMITY_CHAR == matchedProximityCharId) {
|
|
|
|
// As a last resort, use additional proximity characters
|
|
|
|
mProximityMatching = true;
|
|
|
|
++mProximityCount;
|
|
|
|
mDistances[mOutputIndex] = ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO;
|
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
|
|
|
AKLOGI("ADDITIONALPROX: %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
2011-08-19 08:27:46 +00:00
|
|
|
} else {
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
2011-08-19 13:05:59 +00:00
|
|
|
DUMP_WORD(mWord, mOutputIndex);
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("UNRELATED(1): %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
2011-08-19 13:05:59 +00:00
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
2012-01-16 07:21:21 +00:00
|
|
|
return processUnrelatedCorrectionType();
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
2011-09-28 03:59:43 +00:00
|
|
|
} else if (secondTransposing) {
|
2011-08-19 08:27:46 +00:00
|
|
|
// If inputIndex is greater than mInputLength, that means there is no
|
|
|
|
// proximity chars. So, we don't need to check proximity.
|
|
|
|
mMatching = true;
|
2011-09-28 03:59:43 +00:00
|
|
|
} else if (isEquivalentChar(matchedProximityCharId)) {
|
|
|
|
mMatching = true;
|
2011-10-05 05:55:07 +00:00
|
|
|
++mEquivalentCharCount;
|
2011-10-06 10:12:20 +00:00
|
|
|
mDistances[mOutputIndex] = mProximityInfo->getNormalizedSquaredDistance(mInputIndex, 0);
|
2011-08-19 08:27:46 +00:00
|
|
|
} else if (ProximityInfo::NEAR_PROXIMITY_CHAR == matchedProximityCharId) {
|
|
|
|
mProximityMatching = true;
|
2011-09-28 03:59:43 +00:00
|
|
|
++mProximityCount;
|
2011-10-06 10:12:20 +00:00
|
|
|
mDistances[mOutputIndex] =
|
|
|
|
mProximityInfo->getNormalizedSquaredDistance(mInputIndex, proximityIndex);
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0
|
|
|
|
|| MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
|
|
|
AKLOGI("PROX: %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
2011-08-19 08:27:46 +00:00
|
|
|
}
|
2011-08-04 09:31:57 +00:00
|
|
|
|
2011-10-13 06:26:45 +00:00
|
|
|
addCharToCurrentWord(c);
|
2011-08-04 09:31:57 +00:00
|
|
|
|
2011-08-24 07:30:36 +00:00
|
|
|
// 4. Last char excessive correction
|
|
|
|
mLastCharExceeded = mExcessiveCount == 0 && mSkippedCount == 0 && mTransposedCount == 0
|
|
|
|
&& mProximityCount == 0 && (mInputIndex == mInputLength - 2);
|
2011-08-19 08:27:46 +00:00
|
|
|
const bool isSameAsUserTypedLength = (mInputLength == mInputIndex + 1) || mLastCharExceeded;
|
|
|
|
if (mLastCharExceeded) {
|
|
|
|
++mExcessiveCount;
|
|
|
|
}
|
2011-08-04 09:31:57 +00:00
|
|
|
|
2011-08-19 08:27:46 +00:00
|
|
|
// Start traversing all nodes after the index exceeds the user typed length
|
|
|
|
if (isSameAsUserTypedLength) {
|
|
|
|
startToTraverseAllNodes();
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
const bool needsToTryOnTerminalForTheLastPossibleExcessiveChar =
|
|
|
|
mExceeding && mInputIndex == mInputLength - 2;
|
|
|
|
|
2011-08-19 08:27:46 +00:00
|
|
|
// Finally, we are ready to go to the next character, the next "virtual node".
|
|
|
|
// We should advance the input index.
|
|
|
|
// We do this in this branch of the 'if traverseAllNodes' because we are still matching
|
|
|
|
// characters to input; the other branch is not matching them but searching for
|
|
|
|
// completions, this is why it does not have to do it.
|
|
|
|
incrementInputIndex();
|
2011-08-04 09:31:57 +00:00
|
|
|
// Also, the next char is one "virtual node" depth more than this char.
|
|
|
|
incrementOutputIndex();
|
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
if ((needsToTryOnTerminalForTheLastPossibleExcessiveChar
|
|
|
|
|| isSameAsUserTypedLength) && isTerminal) {
|
2011-08-19 08:27:46 +00:00
|
|
|
mTerminalInputIndex = mInputIndex - 1;
|
|
|
|
mTerminalOutputIndex = mOutputIndex - 1;
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == mInputLength)
|
|
|
|
&& (MIN_OUTPUT_INDEX_FOR_DEBUG <= 0 || MIN_OUTPUT_INDEX_FOR_DEBUG < mOutputIndex)) {
|
2011-10-06 03:24:59 +00:00
|
|
|
DUMP_WORD(mWord, mOutputIndex);
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("ONTERMINAL(1): %d, %d, %d, %d, %c", mProximityCount, mSkippedCount,
|
2011-10-06 03:24:59 +00:00
|
|
|
mTransposedCount, mExcessiveCount, c);
|
|
|
|
}
|
2011-08-19 08:27:46 +00:00
|
|
|
return ON_TERMINAL;
|
|
|
|
} else {
|
2012-01-16 07:21:21 +00:00
|
|
|
mTerminalInputIndex = mInputIndex - 1;
|
|
|
|
mTerminalOutputIndex = mOutputIndex - 1;
|
2011-08-19 08:27:46 +00:00
|
|
|
return NOT_ON_TERMINAL;
|
|
|
|
}
|
2011-08-04 09:31:57 +00:00
|
|
|
}
|
|
|
|
|
2011-08-10 05:30:10 +00:00
|
|
|
Correction::~Correction() {
|
2011-07-15 04:49:00 +00:00
|
|
|
}
|
|
|
|
|
2011-08-15 13:30:33 +00:00
|
|
|
inline static int getQuoteCount(const unsigned short* word, const int length) {
|
|
|
|
int quoteCount = 0;
|
|
|
|
for (int i = 0; i < length; ++i) {
|
|
|
|
if(word[i] == '\'') {
|
|
|
|
++quoteCount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return quoteCount;
|
|
|
|
}
|
|
|
|
|
2011-10-03 10:21:13 +00:00
|
|
|
inline static bool isUpperCase(unsigned short c) {
|
2012-02-06 12:51:31 +00:00
|
|
|
return isAsciiUpper(toBaseChar(c));
|
2011-10-03 10:21:13 +00:00
|
|
|
}
|
|
|
|
|
2011-08-01 10:35:27 +00:00
|
|
|
//////////////////////
|
|
|
|
// RankingAlgorithm //
|
|
|
|
//////////////////////
|
|
|
|
|
2011-08-10 13:19:33 +00:00
|
|
|
/* static */
|
2011-08-11 12:25:39 +00:00
|
|
|
int Correction::RankingAlgorithm::calculateFinalFreq(const int inputIndex, const int outputIndex,
|
2012-01-17 06:58:23 +00:00
|
|
|
const int freq, int* editDistanceTable, const Correction* correction,
|
|
|
|
const int inputLength) {
|
2011-08-10 05:30:10 +00:00
|
|
|
const int excessivePos = correction->getExcessivePos();
|
|
|
|
const int typedLetterMultiplier = correction->TYPED_LETTER_MULTIPLIER;
|
|
|
|
const int fullWordMultiplier = correction->FULL_WORD_MULTIPLIER;
|
|
|
|
const ProximityInfo *proximityInfo = correction->mProximityInfo;
|
2011-08-17 08:55:16 +00:00
|
|
|
const int skippedCount = correction->mSkippedCount;
|
2011-08-19 13:05:59 +00:00
|
|
|
const int transposedCount = correction->mTransposedCount / 2;
|
|
|
|
const int excessiveCount = correction->mExcessiveCount + correction->mTransposedCount % 2;
|
2011-08-11 16:05:27 +00:00
|
|
|
const int proximityMatchedCount = correction->mProximityCount;
|
2011-08-17 08:55:16 +00:00
|
|
|
const bool lastCharExceeded = correction->mLastCharExceeded;
|
2011-09-29 09:36:56 +00:00
|
|
|
const bool useFullEditDistance = correction->mUseFullEditDistance;
|
|
|
|
const int outputLength = outputIndex + 1;
|
2011-08-17 08:55:16 +00:00
|
|
|
if (skippedCount >= inputLength || inputLength == 0) {
|
2011-08-15 13:30:33 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
// TODO: find more robust way
|
|
|
|
bool sameLength = lastCharExceeded ? (inputLength == inputIndex + 2)
|
2011-08-17 08:55:16 +00:00
|
|
|
: (inputLength == inputIndex + 1);
|
2011-08-11 12:25:39 +00:00
|
|
|
|
|
|
|
// TODO: use mExcessiveCount
|
2011-08-19 13:05:59 +00:00
|
|
|
const int matchCount = inputLength - correction->mProximityCount - excessiveCount;
|
2011-08-11 12:25:39 +00:00
|
|
|
|
2011-08-10 13:19:33 +00:00
|
|
|
const unsigned short* word = correction->mWord;
|
2011-08-17 08:55:16 +00:00
|
|
|
const bool skipped = skippedCount > 0;
|
2011-08-11 16:05:27 +00:00
|
|
|
|
2012-01-17 06:58:23 +00:00
|
|
|
const int quoteDiffCount = max(0, getQuoteCount(word, outputLength)
|
2011-08-15 13:30:33 +00:00
|
|
|
- getQuoteCount(proximityInfo->getPrimaryInputWord(), inputLength));
|
2011-08-01 10:35:27 +00:00
|
|
|
|
2011-08-15 13:30:33 +00:00
|
|
|
// TODO: Calculate edit distance for transposed and excessive
|
|
|
|
int ed = 0;
|
2011-12-16 14:15:06 +00:00
|
|
|
if (DEBUG_DICT_FULL) {
|
2012-01-17 06:58:23 +00:00
|
|
|
dumpEditDistance10ForDebug(editDistanceTable, correction->mInputLength, outputLength);
|
2011-12-16 14:15:06 +00:00
|
|
|
}
|
2011-08-19 13:05:59 +00:00
|
|
|
int adjustedProximityMatchedCount = proximityMatchedCount;
|
|
|
|
|
|
|
|
int finalFreq = freq;
|
2011-08-17 08:55:16 +00:00
|
|
|
|
2012-02-02 09:49:22 +00:00
|
|
|
if (DEBUG_CORRECTION_FREQ
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == inputLength)) {
|
|
|
|
AKLOGI("FinalFreq0: %d", finalFreq);
|
|
|
|
}
|
2011-08-17 08:55:16 +00:00
|
|
|
// TODO: Optimize this.
|
2012-01-16 09:38:32 +00:00
|
|
|
if (transposedCount > 0 || proximityMatchedCount > 0 || skipped || excessiveCount > 0) {
|
2012-01-17 06:58:23 +00:00
|
|
|
ed = getCurrentEditDistance(editDistanceTable, correction->mInputLength, outputLength,
|
|
|
|
inputLength) - transposedCount;
|
2012-01-16 09:38:32 +00:00
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
const int matchWeight = powerIntCapped(typedLetterMultiplier,
|
2012-01-17 06:58:23 +00:00
|
|
|
max(inputLength, outputLength) - ed);
|
2011-08-19 13:05:59 +00:00
|
|
|
multiplyIntCapped(matchWeight, &finalFreq);
|
|
|
|
|
|
|
|
// TODO: Demote further if there are two or more excessive chars with longer user input?
|
2012-01-17 06:58:23 +00:00
|
|
|
if (inputLength > outputLength) {
|
2011-08-19 13:05:59 +00:00
|
|
|
multiplyRate(INPUT_EXCEEDS_OUTPUT_DEMOTION_RATE, &finalFreq);
|
2011-08-11 16:05:27 +00:00
|
|
|
}
|
2011-08-19 13:05:59 +00:00
|
|
|
|
2011-08-15 13:30:33 +00:00
|
|
|
ed = max(0, ed - quoteDiffCount);
|
2012-02-02 09:49:22 +00:00
|
|
|
adjustedProximityMatchedCount = min(max(0, ed - (outputLength - inputLength)),
|
|
|
|
proximityMatchedCount);
|
2012-01-16 09:38:32 +00:00
|
|
|
if (transposedCount < 1) {
|
2012-01-17 06:58:23 +00:00
|
|
|
if (ed == 1 && (inputLength == outputLength - 1 || inputLength == outputLength + 1)) {
|
2012-01-16 09:38:32 +00:00
|
|
|
// Promote a word with just one skipped or excessive char
|
|
|
|
if (sameLength) {
|
2012-02-02 09:49:22 +00:00
|
|
|
multiplyRate(WORDS_WITH_JUST_ONE_CORRECTION_PROMOTION_RATE
|
|
|
|
+ WORDS_WITH_JUST_ONE_CORRECTION_PROMOTION_MULTIPLIER * outputLength,
|
|
|
|
&finalFreq);
|
2012-01-16 09:38:32 +00:00
|
|
|
} else {
|
|
|
|
multiplyIntCapped(typedLetterMultiplier, &finalFreq);
|
|
|
|
}
|
|
|
|
} else if (ed == 0) {
|
2011-08-19 13:05:59 +00:00
|
|
|
multiplyIntCapped(typedLetterMultiplier, &finalFreq);
|
2012-01-16 09:38:32 +00:00
|
|
|
sameLength = true;
|
2011-08-19 13:05:59 +00:00
|
|
|
}
|
|
|
|
}
|
2011-08-15 13:30:33 +00:00
|
|
|
} else {
|
2011-08-19 13:05:59 +00:00
|
|
|
const int matchWeight = powerIntCapped(typedLetterMultiplier, matchCount);
|
|
|
|
multiplyIntCapped(matchWeight, &finalFreq);
|
2011-08-11 16:05:27 +00:00
|
|
|
}
|
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
if (proximityInfo->getMatchedProximityId(0, word[0], true)
|
|
|
|
== ProximityInfo::UNRELATED_CHAR) {
|
|
|
|
multiplyRate(FIRST_CHAR_DIFFERENT_DEMOTION_RATE, &finalFreq);
|
|
|
|
}
|
2011-08-15 13:30:33 +00:00
|
|
|
|
|
|
|
///////////////////////////////////////////////
|
|
|
|
// Promotion and Demotion for each correction
|
2011-08-11 16:05:27 +00:00
|
|
|
|
2011-08-15 13:30:33 +00:00
|
|
|
// Demotion for a word with missing character
|
2011-08-11 12:25:39 +00:00
|
|
|
if (skipped) {
|
2011-08-15 13:30:33 +00:00
|
|
|
const int demotionRate = WORDS_WITH_MISSING_CHARACTER_DEMOTION_RATE
|
|
|
|
* (10 * inputLength - WORDS_WITH_MISSING_CHARACTER_DEMOTION_START_POS_10X)
|
|
|
|
/ (10 * inputLength
|
|
|
|
- WORDS_WITH_MISSING_CHARACTER_DEMOTION_START_POS_10X + 10);
|
|
|
|
if (DEBUG_DICT_FULL) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("Demotion rate for missing character is %d.", demotionRate);
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
2011-08-15 13:30:33 +00:00
|
|
|
multiplyRate(demotionRate, &finalFreq);
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
2011-08-15 13:30:33 +00:00
|
|
|
|
|
|
|
// Demotion for a word with transposed character
|
2011-08-19 13:05:59 +00:00
|
|
|
if (transposedCount > 0) multiplyRate(
|
2011-08-01 10:35:27 +00:00
|
|
|
WORDS_WITH_TRANSPOSED_CHARACTERS_DEMOTION_RATE, &finalFreq);
|
2011-08-15 13:30:33 +00:00
|
|
|
|
|
|
|
// Demotion for a word with excessive character
|
2011-08-19 13:05:59 +00:00
|
|
|
if (excessiveCount > 0) {
|
2011-08-01 10:35:27 +00:00
|
|
|
multiplyRate(WORDS_WITH_EXCESSIVE_CHARACTER_DEMOTION_RATE, &finalFreq);
|
2011-08-19 13:05:59 +00:00
|
|
|
if (!lastCharExceeded && !proximityInfo->existsAdjacentProximityChars(excessivePos)) {
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_DICT_FULL) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("Double excessive demotion");
|
2011-08-19 13:05:59 +00:00
|
|
|
}
|
2011-08-01 10:35:27 +00:00
|
|
|
// If an excessive character is not adjacent to the left char or the right char,
|
|
|
|
// we will demote this word.
|
|
|
|
multiplyRate(WORDS_WITH_EXCESSIVE_CHARACTER_OUT_OF_PROXIMITY_DEMOTION_RATE, &finalFreq);
|
|
|
|
}
|
|
|
|
}
|
2011-08-15 13:30:33 +00:00
|
|
|
|
2012-01-31 08:15:43 +00:00
|
|
|
const bool performTouchPositionCorrection =
|
|
|
|
CALIBRATE_SCORE_BY_TOUCH_COORDINATES && proximityInfo->touchPositionCorrectionEnabled()
|
|
|
|
&& skippedCount == 0 && excessiveCount == 0 && transposedCount == 0;
|
2011-10-06 10:12:20 +00:00
|
|
|
// Score calibration by touch coordinates is being done only for pure-fat finger typing error
|
|
|
|
// cases.
|
2012-02-02 09:49:22 +00:00
|
|
|
int additionalProximityCount = 0;
|
2011-10-06 10:12:20 +00:00
|
|
|
// TODO: Remove this constraint.
|
2012-02-02 09:58:12 +00:00
|
|
|
if (performTouchPositionCorrection) {
|
|
|
|
for (int i = 0; i < outputLength; ++i) {
|
|
|
|
const int squaredDistance = correction->mDistances[i];
|
|
|
|
if (i < adjustedProximityMatchedCount) {
|
|
|
|
multiplyIntCapped(typedLetterMultiplier, &finalFreq);
|
|
|
|
}
|
|
|
|
if (squaredDistance >= 0) {
|
|
|
|
// Promote or demote the score according to the distance from the sweet spot
|
|
|
|
static const float A = ZERO_DISTANCE_PROMOTION_RATE / 100.0f;
|
|
|
|
static const float B = 1.0f;
|
|
|
|
static const float C = 0.5f;
|
|
|
|
static const float MIN = 0.3f;
|
|
|
|
static const float R1 = NEUTRAL_SCORE_SQUARED_RADIUS;
|
|
|
|
static const float R2 = HALF_SCORE_SQUARED_RADIUS;
|
|
|
|
const float x = (float)squaredDistance
|
|
|
|
/ ProximityInfo::NORMALIZED_SQUARED_DISTANCE_SCALING_FACTOR;
|
|
|
|
const float factor = max((x < R1)
|
|
|
|
? (A * (R1 - x) + B * x) / R1
|
|
|
|
: (B * (R2 - x) + C * (x - R1)) / (R2 - R1), MIN);
|
|
|
|
// factor is piecewise linear function like:
|
|
|
|
// A -_ .
|
|
|
|
// ^-_ .
|
|
|
|
// B \ .
|
|
|
|
// \_ .
|
|
|
|
// C ------------.
|
|
|
|
// .
|
|
|
|
// 0 R1 R2 .
|
|
|
|
multiplyRate((int)(factor * 100), &finalFreq);
|
|
|
|
} else if (squaredDistance == PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO) {
|
|
|
|
multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);
|
|
|
|
} else if (squaredDistance == ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO) {
|
2012-02-02 09:49:22 +00:00
|
|
|
++additionalProximityCount;
|
2012-02-02 09:58:12 +00:00
|
|
|
multiplyRate(WORDS_WITH_ADDITIONAL_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);
|
|
|
|
}
|
2012-01-31 08:15:43 +00:00
|
|
|
}
|
2012-02-02 09:58:12 +00:00
|
|
|
} else {
|
|
|
|
// Demote additional proximity characters
|
|
|
|
for (int i = 0; i < outputLength; ++i) {
|
|
|
|
const int squaredDistance = correction->mDistances[i];
|
|
|
|
if (squaredDistance == ADDITIONAL_PROXIMITY_CHAR_DISTANCE_INFO) {
|
|
|
|
++additionalProximityCount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Promotion for a word with proximity characters
|
|
|
|
for (int i = 0; i < adjustedProximityMatchedCount; ++i) {
|
|
|
|
// A word with proximity corrections
|
|
|
|
if (DEBUG_DICT_FULL) {
|
|
|
|
AKLOGI("Found a proximity correction.");
|
|
|
|
}
|
|
|
|
multiplyIntCapped(typedLetterMultiplier, &finalFreq);
|
|
|
|
if (i < additionalProximityCount) {
|
|
|
|
multiplyRate(WORDS_WITH_ADDITIONAL_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);
|
|
|
|
} else {
|
|
|
|
multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &finalFreq);
|
|
|
|
}
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
2011-09-30 09:08:28 +00:00
|
|
|
}
|
|
|
|
|
2012-02-02 09:49:22 +00:00
|
|
|
// If the user types too many(three or more) proximity characters with additional proximity
|
|
|
|
// character,do not treat as the same length word.
|
|
|
|
if (sameLength && additionalProximityCount > 0 && (adjustedProximityMatchedCount >= 3
|
|
|
|
|| transposedCount > 0 || skipped || excessiveCount > 0)) {
|
|
|
|
sameLength = false;
|
|
|
|
}
|
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
const int errorCount = adjustedProximityMatchedCount > 0
|
|
|
|
? adjustedProximityMatchedCount
|
|
|
|
: (proximityMatchedCount + transposedCount);
|
2011-08-15 13:30:33 +00:00
|
|
|
multiplyRate(
|
|
|
|
100 - CORRECTION_COUNT_RATE_DEMOTION_RATE_BASE * errorCount / inputLength, &finalFreq);
|
|
|
|
|
|
|
|
// Promotion for an exactly matched word
|
2011-08-19 13:05:59 +00:00
|
|
|
if (ed == 0) {
|
2011-08-15 13:30:33 +00:00
|
|
|
// Full exact match
|
2012-01-17 06:58:23 +00:00
|
|
|
if (sameLength && transposedCount == 0 && !skipped && excessiveCount == 0
|
2012-02-02 09:49:22 +00:00
|
|
|
&& quoteDiffCount == 0 && additionalProximityCount == 0) {
|
2011-08-15 13:30:33 +00:00
|
|
|
finalFreq = capped255MultForFullMatchAccentsOrCapitalizationDifference(finalFreq);
|
|
|
|
}
|
2011-08-01 10:35:27 +00:00
|
|
|
}
|
2011-08-10 13:19:33 +00:00
|
|
|
|
2011-08-15 13:30:33 +00:00
|
|
|
// Promote a word with no correction
|
2012-02-02 09:49:22 +00:00
|
|
|
if (proximityMatchedCount == 0 && transposedCount == 0 && !skipped && excessiveCount == 0
|
|
|
|
&& additionalProximityCount == 0) {
|
2011-08-15 13:30:33 +00:00
|
|
|
multiplyRate(FULL_MATCHED_WORDS_PROMOTION_RATE, &finalFreq);
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: Check excessive count and transposed count
|
|
|
|
// TODO: Remove this if possible
|
2011-08-10 13:19:33 +00:00
|
|
|
/*
|
2011-08-15 13:30:33 +00:00
|
|
|
If the last character of the user input word is the same as the next character
|
|
|
|
of the output word, and also all of characters of the user input are matched
|
|
|
|
to the output word, we'll promote that word a bit because
|
|
|
|
that word can be considered the combination of skipped and matched characters.
|
|
|
|
This means that the 'sm' pattern wins over the 'ma' pattern.
|
|
|
|
e.g.)
|
|
|
|
shel -> shell [mmmma] or [mmmsm]
|
|
|
|
hel -> hello [mmmaa] or [mmsma]
|
|
|
|
m ... matching
|
|
|
|
s ... skipping
|
|
|
|
a ... traversing all
|
2011-08-24 07:30:36 +00:00
|
|
|
t ... transposing
|
|
|
|
e ... exceeding
|
|
|
|
p ... proximity matching
|
2011-08-10 13:19:33 +00:00
|
|
|
*/
|
2011-08-11 12:25:39 +00:00
|
|
|
if (matchCount == inputLength && matchCount >= 2 && !skipped
|
2011-08-10 13:19:33 +00:00
|
|
|
&& word[matchCount] == word[matchCount - 1]) {
|
|
|
|
multiplyRate(WORDS_WITH_MATCH_SKIP_PROMOTION_RATE, &finalFreq);
|
|
|
|
}
|
|
|
|
|
2011-08-19 13:05:59 +00:00
|
|
|
// TODO: Do not use sameLength?
|
2011-08-15 13:30:33 +00:00
|
|
|
if (sameLength) {
|
|
|
|
multiplyIntCapped(fullWordMultiplier, &finalFreq);
|
|
|
|
}
|
|
|
|
|
2011-09-29 09:36:56 +00:00
|
|
|
if (useFullEditDistance && outputLength > inputLength + 1) {
|
|
|
|
const int diff = outputLength - inputLength - 1;
|
|
|
|
const int divider = diff < 31 ? 1 << diff : S_INT_MAX;
|
|
|
|
finalFreq = divider > finalFreq ? 1 : finalFreq / divider;
|
|
|
|
}
|
|
|
|
|
2011-08-15 13:30:33 +00:00
|
|
|
if (DEBUG_DICT_FULL) {
|
2012-01-17 06:58:23 +00:00
|
|
|
AKLOGI("calc: %d, %d", outputLength, sameLength);
|
2011-08-15 13:30:33 +00:00
|
|
|
}
|
|
|
|
|
2012-01-31 08:15:43 +00:00
|
|
|
if (DEBUG_CORRECTION_FREQ
|
|
|
|
&& (INPUTLENGTH_FOR_DEBUG <= 0 || INPUTLENGTH_FOR_DEBUG == inputLength)) {
|
2012-02-02 09:49:22 +00:00
|
|
|
DUMP_WORD(proximityInfo->getPrimaryInputWord(), inputLength);
|
2012-01-17 06:58:23 +00:00
|
|
|
DUMP_WORD(correction->mWord, outputLength);
|
2012-02-02 09:49:22 +00:00
|
|
|
AKLOGI("FinalFreq: [P%d, S%d, T%d, E%d, A%d] %d, %d, %d, %d, %d, %d", proximityMatchedCount,
|
|
|
|
skippedCount, transposedCount, excessiveCount, additionalProximityCount,
|
|
|
|
outputLength, lastCharExceeded, sameLength, quoteDiffCount, ed, finalFreq);
|
2011-08-19 13:05:59 +00:00
|
|
|
}
|
|
|
|
|
2011-08-01 10:35:27 +00:00
|
|
|
return finalFreq;
|
|
|
|
}
|
|
|
|
|
2011-08-10 13:19:33 +00:00
|
|
|
/* static */
|
2011-08-10 05:30:10 +00:00
|
|
|
int Correction::RankingAlgorithm::calcFreqForSplitTwoWords(
|
2012-01-26 13:49:13 +00:00
|
|
|
const int *freqArray, const int *wordLengthArray, const Correction* correction,
|
|
|
|
const bool isSpaceProximity, const unsigned short *word) {
|
|
|
|
const int firstFreq = freqArray[0];
|
|
|
|
const int secondFreq = freqArray[1];
|
|
|
|
const int firstWordLength = wordLengthArray[0];
|
|
|
|
const int secondWordLength = wordLengthArray[1];
|
2012-01-17 06:59:15 +00:00
|
|
|
const int typedLetterMultiplier = correction->TYPED_LETTER_MULTIPLIER;
|
|
|
|
|
|
|
|
bool firstCapitalizedWordDemotion = false;
|
|
|
|
if (firstWordLength >= 2) {
|
|
|
|
firstCapitalizedWordDemotion = isUpperCase(word[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool secondCapitalizedWordDemotion = false;
|
|
|
|
if (secondWordLength >= 2) {
|
|
|
|
secondCapitalizedWordDemotion = isUpperCase(word[firstWordLength + 1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
const bool capitalizedWordDemotion =
|
|
|
|
firstCapitalizedWordDemotion ^ secondCapitalizedWordDemotion;
|
|
|
|
|
|
|
|
if (firstWordLength == 0 || secondWordLength == 0) {
|
|
|
|
return 0;
|
|
|
|
}
|
2012-01-17 06:58:23 +00:00
|
|
|
const int firstDemotionRate = 100 - TWO_WORDS_CORRECTION_DEMOTION_BASE / (firstWordLength + 1);
|
2012-01-17 06:59:15 +00:00
|
|
|
int tempFirstFreq = firstFreq;
|
|
|
|
multiplyRate(firstDemotionRate, &tempFirstFreq);
|
|
|
|
|
2012-01-17 06:58:23 +00:00
|
|
|
const int secondDemotionRate = 100
|
|
|
|
- TWO_WORDS_CORRECTION_DEMOTION_BASE / (secondWordLength + 1);
|
2012-01-17 06:59:15 +00:00
|
|
|
int tempSecondFreq = secondFreq;
|
|
|
|
multiplyRate(secondDemotionRate, &tempSecondFreq);
|
|
|
|
|
|
|
|
const int totalLength = firstWordLength + secondWordLength;
|
|
|
|
|
|
|
|
// Promote pairFreq with multiplying by 2, because the word length is the same as the typed
|
|
|
|
// length.
|
|
|
|
int totalFreq = tempFirstFreq + tempSecondFreq;
|
|
|
|
|
|
|
|
// This is a workaround to try offsetting the not-enough-demotion which will be done in
|
|
|
|
// calcNormalizedScore in Utils.java.
|
|
|
|
// In calcNormalizedScore the score will be demoted by (1 - 1 / length)
|
|
|
|
// but we demoted only (1 - 1 / (length + 1)) so we will additionally adjust freq by
|
|
|
|
// (1 - 1 / length) / (1 - 1 / (length + 1)) = (1 - 1 / (length * length))
|
|
|
|
const int normalizedScoreNotEnoughDemotionAdjustment = 100 - 100 / (totalLength * totalLength);
|
|
|
|
multiplyRate(normalizedScoreNotEnoughDemotionAdjustment, &totalFreq);
|
|
|
|
|
|
|
|
// At this moment, totalFreq is calculated by the following formula:
|
|
|
|
// (firstFreq * (1 - 1 / (firstWordLength + 1)) + secondFreq * (1 - 1 / (secondWordLength + 1)))
|
|
|
|
// * (1 - 1 / totalLength) / (1 - 1 / (totalLength + 1))
|
|
|
|
|
|
|
|
multiplyIntCapped(powerIntCapped(typedLetterMultiplier, totalLength), &totalFreq);
|
|
|
|
|
|
|
|
// This is another workaround to offset the demotion which will be done in
|
|
|
|
// calcNormalizedScore in Utils.java.
|
|
|
|
// In calcNormalizedScore the score will be demoted by (1 - 1 / length) so we have to promote
|
|
|
|
// the same amount because we already have adjusted the synthetic freq of this "missing or
|
|
|
|
// mistyped space" suggestion candidate above in this method.
|
|
|
|
const int normalizedScoreDemotionRateOffset = (100 + 100 / totalLength);
|
|
|
|
multiplyRate(normalizedScoreDemotionRateOffset, &totalFreq);
|
|
|
|
|
|
|
|
if (isSpaceProximity) {
|
|
|
|
// A word pair with one space proximity correction
|
|
|
|
if (DEBUG_DICT) {
|
|
|
|
AKLOGI("Found a word pair with space proximity correction.");
|
|
|
|
}
|
|
|
|
multiplyIntCapped(typedLetterMultiplier, &totalFreq);
|
|
|
|
multiplyRate(WORDS_WITH_PROXIMITY_CHARACTER_DEMOTION_RATE, &totalFreq);
|
|
|
|
}
|
|
|
|
|
2012-01-23 07:52:37 +00:00
|
|
|
if (isSpaceProximity) {
|
|
|
|
multiplyRate(WORDS_WITH_MISTYPED_SPACE_DEMOTION_RATE, &totalFreq);
|
|
|
|
} else {
|
|
|
|
multiplyRate(WORDS_WITH_MISSING_SPACE_CHARACTER_DEMOTION_RATE, &totalFreq);
|
|
|
|
}
|
2012-01-17 06:59:15 +00:00
|
|
|
|
|
|
|
if (capitalizedWordDemotion) {
|
|
|
|
multiplyRate(TWO_WORDS_CAPITALIZED_DEMOTION_RATE, &totalFreq);
|
|
|
|
}
|
|
|
|
|
2012-01-30 04:53:58 +00:00
|
|
|
if (DEBUG_CORRECTION_FREQ) {
|
|
|
|
AKLOGI("Two words (%d, %d) (%d, %d) %d, %d", firstFreq, secondFreq, firstWordLength,
|
|
|
|
secondWordLength, capitalizedWordDemotion, totalFreq);
|
|
|
|
DUMP_WORD(word, firstWordLength);
|
|
|
|
}
|
|
|
|
|
2012-01-17 06:59:15 +00:00
|
|
|
return totalFreq;
|
|
|
|
}
|
|
|
|
|
2012-01-12 09:44:40 +00:00
|
|
|
/* Damerau-Levenshtein distance */
|
|
|
|
inline static int editDistanceInternal(
|
|
|
|
int* editDistanceTable, const unsigned short* before,
|
|
|
|
const int beforeLength, const unsigned short* after, const int afterLength) {
|
2011-12-15 05:53:19 +00:00
|
|
|
// dp[li][lo] dp[a][b] = dp[ a * lo + b]
|
|
|
|
int* dp = editDistanceTable;
|
2012-01-12 09:44:40 +00:00
|
|
|
const int li = beforeLength + 1;
|
|
|
|
const int lo = afterLength + 1;
|
2011-12-15 05:53:19 +00:00
|
|
|
for (int i = 0; i < li; ++i) {
|
|
|
|
dp[lo * i] = i;
|
|
|
|
}
|
|
|
|
for (int i = 0; i < lo; ++i) {
|
|
|
|
dp[i] = i;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < li - 1; ++i) {
|
|
|
|
for (int j = 0; j < lo - 1; ++j) {
|
2012-01-12 09:44:40 +00:00
|
|
|
const uint32_t ci = toBaseLowerCase(before[i]);
|
|
|
|
const uint32_t co = toBaseLowerCase(after[j]);
|
2011-12-15 05:53:19 +00:00
|
|
|
const uint16_t cost = (ci == co) ? 0 : 1;
|
|
|
|
dp[(i + 1) * lo + (j + 1)] = min(dp[i * lo + (j + 1)] + 1,
|
|
|
|
min(dp[(i + 1) * lo + j] + 1, dp[i * lo + j] + cost));
|
2012-01-12 09:44:40 +00:00
|
|
|
if (i > 0 && j > 0 && ci == toBaseLowerCase(after[j - 1])
|
|
|
|
&& co == toBaseLowerCase(before[i - 1])) {
|
2011-12-15 05:53:19 +00:00
|
|
|
dp[(i + 1) * lo + (j + 1)] = min(
|
|
|
|
dp[(i + 1) * lo + (j + 1)], dp[(i - 1) * lo + (j - 1)] + cost);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (DEBUG_EDIT_DISTANCE) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("IN = %d, OUT = %d", beforeLength, afterLength);
|
2011-12-15 05:53:19 +00:00
|
|
|
for (int i = 0; i < li; ++i) {
|
|
|
|
for (int j = 0; j < lo; ++j) {
|
2012-01-13 09:01:22 +00:00
|
|
|
AKLOGI("EDIT[%d][%d], %d", i, j, dp[i * lo + j]);
|
2011-12-15 05:53:19 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return dp[li * lo - 1];
|
|
|
|
}
|
2012-01-12 09:44:40 +00:00
|
|
|
|
|
|
|
int Correction::RankingAlgorithm::editDistance(const unsigned short* before,
|
|
|
|
const int beforeLength, const unsigned short* after, const int afterLength) {
|
|
|
|
int table[(beforeLength + 1) * (afterLength + 1)];
|
|
|
|
return editDistanceInternal(table, before, beforeLength, after, afterLength);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// In dictionary.cpp, getSuggestion() method,
|
|
|
|
// suggestion scores are computed using the below formula.
|
|
|
|
// original score
|
|
|
|
// := pow(mTypedLetterMultiplier (this is defined 2),
|
|
|
|
// (the number of matched characters between typed word and suggested word))
|
|
|
|
// * (individual word's score which defined in the unigram dictionary,
|
|
|
|
// and this score is defined in range [0, 255].)
|
|
|
|
// Then, the following processing is applied.
|
|
|
|
// - If the dictionary word is matched up to the point of the user entry
|
|
|
|
// (full match up to min(before.length(), after.length())
|
|
|
|
// => Then multiply by FULL_MATCHED_WORDS_PROMOTION_RATE (this is defined 1.2)
|
|
|
|
// - If the word is a true full match except for differences in accents or
|
|
|
|
// capitalization, then treat it as if the score was 255.
|
|
|
|
// - If before.length() == after.length()
|
|
|
|
// => multiply by mFullWordMultiplier (this is defined 2))
|
|
|
|
// So, maximum original score is pow(2, min(before.length(), after.length())) * 255 * 2 * 1.2
|
|
|
|
// For historical reasons we ignore the 1.2 modifier (because the measure for a good
|
|
|
|
// autocorrection threshold was done at a time when it didn't exist). This doesn't change
|
|
|
|
// the result.
|
|
|
|
// So, we can normalize original score by dividing pow(2, min(b.l(),a.l())) * 255 * 2.
|
|
|
|
|
|
|
|
/* static */
|
|
|
|
double Correction::RankingAlgorithm::calcNormalizedScore(const unsigned short* before,
|
|
|
|
const int beforeLength, const unsigned short* after, const int afterLength,
|
|
|
|
const int score) {
|
|
|
|
if (0 == beforeLength || 0 == afterLength) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
const int distance = editDistance(before, beforeLength, after, afterLength);
|
|
|
|
int spaceCount = 0;
|
|
|
|
for (int i = 0; i < afterLength; ++i) {
|
|
|
|
if (after[i] == CODE_SPACE) {
|
|
|
|
++spaceCount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (spaceCount == afterLength) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
const double maxScore = score >= S_INT_MAX ? S_INT_MAX : MAX_INITIAL_SCORE
|
|
|
|
* pow((double)TYPED_LETTER_MULTIPLIER,
|
|
|
|
(double)min(beforeLength, afterLength - spaceCount)) * FULL_WORD_MULTIPLIER;
|
|
|
|
|
|
|
|
// add a weight based on edit distance.
|
|
|
|
// distance <= max(afterLength, beforeLength) == afterLength,
|
|
|
|
// so, 0 <= distance / afterLength <= 1
|
|
|
|
const double weight = 1.0 - (double) distance / afterLength;
|
|
|
|
return (score / maxScore) * weight;
|
|
|
|
}
|
2011-12-15 05:53:19 +00:00
|
|
|
|
2011-07-15 04:49:00 +00:00
|
|
|
} // namespace latinime
|