msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fixed undo classify

Browse Source
pull/190/head
M66B 4 years ago
parent 1eb8d7fa3f
commit 873683d5da
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File

89
app/src/main/java/eu/faircode/email/MessageClassifier.java
Unescape View File

@ -109,59 +109,58 @@ public class MessageClassifier {
words.add(word); words.add(word);
Map<String, Integer> classFrequency = wordClassFrequency.get(word); Map<String, Integer> classFrequency = wordClassFrequency.get(word);
if (!added) { if (added) {
Integer c = (classFrequency == null ? null : classFrequency.get(classify)); if (classFrequency == null) {
if (c != null) classFrequency = new HashMap<>();
if (c > 0) wordClassFrequency.put(word, classFrequency);
classFrequency.put(classify, c - 1); }
else
classFrequency.remove(classify);
continue;
}
if (classFrequency == null) {
classFrequency = new HashMap<>();
wordClassFrequency.put(word, classFrequency);
}
// Filter classes of common occurring words // Filter classes of common occurring words
List<String> applyClasses = new ArrayList<>(classFrequency.keySet()); List<String> applyClasses = new ArrayList<>(classFrequency.keySet());
for (String class1 : classFrequency.keySet()) for (String class1 : classFrequency.keySet())
for (String class2 : classFrequency.keySet()) for (String class2 : classFrequency.keySet())
if (!class1.equals(class2)) { if (!class1.equals(class2)) {
double percentage1 = (double) classFrequency.get(class1) / classMessages.get(class1); double percentage1 = (double) classFrequency.get(class1) / classMessages.get(class1);
double percentage2 = (double) classFrequency.get(class2) / classMessages.get(class2); double percentage2 = (double) classFrequency.get(class2) / classMessages.get(class2);
double factor = percentage1 / percentage2; double factor = percentage1 / percentage2;
if (factor > 1) if (factor > 1)
factor = 1 / factor; factor = 1 / factor;
if (factor > COMMON_WORD_FACTOR) { if (factor > COMMON_WORD_FACTOR) {
Log.i("Classifier skip class=" + class1 + " word=" + word); Log.i("Classifier skip class=" + class1 + " word=" + word);
applyClasses.remove(class1); applyClasses.remove(class1);
break; break;
}
} }
for (String clazz : applyClasses) {
int frequency = classFrequency.get(clazz);
if (frequency > maxFrequency)
maxFrequency = frequency;
Stat stat = classStats.get(clazz);
if (stat == null) {
stat = new Stat();
classStats.put(clazz, stat);
} }
for (String clazz : applyClasses) { stat.matchedWords++;
int frequency = classFrequency.get(clazz); stat.totalFrequency += frequency;
if (frequency > maxFrequency)
maxFrequency = frequency;
Stat stat = classStats.get(clazz); if (stat.matchedWords > maxMatchedWords)
if (stat == null) { maxMatchedWords = stat.matchedWords;
stat = new Stat();
classStats.put(clazz, stat);
} }
stat.matchedWords++; Integer c = classFrequency.get(classify);
stat.totalFrequency += frequency; c = (c == null ? 1 : c + 1);
classFrequency.put(classify, c);
if (stat.matchedWords > maxMatchedWords) } else {
maxMatchedWords = stat.matchedWords; Integer c = (classFrequency == null ? null : classFrequency.get(classify));
if (c != null)
if (c > 0)
classFrequency.put(classify, c - 1);
else
classFrequency.remove(classify);
} }
Integer c = classFrequency.get(classify);
c = (c == null ? 1 : c + 1);
classFrequency.put(classify, c);
} }
start = end; start = end;
} }

Write Preview
Loading…
Cancel
Save