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

Commit dc3856d7 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Add LanguageModelDictContent. 

This class will replace BigramDictContent and
ProbabilityDictContent.

Bug: 14425059
Change-Id: I3d15c833957e27b2f5999386db042188272bbb4b
parent 90b7c172

native/jni/src/suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014, 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_LANGUAGE_MODEL_DICT_CONTENT_H

#define LATINIME_LANGUAGE_MODEL_DICT_CONTENT_H



#include "defines.h"



namespace latinime {



class LanguageModelDictContent {

 public:

    explicit LanguageModelDictContent(const bool hasHistoricalInfo) {}



 private:

    DISALLOW_COPY_AND_ASSIGN(LanguageModelDictContent);

};

} // namespace latinime

#endif /* LATINIME_LANGUAGE_MODEL_DICT_CONTENT_H */

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ Ver4DictBuffers::Ver4DictBuffers(MmappedBuffer::MmappedBufferPtr &&headerBuffer, 
                  contentBuffers[Ver4DictConstants::PROBABILITY_BUFFER_INDEX],

                  contentBufferSizes[Ver4DictConstants::PROBABILITY_BUFFER_INDEX],

                  mHeaderPolicy.hasHistoricalInfoOfWords()),

          mLanguageModelDictContent(mHeaderPolicy.hasHistoricalInfoOfWords()),

          mBigramDictContent(&contentBuffers[Ver4DictConstants::BIGRAM_BUFFERS_INDEX],

                  &contentBufferSizes[Ver4DictConstants::BIGRAM_BUFFERS_INDEX],

                  mHeaderPolicy.hasHistoricalInfoOfWords()),
@@ -204,6 +205,7 @@ Ver4DictBuffers::Ver4DictBuffers(const HeaderPolicy *const headerPolicy, const i 
          mExpandableHeaderBuffer(Ver4DictConstants::MAX_DICTIONARY_SIZE),

          mExpandableTrieBuffer(maxTrieSize), mTerminalPositionLookupTable(),

          mProbabilityDictContent(headerPolicy->hasHistoricalInfoOfWords()),

          mLanguageModelDictContent(headerPolicy->hasHistoricalInfoOfWords()),

          mBigramDictContent(headerPolicy->hasHistoricalInfoOfWords()), mShortcutDictContent(),

          mIsUpdatable(true) {}

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "defines.h"

#include "suggest/policyimpl/dictionary/header/header_policy.h"

#include "suggest/policyimpl/dictionary/structure/v4/content/bigram_dict_content.h"

#include "suggest/policyimpl/dictionary/structure/v4/content/language_model_dict_content.h"

#include "suggest/policyimpl/dictionary/structure/v4/content/probability_dict_content.h"

#include "suggest/policyimpl/dictionary/structure/v4/content/shortcut_dict_content.h"

#include "suggest/policyimpl/dictionary/structure/v4/content/terminal_position_lookup_table.h"
@@ -136,6 +137,7 @@ class Ver4DictBuffers { 
    BufferWithExtendableBuffer mExpandableTrieBuffer;

    TerminalPositionLookupTable mTerminalPositionLookupTable;

    ProbabilityDictContent mProbabilityDictContent;

    LanguageModelDictContent mLanguageModelDictContent;

    BigramDictContent mBigramDictContent;

    ShortcutDictContent mShortcutDictContent;

    const int mIsUpdatable;