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

Commit 9a7e02d6 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Add new binary dictionary format." into jb-mr1-dev

parents 14faf7a4 e55b644a

java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java

+202 −55

File changed.

Preview size limit exceeded, changes collapsed.

java/src/com/android/inputmethod/latin/makedict/CharGroupInfo.java

+4 −2
Original line number Diff line number Diff line
@@ -31,18 +31,20 @@ public class CharGroupInfo { 
    public final int[] mCharacters;

    public final int mFrequency;

    public final int mChildrenAddress;

    public final int mParentAddress;

    public final ArrayList<WeightedString> mShortcutTargets;

    public final ArrayList<PendingAttribute> mBigrams;



    public CharGroupInfo(final int originalAddress, final int endAddress, final int flags,

            final int[] characters, final int frequency, final int childrenAddress,

            final ArrayList<WeightedString> shortcutTargets,

            final int[] characters, final int frequency, final int parentAddress,

            final int childrenAddress, final ArrayList<WeightedString> shortcutTargets,

            final ArrayList<PendingAttribute> bigrams) {

        mOriginalAddress = originalAddress;

        mEndAddress = endAddress;

        mFlags = flags;

        mCharacters = characters;

        mFrequency = frequency;

        mParentAddress = parentAddress;

        mChildrenAddress = childrenAddress;

        mShortcutTargets = shortcutTargets;

        mBigrams = bigrams;

java/src/com/android/inputmethod/latin/makedict/FusionDictionary.java

+4 −6
Original line number Diff line number Diff line
@@ -43,17 +43,15 @@ public class FusionDictionary implements Iterable<Word> { 
    public static class Node {

        ArrayList<CharGroup> mData;

        // To help with binary generation

        int mCachedSize;

        int mCachedAddress;

        int mCachedSize = Integer.MIN_VALUE;

        int mCachedAddress = Integer.MIN_VALUE;

        int mCachedParentAddress = 0;



        public Node() {

            mData = new ArrayList<CharGroup>();

            mCachedSize = Integer.MIN_VALUE;

            mCachedAddress = Integer.MIN_VALUE;

        }

        public Node(ArrayList<CharGroup> data) {

            mData = data;

            mCachedSize = Integer.MIN_VALUE;

            mCachedAddress = Integer.MIN_VALUE;

        }

    }