From 00326764e9dc53cf8a96451bf4245b472d273998 Mon Sep 17 00:00:00 2001 From: Alexander Moisseev Date: Mon, 16 Apr 2018 11:04:14 +0300 Subject: [PATCH] [Minor] Discriminate infrequent common tokens as well --- src/plugins/lua/bayes_expiry.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/lua/bayes_expiry.lua b/src/plugins/lua/bayes_expiry.lua index ea7ae1a9f..aeedf5f17 100644 --- a/src/plugins/lua/bayes_expiry.lua +++ b/src/plugins/lua/bayes_expiry.lua @@ -201,7 +201,13 @@ local expiry_script = [[ local threshold = mean local total = spam + ham - if total >= threshold and total > 0 then + if total == 0 or math.abs(ham - spam) <= total * ${epsilon_common} then + common = common + 1 + if ttl > ${common_ttl} then + discriminated = discriminated + 1 + redis.call('EXPIRE', key, ${common_ttl}) + end + elseif total >= threshold and total > 0 then if ham / total > ${significant_factor} or spam / total > ${significant_factor} then significant = significant + 1 if ${lazy} or expire < 0 then @@ -214,12 +220,6 @@ local expiry_script = [[ extended = extended + 1 end end - elseif total == 0 or math.abs(ham - spam) <= total * ${epsilon_common} then - common = common + 1 - if ttl > ${common_ttl} then - discriminated = discriminated + 1 - redis.call('EXPIRE', key, ${common_ttl}) - end else infrequent = infrequent + 1 if expire < 0 then -- 2.39.5