From 866a6ced571a24f0f1b927aeccad7a1969da23b7 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Fri, 26 Apr 2013 19:58:14 +0900 Subject: [PATCH] Just cosmetic cleanups Change-Id: I3dc8a4bb3f89f4a18cfffd5f13a71503738452e6 --- native/jni/src/bigram_dictionary.cpp | 2 +- .../suggest/core/dicnode/dic_node_utils.cpp | 2 +- native/jni/src/suggest/core/policy/scoring.h | 12 ++++---- .../src/suggest/core/policy/suggest_policy.h | 1 + .../jni/src/suggest/core/policy/traversal.h | 10 +++---- .../jni/src/suggest/core/policy/weighting.cpp | 9 +++--- .../policyimpl/typing/typing_weighting.cpp | 5 ++-- .../policyimpl/typing/typing_weighting.h | 28 ++++++++----------- 8 files changed, 31 insertions(+), 38 deletions(-) diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index 92890383a..9053e7226 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -187,7 +187,7 @@ void BigramDictionary::fillBigramAddressToProbabilityMapAndFilter(const int *pre &pos); (*map)[bigramPos] = probability; setInFilter(filter, bigramPos); - } while (0 != (BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags)); + } while (BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags); } bool BigramDictionary::checkFirstCharacter(int *word, int *inputCodePoints) const { diff --git a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp index a25339174..a04812279 100644 --- a/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp +++ b/native/jni/src/suggest/core/dicnode/dic_node_utils.cpp @@ -271,7 +271,7 @@ namespace latinime { return probability; } count++; - } while ((0 != (BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags)) + } while ((BinaryFormat::FLAG_ATTRIBUTE_HAS_NEXT & bigramFlags) && count < MAX_BIGRAMS_CONSIDERED_PER_CONTEXT); if (static_cast(bigramCacheMap->size()) < MAX_BIGRAM_MAP_SIZE) { // TODO: does this -1 mean NOT_VALID_WORD? diff --git a/native/jni/src/suggest/core/policy/scoring.h b/native/jni/src/suggest/core/policy/scoring.h index b8c10e25a..102e856f5 100644 --- a/native/jni/src/suggest/core/policy/scoring.h +++ b/native/jni/src/suggest/core/policy/scoring.h @@ -29,16 +29,14 @@ class Scoring { public: virtual int calculateFinalScore(const float compoundDistance, const int inputSize, const bool forceCommit) const = 0; - virtual bool getMostProbableString( - const DicTraverseSession *const traverseSession, const int terminalSize, - const float languageWeight, int *const outputCodePoints, int *const type, - int *const freq) const = 0; + virtual bool getMostProbableString(const DicTraverseSession *const traverseSession, + const int terminalSize, const float languageWeight, int *const outputCodePoints, + int *const type, int *const freq) const = 0; virtual void safetyNetForMostProbableString(const int terminalSize, const int maxScore, int *const outputCodePoints, int *const frequencies) const = 0; // TODO: Make more generic - virtual void searchWordWithDoubleLetter(DicNode *terminals, - const int terminalSize, int *doubleLetterTerminalIndex, - DoubleLetterLevel *doubleLetterLevel) const = 0; + virtual void searchWordWithDoubleLetter(DicNode *terminals, const int terminalSize, + int *doubleLetterTerminalIndex, DoubleLetterLevel *doubleLetterLevel) const = 0; virtual float getAdjustedLanguageWeight(DicTraverseSession *const traverseSession, DicNode *const terminals, const int size) const = 0; virtual float getDoubleLetterDemotionDistanceCost(const int terminalIndex, diff --git a/native/jni/src/suggest/core/policy/suggest_policy.h b/native/jni/src/suggest/core/policy/suggest_policy.h index 885e214f7..5b6402c44 100644 --- a/native/jni/src/suggest/core/policy/suggest_policy.h +++ b/native/jni/src/suggest/core/policy/suggest_policy.h @@ -20,6 +20,7 @@ #include "defines.h" namespace latinime { + class Traversal; class Scoring; class Weighting; diff --git a/native/jni/src/suggest/core/policy/traversal.h b/native/jni/src/suggest/core/policy/traversal.h index d3146da7f..c6f66f231 100644 --- a/native/jni/src/suggest/core/policy/traversal.h +++ b/native/jni/src/suggest/core/policy/traversal.h @@ -39,9 +39,8 @@ class Traversal { const DicNode *const dicNode) const = 0; virtual bool canDoLookAheadCorrection(const DicTraverseSession *const traverseSession, const DicNode *const dicNode) const = 0; - virtual ProximityType getProximityType( - const DicTraverseSession *const traverseSession, const DicNode *const dicNode, - const DicNode *const childDicNode) const = 0; + virtual ProximityType getProximityType(const DicTraverseSession *const traverseSession, + const DicNode *const dicNode, const DicNode *const childDicNode) const = 0; virtual bool sameAsTyped(const DicTraverseSession *const traverseSession, const DicNode *const dicNode) const = 0; virtual bool needsToTraverseAllUserInput() const = 0; @@ -49,9 +48,8 @@ class Traversal { virtual bool allowPartialCommit() const = 0; virtual int getDefaultExpandDicNodeSize() const = 0; virtual int getMaxCacheSize() const = 0; - virtual bool isPossibleOmissionChildNode( - const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode, - const DicNode *const dicNode) const = 0; + virtual bool isPossibleOmissionChildNode(const DicTraverseSession *const traverseSession, + const DicNode *const parentDicNode, const DicNode *const dicNode) const = 0; virtual bool isGoodToTraverseNextWord(const DicNode *const dicNode) const = 0; protected: diff --git a/native/jni/src/suggest/core/policy/weighting.cpp b/native/jni/src/suggest/core/policy/weighting.cpp index 857ddcc1d..4912b22f2 100644 --- a/native/jni/src/suggest/core/policy/weighting.cpp +++ b/native/jni/src/suggest/core/policy/weighting.cpp @@ -69,8 +69,7 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n } /* static */ void Weighting::addCostAndForwardInputIndex(const Weighting *const weighting, - const CorrectionType correctionType, - const DicTraverseSession *const traverseSession, + const CorrectionType correctionType, const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode, DicNode *const dicNode, hash_map_compat *const bigramCacheMap) { const int inputSize = traverseSession->getInputSize(); @@ -94,9 +93,9 @@ static inline void profile(const CorrectionType correctionType, DicNode *const n } /* static */ float Weighting::getSpatialCost(const Weighting *const weighting, - const CorrectionType correctionType, - const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode, - const DicNode *const dicNode, DicNode_InputStateG *const inputStateG) { + const CorrectionType correctionType, const DicTraverseSession *const traverseSession, + const DicNode *const parentDicNode, const DicNode *const dicNode, + DicNode_InputStateG *const inputStateG) { switch(correctionType) { case CT_OMISSION: return weighting->getOmissionCost(parentDicNode, dicNode); diff --git a/native/jni/src/suggest/policyimpl/typing/typing_weighting.cpp b/native/jni/src/suggest/policyimpl/typing/typing_weighting.cpp index 47bd20425..e4c69d1f6 100644 --- a/native/jni/src/suggest/policyimpl/typing/typing_weighting.cpp +++ b/native/jni/src/suggest/policyimpl/typing/typing_weighting.cpp @@ -20,11 +20,12 @@ #include "suggest/policyimpl/typing/scoring_params.h" namespace latinime { + const TypingWeighting TypingWeighting::sInstance; ErrorType TypingWeighting::getErrorType(const CorrectionType correctionType, - const DicTraverseSession *const traverseSession, - const DicNode *const parentDicNode, const DicNode *const dicNode) const { + const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode, + const DicNode *const dicNode) const { switch (correctionType) { case CT_MATCH: if (isProximityDicNode(traverseSession, dicNode)) { diff --git a/native/jni/src/suggest/policyimpl/typing/typing_weighting.h b/native/jni/src/suggest/policyimpl/typing/typing_weighting.h index 4a0bd7194..9efcc17fe 100644 --- a/native/jni/src/suggest/policyimpl/typing/typing_weighting.h +++ b/native/jni/src/suggest/policyimpl/typing/typing_weighting.h @@ -34,8 +34,8 @@ class TypingWeighting : public Weighting { static const TypingWeighting *getInstance() { return &sInstance; } protected: - float getTerminalSpatialCost( - const DicTraverseSession *const traverseSession, const DicNode *const dicNode) const { + float getTerminalSpatialCost(const DicTraverseSession *const traverseSession, + const DicNode *const dicNode) const { float cost = 0.0f; if (dicNode->hasMultipleWords()) { cost += ScoringParams::HAS_MULTI_WORD_TERMINAL_COST; @@ -66,9 +66,8 @@ class TypingWeighting : public Weighting { return cost; } - float getMatchedCost( - const DicTraverseSession *const traverseSession, const DicNode *const dicNode, - DicNode_InputStateG *inputStateG) const { + float getMatchedCost(const DicTraverseSession *const traverseSession, + const DicNode *const dicNode, DicNode_InputStateG *inputStateG) const { const int pointIndex = dicNode->getInputIndex(0); // Note: min() required since length can be MAX_POINT_TO_KEY_LENGTH for characters not on // the keyboard (like accented letters) @@ -85,8 +84,8 @@ class TypingWeighting : public Weighting { return weightedDistance + cost; } - bool isProximityDicNode( - const DicTraverseSession *const traverseSession, const DicNode *const dicNode) const { + bool isProximityDicNode(const DicTraverseSession *const traverseSession, + const DicNode *const dicNode) const { const int pointIndex = dicNode->getInputIndex(0); const int primaryCodePoint = toBaseLowerCase( traverseSession->getProximityInfoState(0)->getPrimaryCodePointAt(pointIndex)); @@ -94,9 +93,8 @@ class TypingWeighting : public Weighting { return primaryCodePoint != dicNodeChar; } - float getTranspositionCost( - const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode, - const DicNode *const dicNode) const { + float getTranspositionCost(const DicTraverseSession *const traverseSession, + const DicNode *const parentDicNode, const DicNode *const dicNode) const { const int16_t parentPointIndex = parentDicNode->getInputIndex(0); const int prevCodePoint = parentDicNode->getNodeCodePoint(); const float distance1 = traverseSession->getProximityInfoState(0)->getPointToKeyLength( @@ -110,8 +108,7 @@ class TypingWeighting : public Weighting { return ScoringParams::TRANSPOSITION_COST + weightedLengthDistance; } - float getInsertionCost( - const DicTraverseSession *const traverseSession, + float getInsertionCost(const DicTraverseSession *const traverseSession, const DicNode *const parentDicNode, const DicNode *const dicNode) const { const int16_t parentPointIndex = parentDicNode->getInputIndex(0); const int prevCodePoint = @@ -137,8 +134,8 @@ class TypingWeighting : public Weighting { return cost * traverseSession->getMultiWordCostMultiplier(); } - float getNewWordBigramCost( - const DicTraverseSession *const traverseSession, const DicNode *const dicNode, + float getNewWordBigramCost(const DicTraverseSession *const traverseSession, + const DicNode *const dicNode, hash_map_compat *const bigramCacheMap) const { return DicNodeUtils::getBigramNodeImprobability(traverseSession->getOffsetDict(), dicNode, bigramCacheMap) * ScoringParams::DISTANCE_WEIGHT_LANGUAGE; @@ -174,8 +171,7 @@ class TypingWeighting : public Weighting { return ScoringParams::SUBSTITUTION_COST; } - AK_FORCE_INLINE float getSpaceSubstitutionCost( - const DicTraverseSession *const traverseSession, + AK_FORCE_INLINE float getSpaceSubstitutionCost(const DicTraverseSession *const traverseSession, const DicNode *const dicNode) const { const bool isCapitalized = dicNode->isCapitalized(); const float cost = ScoringParams::SPACE_SUBSTITUTION_COST + (isCapitalized ?