diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-05-14 19:11:11 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-05-14 19:11:11 -0700 |
| commit | b1120fe79ac40717b2b91ba60608b2c9f735c368 (patch) | |
| tree | 16bc10cb5b064f6d594ea87735a210f096915f11 /java/src | |
| parent | f5ac6c725a0e12c1ed796de9f255103b957e1724 (diff) | |
| parent | 4df5b43df8f4b29fbfab9180cffe5742f8b5f512 (diff) | |
| download | latinime-b1120fe79ac40717b2b91ba60608b2c9f735c368.tar.gz latinime-b1120fe79ac40717b2b91ba60608b2c9f735c368.tar.xz latinime-b1120fe79ac40717b2b91ba60608b2c9f735c368.zip | |
Merge "Small optimizations" into jb-dev
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java index bb1042324..522573d07 100644 --- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java +++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java @@ -40,6 +40,8 @@ import java.util.TreeMap; */ public class BinaryDictInputOutput { + final static boolean DBG = MakedictLog.DBG; + /* Node layout is as follows: * | addressType xx : mask with MASK_GROUP_ADDRESS_TYPE * 2 bits, 00 = no children : FLAG_GROUP_ADDRESS_TYPE_NOADDRESS @@ -715,13 +717,13 @@ public class BinaryDictInputOutput { } } if (null != group.mShortcutTargets) { - if (0 == group.mShortcutTargets.size()) { + if (DBG && 0 == group.mShortcutTargets.size()) { throw new RuntimeException("0-sized shortcut list must be null"); } flags |= FLAG_HAS_SHORTCUT_TARGETS; } if (null != group.mBigrams) { - if (0 == group.mBigrams.size()) { + if (DBG && 0 == group.mBigrams.size()) { throw new RuntimeException("0-sized bigram list must be null"); } flags |= FLAG_HAS_BIGRAMS; @@ -830,7 +832,7 @@ public class BinaryDictInputOutput { + index + " <> " + group.mCachedAddress); groupAddress += GROUP_FLAGS_SIZE + getGroupCharactersSize(group); // Sanity checks. - if (group.mFrequency > MAX_TERMINAL_FREQUENCY) { + if (DBG && group.mFrequency > MAX_TERMINAL_FREQUENCY) { throw new RuntimeException("A node has a frequency > " + MAX_TERMINAL_FREQUENCY + " : " + group.mFrequency); } @@ -1037,7 +1039,7 @@ public class BinaryDictInputOutput { MakedictLog.i("Computing addresses..."); computeAddresses(dict, flatNodes); MakedictLog.i("Checking array..."); - checkFlatNodeArray(flatNodes); + if (DBG) checkFlatNodeArray(flatNodes); // Create a buffer that matches the final dictionary size. final Node lastNode = flatNodes.get(flatNodes.size() - 1); |