diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2014-03-12 06:51:42 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-03-12 06:51:43 +0000 |
| commit | 4d73199c0641ae9daecbadead30d116725a8284c (patch) | |
| tree | d14a841e49385d6f5559583c4402cb5c4e2daaef /tests/src | |
| parent | 4bc35daaa2ebfb099b2f912ca67e77bd8e98fbb7 (diff) | |
| parent | 61467744e7d2240abc8792ce1840d6914ef90793 (diff) | |
| download | latinime-4d73199c0641ae9daecbadead30d116725a8284c.tar.gz latinime-4d73199c0641ae9daecbadead30d116725a8284c.tar.xz latinime-4d73199c0641ae9daecbadead30d116725a8284c.zip | |
Merge "Unit test update for I7ed95a54344d8b."
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java index d9c35c497..4d44135e6 100644 --- a/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java +++ b/tests/src/com/android/inputmethod/latin/BinaryDictionaryTests.java @@ -948,10 +948,13 @@ public class BinaryDictionaryTests extends AndroidTestCase { final HashSet<String> bigramWord1s = bigrams.get(word0); final WordProperty wordProperty = binaryDictionary.getWordProperty(word0); assertEquals(bigramWord1s.size(), wordProperty.mBigrams.size()); + final int unigramProbability = wordProperty.getProbability(); for (int j = 0; j < wordProperty.mBigrams.size(); j++) { final String word1 = wordProperty.mBigrams.get(j).mWord; assertTrue(bigramWord1s.contains(word1)); - final int probability = wordProperty.mBigrams.get(j).getProbability(); + final int bigramProbability = wordProperty.mBigrams.get(j).getProbability(); + final int probability = binaryDictionary.calculateProbability( + unigramProbability, bigramProbability); assertEquals((int)bigramProbabilities.get(new Pair<String, String>(word0, word1)), probability); assertEquals(wordProperty.mBigrams.get(j).getProbability(), probability); @@ -1037,11 +1040,14 @@ public class BinaryDictionaryTests extends AndroidTestCase { assertEquals((int)wordProbabilitiesToCheckLater.get(word0), wordProperty.mProbabilityInfo.mProbability); wordSet.remove(word0); + final int unigramProbability = wordProperty.getProbability(); final HashSet<String> bigramWord1s = bigrams.get(word0); for (int j = 0; j < wordProperty.mBigrams.size(); j++) { final String word1 = wordProperty.mBigrams.get(j).mWord; assertTrue(bigramWord1s.contains(word1)); - final int probability = wordProperty.mBigrams.get(j).getProbability(); + final int bigramProbability = wordProperty.mBigrams.get(j).getProbability(); + final int probability = binaryDictionary.calculateProbability( + unigramProbability, bigramProbability); final Pair<String, String> bigram = new Pair<String, String>(word0, word1); assertEquals((int)bigramProbabilitiesToCheckLater.get(bigram), probability); bigramSet.remove(bigram); |