pull/1/head
matthieugomez 2015-10-22 12:53:27 -04:00
parent d95fa1ac2b
commit a8984c6904
1 changed files with 9 additions and 5 deletions

View File

@ -105,8 +105,8 @@ function evaluate(dist::JaroWinkler, s1::AbstractString, s2::AbstractString)
end
end
m == 0.0 && return 0.0
score = (m / length(s1) + m / length(s2) + (m - t) / m) / 3.0
# common prefix adjustment
if (dist.scaling_factor > 0 && score >= dist.boosting_threshold) || (length(s1) >= dist.long_threshold)
l = 0
@ -126,7 +126,11 @@ function evaluate(dist::JaroWinkler, s1::AbstractString, s2::AbstractString)
return score
end
jaro_winkler(s1::AbstractString, s2::AbstractString; scaling_factor = 0.1, boosting_threshold = 0.7, long_threshold = 5) = evaluate(JaroWinkler(scaling_factor, boosting_threshold, long_threshold), s1, s2)
function jaro_winkler(s1::AbstractString, s2::AbstractString;
scaling_factor = 0.1, boosting_threshold = 0.7, long_threshold = 5)
evaluate(JaroWinkler(scaling_factor, boosting_threshold, long_threshold), s1, s2)
end
jaro(s1::AbstractString, s2::AbstractString) = evaluate(JaroWinkler(0.0, 0.0, 0), s1, s2)
end