nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am b1120fe7: Merge "Small optimizations" into jb-dev 

* commit 'b1120fe79ac40717b2b91ba60608b2c9f735c368':
  Small optimizations
main
Jean Chalard 2012-05-15 11:37:51 -07:00 committed by Android Git Automerger
parent 47fedb8993 b1120fe79a
commit bc740afba3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/com/android/inputmethod/latin/makedict/BinaryDictInputOutput.java
View File

@ -40,6 +40,8 @@ import java.util.TreeMap;
*/ */
public class BinaryDictInputOutput { public class BinaryDictInputOutput {
final static boolean DBG = MakedictLog.DBG;
/* Node layout is as follows: /* Node layout is as follows:
* | addressType xx : mask with MASK_GROUP_ADDRESS_TYPE * | addressType xx : mask with MASK_GROUP_ADDRESS_TYPE
* 2 bits, 00 = no children : FLAG_GROUP_ADDRESS_TYPE_NOADDRESS * 2 bits, 00 = no children : FLAG_GROUP_ADDRESS_TYPE_NOADDRESS
@ -715,13 +717,13 @@ public class BinaryDictInputOutput {
} }
} }
if (null != group.mShortcutTargets) { 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"); throw new RuntimeException("0-sized shortcut list must be null");
} }
flags |= FLAG_HAS_SHORTCUT_TARGETS; flags |= FLAG_HAS_SHORTCUT_TARGETS;
} }
if (null != group.mBigrams) { 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"); throw new RuntimeException("0-sized bigram list must be null");
} }
flags |= FLAG_HAS_BIGRAMS; flags |= FLAG_HAS_BIGRAMS;
@ -830,7 +832,7 @@ public class BinaryDictInputOutput {
+ index + " <> " + group.mCachedAddress); + index + " <> " + group.mCachedAddress);
groupAddress += GROUP_FLAGS_SIZE + getGroupCharactersSize(group); groupAddress += GROUP_FLAGS_SIZE + getGroupCharactersSize(group);
// Sanity checks. // 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 throw new RuntimeException("A node has a frequency > " + MAX_TERMINAL_FREQUENCY
+ " : " + group.mFrequency); + " : " + group.mFrequency);
} }
@ -1037,7 +1039,7 @@ public class BinaryDictInputOutput {
MakedictLog.i("Computing addresses..."); MakedictLog.i("Computing addresses...");
computeAddresses(dict, flatNodes); computeAddresses(dict, flatNodes);
MakedictLog.i("Checking array..."); MakedictLog.i("Checking array...");
checkFlatNodeArray(flatNodes); if (DBG) checkFlatNodeArray(flatNodes);
// Create a buffer that matches the final dictionary size. // Create a buffer that matches the final dictionary size.
final Node lastNode = flatNodes.get(flatNodes.size() - 1); final Node lastNode = flatNodes.get(flatNodes.size() - 1);