Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dceebee4 authored by Satoshi Kataoka's avatar Satoshi Kataoka
Browse files

Purge UnigramDictionary 

Bug: 8550444
Change-Id: I899f3bdce977c521515e548ca0c4ee6d29d6450b
parent eb6a7c82

native/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ LATIN_IME_CORE_SRC_FILES := \ 
    suggest/core/suggest.cpp \

    $(addprefix obsolete/, \

        correction.cpp \

        unigram_dictionary.cpp \

        words_priority_queue.cpp) \

    $(addprefix suggest/core/dicnode/, \

        dic_node.cpp \

native/jni/src/defines.h

+0 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ static inline void prof_out(void) { 


#define CALIBRATE_SCORE_BY_TOUCH_COORDINATES true

#define SUGGEST_MULTIPLE_WORDS true

#define USE_SUGGEST_INTERFACE_FOR_TYPING true

#define SUGGEST_INTERFACE_OUTPUT_SCALE 1000000.0f



// The following "rate"s are used as a multiplier before dividing by 100, so they are in percent.

native/jni/src/obsolete/unigram_dictionary.cpp

deleted100644 → 0
+0 −998

File deleted.

Preview size limit exceeded, changes collapsed.

native/jni/src/obsolete/unigram_dictionary.h

deleted100644 → 0
+0 −119
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 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.

 */



#ifndef LATINIME_UNIGRAM_DICTIONARY_H

#define LATINIME_UNIGRAM_DICTIONARY_H



#include <map>

#include <stdint.h>



#include "defines.h"

#include "suggest/core/dictionary/digraph_utils.h"



namespace latinime {



class BinaryDictionaryInfo;

class Correction;

class ProximityInfo;

class TerminalAttributes;

class WordsPriorityQueuePool;



class UnigramDictionary {

 public:

    // Error tolerances

    static const int DEFAULT_MAX_ERRORS = 2;

    static const int MAX_ERRORS_FOR_TWO_WORDS = 1;



    static const int FLAG_MULTIPLE_SUGGEST_ABORT = 0;

    static const int FLAG_MULTIPLE_SUGGEST_SKIP = 1;

    static const int FLAG_MULTIPLE_SUGGEST_CONTINUE = 2;



    UnigramDictionary(const BinaryDictionaryInfo *const binaryDicitonaryInfo,

            const uint8_t dictFlags);

    virtual ~UnigramDictionary();

    int getProbability(const int *const inWord, const int length) const;

    int getBigramPosition(int pos, int *word, int offset, int length) const;

    int getSuggestions(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *inputCodePoints, const int inputSize,

            const std::map<int, int> *bigramMap, const uint8_t *bigramFilter,

            const bool useFullEditDistance, int *outWords, int *frequencies,

            int *outputTypes) const;

    int getDictFlags() const { return DICT_FLAGS; }



 private:

    DISALLOW_IMPLICIT_CONSTRUCTORS(UnigramDictionary);

    void getWordSuggestions(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *inputCodePoints, const int inputSize,

            const std::map<int, int> *bigramMap, const uint8_t *bigramFilter,

            const bool useFullEditDistance, Correction *correction,

            WordsPriorityQueuePool *queuePool) const;

    int getDigraphReplacement(const int *codes, const int i, const int inputSize,

            const DigraphUtils::digraph_t *const digraphs, const unsigned int digraphsSize) const;

    void getWordWithDigraphSuggestionsRec(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *codesBuffer, int *xCoordinatesBuffer,

            int *yCoordinatesBuffer, const int codesBufferSize, const std::map<int, int> *bigramMap,

            const uint8_t *bigramFilter, const bool useFullEditDistance, const int *codesSrc,

            const int codesRemain, const int currentDepth, int *codesDest, Correction *correction,

            WordsPriorityQueuePool *queuePool, const DigraphUtils::digraph_t *const digraphs,

            const unsigned int digraphsSize) const;

    void initSuggestions(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *codes, const int inputSize,

            Correction *correction) const;

    void getOneWordSuggestions(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *codes, const std::map<int, int> *bigramMap,

            const uint8_t *bigramFilter, const bool useFullEditDistance, const int inputSize,

            Correction *correction, WordsPriorityQueuePool *queuePool) const;

    void getSuggestionCandidates(

            const bool useFullEditDistance, const int inputSize,

            const std::map<int, int> *bigramMap, const uint8_t *bigramFilter,

            Correction *correction, WordsPriorityQueuePool *queuePool, const bool doAutoCompletion,

            const int maxErrors, const int currentWordIndex) const;

    void getSplitMultipleWordsSuggestions(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *codes, const bool useFullEditDistance,

            const int inputSize, Correction *correction, WordsPriorityQueuePool *queuePool,

            const bool hasAutoCorrectionCandidate) const;

    void onTerminal(const int freq, const TerminalAttributes &terminalAttributes,

            Correction *correction, WordsPriorityQueuePool *queuePool, const bool addToMasterQueue,

            const int currentWordIndex) const;

    // Process a node by considering proximity, missing and excessive character

    bool processCurrentNode(const int initialPos, const std::map<int, int> *bigramMap,

            const uint8_t *bigramFilter, Correction *correction, int *newCount,

            int *newChildPosition, int *nextSiblingPosition, WordsPriorityQueuePool *queuePool,

            const int currentWordIndex) const;

    int getMostProbableWordLike(const int startInputIndex, const int inputSize,

            Correction *correction, int *word) const;

    int getMostProbableWordLikeInner(const int *const inWord, const int inputSize,

            int *outWord) const;

    int getSubStringSuggestion(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *codes, const bool useFullEditDistance,

            Correction *correction, WordsPriorityQueuePool *queuePool, const int inputSize,

            const bool hasAutoCorrectionCandidate, const int currentWordIndex,

            const int inputWordStartPos, const int inputWordLength, const int outputWordStartPos,

            const bool isSpaceProximity, int *freqArray, int *wordLengthArray, int *outputWord,

            int *outputWordLength) const;

    void getMultiWordsSuggestionRec(ProximityInfo *proximityInfo, const int *xcoordinates,

            const int *ycoordinates, const int *codes, const bool useFullEditDistance,

            const int inputSize, Correction *correction, WordsPriorityQueuePool *queuePool,

            const bool hasAutoCorrectionCandidate, const int startPos, const int startWordIndex,

            const int outputWordLength, int *freqArray, int *wordLengthArray,

            int *outputWord) const;



    const BinaryDictionaryInfo *const mBinaryDicitonaryInfo;

    const int MAX_DIGRAPH_SEARCH_DEPTH;

    const int DICT_FLAGS;

};

} // namespace latinime

#endif // LATINIME_UNIGRAM_DICTIONARY_H