Add OffdeviceIntermediateDictHeader.

Used to have header information in OffdeviceIntermediateDict.

Bug: 10059681

Change-Id: I966c26e514ddd229cf5597d3b96941234c530863
main
Keisuke Kuroyanagi 2014-11-11 01:00:31 +09:00
parent f0c303dd02
commit 99754e2d3e
3 changed files with 52 additions and 1 deletions

View File

@ -18,6 +18,7 @@
#define LATINIME_DICT_TOOLKIT_OFFDEVICE_INTERMEDIATE_DICT_H
#include "dict_toolkit_defines.h"
#include "offdevice_intermediate_dict/offdevice_intermediate_dict_header.h"
#include "offdevice_intermediate_dict/offdevice_intermediate_dict_pt_node_array.h"
#include "suggest/core/dictionary/property/word_property.h"
#include "utils/int_array_view.h"
@ -30,13 +31,18 @@ namespace dicttoolkit {
*/
class OffdeviceIntermediateDict final {
public:
OffdeviceIntermediateDict(const OffdeviceIntermediateDictHeader &header)
: mHeader(header), mRootPtNodeArray() {}
bool addWord(const WordProperty &wordProperty);
// The returned value will be invalid after modifying the dictionary. e.g. calling addWord().
const WordProperty *getWordProperty(const CodePointArrayView codePoints) const;
const OffdeviceIntermediateDictHeader &getHeader() const { return mHeader; }
private:
DISALLOW_ASSIGNMENT_OPERATOR(OffdeviceIntermediateDict);
const OffdeviceIntermediateDictHeader mHeader;
OffdeviceIntermediateDictPtNodeArray mRootPtNodeArray;
bool addWordInner(const CodePointArrayView codePoints, const WordProperty &wordProperty,

View File

@ -0,0 +1,44 @@
/*
* 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_DICT_TOOLKIT_OFFDEVICE_INTERMEDIATE_DICT_HEADER_H
#define LATINIME_DICT_TOOLKIT_OFFDEVICE_INTERMEDIATE_DICT_HEADER_H
#include <map>
#include <vector>
#include "dict_toolkit_defines.h"
namespace latinime {
namespace dicttoolkit {
class OffdeviceIntermediateDictHeader final {
public:
using AttributeMap = std::map<std::vector<int>, std::vector<int>>;
OffdeviceIntermediateDictHeader(const AttributeMap &attributesMap)
: mAttributeMap(attributesMap) {}
private:
DISALLOW_DEFAULT_CONSTRUCTOR(OffdeviceIntermediateDictHeader);
DISALLOW_ASSIGNMENT_OPERATOR(OffdeviceIntermediateDictHeader);
const AttributeMap mAttributeMap;
};
} // namespace dicttoolkit
} // namespace latinime
#endif // LATINIME_DICT_TOOLKIT_OFFDEVICE_INTERMEDIATE_DICT_HEADER_H

View File

@ -41,7 +41,8 @@ const WordProperty getDummpWordProperty(const std::vector<int> &&codePoints) {
}
TEST(OffdeviceIntermediateDictTest, TestAddWordProperties) {
OffdeviceIntermediateDict dict;
OffdeviceIntermediateDict dict = OffdeviceIntermediateDict(
OffdeviceIntermediateDictHeader(OffdeviceIntermediateDictHeader::AttributeMap()));
EXPECT_EQ(nullptr, dict.getWordProperty(CodePointArrayView()));
const WordProperty wordProperty0 = getDummpWordProperty(getCodePointVector("abcd"));