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

Commit 8ca9be17 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

s/hash_map_compat/unordered_map/ 

Change-Id: Icce5f9a12b04bdd7540c52750d303a585d71f28a
parent 977d052f

native/jni/src/suggest/core/dictionary/multi_bigram_map.cpp

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "suggest/core/dictionary/multi_bigram_map.h"



#include <cstddef>

#include <unordered_map>



namespace latinime {
@@ -35,7 +36,7 @@ const int MultiBigramMap::BigramMap::DEFAULT_HASH_MAP_SIZE_FOR_EACH_BIGRAM_MAP = 
int MultiBigramMap::getBigramProbability(

        const DictionaryStructureWithBufferPolicy *const structurePolicy,

        const int wordPosition, const int nextWordPosition, const int unigramProbability) {

    hash_map_compat<int, BigramMap>::const_iterator mapPosition =

    std::unordered_map<int, BigramMap>::const_iterator mapPosition =

            mBigramMaps.find(wordPosition);

    if (mapPosition != mBigramMaps.end()) {

        return mapPosition->second.getBigramProbability(structurePolicy, nextWordPosition,
@@ -70,7 +71,7 @@ int MultiBigramMap::BigramMap::getBigramProbability( 
        const int nextWordPosition, const int unigramProbability) const {

    int bigramProbability = NOT_A_PROBABILITY;

    if (mBloomFilter.isInFilter(nextWordPosition)) {

        const hash_map_compat<int, int>::const_iterator bigramProbabilityIt =

        const std::unordered_map<int, int>::const_iterator bigramProbabilityIt =

                mBigramMap.find(nextWordPosition);

        if (bigramProbabilityIt != mBigramMap.end()) {

            bigramProbability = bigramProbabilityIt->second;

native/jni/src/suggest/core/dictionary/multi_bigram_map.h

+3 −3
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
#define LATINIME_MULTI_BIGRAM_MAP_H



#include <cstddef>

#include <unordered_map>



#include "defines.h"

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

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

#include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"

#include "utils/hash_map_compat.h"



namespace latinime {
@@ -63,7 +63,7 @@ class MultiBigramMap { 
        // NOTE: The BigramMap class doesn't use DISALLOW_COPY_AND_ASSIGN() because its default

        // copy constructor is needed for use in hash_map.

        static const int DEFAULT_HASH_MAP_SIZE_FOR_EACH_BIGRAM_MAP;

        hash_map_compat<int, int> mBigramMap;

        std::unordered_map<int, int> mBigramMap;

        BloomFilter mBloomFilter;

    };
@@ -75,7 +75,7 @@ class MultiBigramMap { 
            const int nextWordPosition, const int unigramProbability);



    static const size_t MAX_CACHED_PREV_WORDS_IN_BIGRAM_MAP;

    hash_map_compat<int, BigramMap> mBigramMaps;

    std::unordered_map<int, BigramMap> mBigramMaps;

};

} // namespace latinime

#endif // LATINIME_MULTI_BIGRAM_MAP_H

native/jni/src/suggest/core/layout/proximity_info.h

+3 −2
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ 
#ifndef LATINIME_PROXIMITY_INFO_H

#define LATINIME_PROXIMITY_INFO_H



#include <unordered_map>



#include "defines.h"

#include "jni.h"

#include "suggest/core/layout/proximity_info_utils.h"

#include "utils/hash_map_compat.h"



namespace latinime {
@@ -114,7 +115,7 @@ class ProximityInfo { 
    // Sweet spots for geometric input. Note that we have extra sweet spots only for Y coordinates.

    float mSweetSpotCenterYsG[MAX_KEY_COUNT_IN_A_KEYBOARD];

    float mSweetSpotRadii[MAX_KEY_COUNT_IN_A_KEYBOARD];

    hash_map_compat<int, int> mLowerCodePointToKeyMap;

    std::unordered_map<int, int> mLowerCodePointToKeyMap;

    int mKeyIndexToOriginalCodePoint[MAX_KEY_COUNT_IN_A_KEYBOARD];

    int mKeyIndexToLowerCodePointG[MAX_KEY_COUNT_IN_A_KEYBOARD];

    int mCenterXsG[MAX_KEY_COUNT_IN_A_KEYBOARD];

native/jni/src/suggest/core/layout/proximity_info_state.cpp

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <algorithm>

#include <cstring> // for memset() and memmove()

#include <sstream> // for debug prints

#include <unordered_map>

#include <vector>



#include "defines.h"
@@ -296,7 +297,7 @@ bool ProximityInfoState::hasSpaceProximity(const int index) const { 
// Returns a probability of mapping index to keyIndex.

float ProximityInfoState::getProbability(const int index, const int keyIndex) const {

    ASSERT(0 <= index && index < mSampledInputSize);

    hash_map_compat<int, float>::const_iterator it = mCharProbabilities[index].find(keyIndex);

    std::unordered_map<int, float>::const_iterator it = mCharProbabilities[index].find(keyIndex);

    if (it != mCharProbabilities[index].end()) {

        return it->second;

    }

native/jni/src/suggest/core/layout/proximity_info_state.h

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ 
#define LATINIME_PROXIMITY_INFO_STATE_H



#include <cstring> // for memset()

#include <unordered_map>

#include <vector>



#include "defines.h"

#include "suggest/core/layout/proximity_info_params.h"

#include "suggest/core/layout/proximity_info_state_utils.h"

#include "utils/hash_map_compat.h"



namespace latinime {
@@ -215,7 +215,7 @@ class ProximityInfoState { 
    std::vector<float> mSpeedRates;

    std::vector<float> mDirections;

    // probabilities of skipping or mapping to a key for each point.

    std::vector<hash_map_compat<int, float> > mCharProbabilities;

    std::vector<std::unordered_map<int, float> > mCharProbabilities;

    // The vector for the key code set which holds nearby keys of some trailing sampled input points

    // for each sampled input point. These nearby keys contain the next characters which can be in

    // the dictionary. Specifically, currently we are looking for keys nearby trailing sampled