mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Classifier: use message count instead of max frequency

This commit is contained in:
M66B 2021-01-05 08:39:26 +01:00
parent 522af0c756
commit b2e175cd94
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,6 @@ public class MessageClassifier {
} }
private static String classify(long account, String classify, String text, boolean added, Context context) { private static String classify(long account, String classify, String text, boolean added, Context context) {
int maxFrequency = 0;
int maxMatchedWords = 0; int maxMatchedWords = 0;
List<String> words = new ArrayList<>(); List<String> words = new ArrayList<>();
Map<String, Stat> classStats = new HashMap<>(); Map<String, Stat> classStats = new HashMap<>();
@ -208,8 +207,6 @@ public class MessageClassifier {
for (String clazz : applyClasses) { for (String clazz : applyClasses) {
int frequency = classFrequency.get(clazz); int frequency = classFrequency.get(clazz);
if (frequency > maxFrequency)
maxFrequency = frequency;
Stat stat = classStats.get(clazz); Stat stat = classStats.get(clazz);
if (stat == null) { if (stat == null) {
@ -244,11 +241,12 @@ public class MessageClassifier {
List<Chance> chances = new ArrayList<>(); List<Chance> chances = new ArrayList<>();
for (String clazz : classStats.keySet()) { for (String clazz : classStats.keySet()) {
int messages = classMessages.get(account).get(clazz);
Stat stat = classStats.get(clazz); Stat stat = classStats.get(clazz);
double chance = ((double) stat.totalFrequency / maxFrequency / maxMatchedWords); double chance = (double) stat.totalFrequency / messages / maxMatchedWords;
Chance c = new Chance(clazz, chance); Chance c = new Chance(clazz, chance);
EntityLog.log(context, "Classifier " + c + EntityLog.log(context, "Classifier " + c +
" frequency=" + stat.totalFrequency + "/" + maxFrequency + " frequency=" + stat.totalFrequency + "/" + messages +
" matched=" + stat.matchedWords + "/" + maxMatchedWords); " matched=" + stat.matchedWords + "/" + maxMatchedWords);
chances.add(c); chances.add(c);
} }