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

Add a missing report, and fix a wrong report 

Deleted words would be reported, but added words wouldn't
Also, shortcuts would be reported as bigrams

Change-Id: I017653f2afa65cf16924017a0be2ee2cbd6ca10d
main
Jean Chalard 2012-11-01 14:22:37 +09:00
parent 522a22c87b
commit 271e731eb4
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/dicttool/src/com/android/inputmethod/latin/dicttool/Diff.java
View File

@ -144,9 +144,17 @@ public class Diff extends Dicttool.Command {
hasDifferences = true; hasDifferences = true;
} }
hasDifferences |= hasAttributesDifferencesAndPrintThemIfAny(word0.mWord, hasDifferences |= hasAttributesDifferencesAndPrintThemIfAny(word0.mWord,
word0.mBigrams, word1.getBigrams()); "Bigram", word0.mBigrams, word1.getBigrams());
hasDifferences |= hasAttributesDifferencesAndPrintThemIfAny(word0.mWord, hasDifferences |= hasAttributesDifferencesAndPrintThemIfAny(word0.mWord,
word0.mShortcutTargets, word1.getShortcutTargets()); "Shortcut", word0.mShortcutTargets, word1.getShortcutTargets());
}
}
for (final Word word1 : dict1) {
final CharGroup word0 = FusionDictionary.findWordInTree(dict0.mRoot, word1.mWord);
if (null == word0) {
// This word is not in dict0
System.out.println("Added: " + word1.mWord + " " + word1.mFrequency);
hasDifferences = true;
} }
} }
if (!hasDifferences) { if (!hasDifferences) {
@ -155,11 +163,12 @@ public class Diff extends Dicttool.Command {
} }
private static boolean hasAttributesDifferencesAndPrintThemIfAny(final String word, private static boolean hasAttributesDifferencesAndPrintThemIfAny(final String word,
final ArrayList<WeightedString> list0, final ArrayList<WeightedString> list1) { final String type, final ArrayList<WeightedString> list0,
final ArrayList<WeightedString> list1) {
if (null == list1) { if (null == list1) {
if (null == list0) return false; if (null == list0) return false;
for (final WeightedString attribute0 : list0) { for (final WeightedString attribute0 : list0) {
System.out.println("Bigram removed: " + word + " " + attribute0.mWord + " " System.out.println(type + " removed: " + word + " " + attribute0.mWord + " "
+ attribute0.mFrequency); + attribute0.mFrequency);
} }
return true; return true;
@ -174,14 +183,14 @@ public class Diff extends Dicttool.Command {
// Search for a word with the same string but a different frequency // Search for a word with the same string but a different frequency
for (final WeightedString attribute1 : list1) { for (final WeightedString attribute1 : list1) {
if (attribute0.mWord.equals(attribute1.mWord)) { if (attribute0.mWord.equals(attribute1.mWord)) {
System.out.println("Bigram freq changed: " + word + " " System.out.println(type + " freq changed: " + word + " "
+ attribute0.mWord + " " + attribute0.mFrequency + " -> " + attribute0.mWord + " " + attribute0.mFrequency + " -> "
+ attribute1.mFrequency); + attribute1.mFrequency);
list1.remove(attribute1); list1.remove(attribute1);
break; break;
} }
// We come here if we haven't found any matching string. // We come here if we haven't found any matching string.
System.out.println("Bigram removed: " + word + " " + attribute0.mWord); System.out.println(type + " removed: " + word + " " + attribute0.mWord);
} }
} else { } else {
list1.remove(attribute0); list1.remove(attribute0);
@ -192,7 +201,7 @@ public class Diff extends Dicttool.Command {
// are not included in list0. // are not included in list0.
for (final WeightedString attribute1 : list1) { for (final WeightedString attribute1 : list1) {
hasDifferences = true; hasDifferences = true;
System.out.println("Bigram added: " + word + " " + attribute1.mWord + " " System.out.println(type + " added: " + word + " " + attribute1.mWord + " "
+ attribute1.mFrequency); + attribute1.mFrequency);
} }
return hasDifferences; return hasDifferences;