mirrors
/
StringDistances.jl
mirror of https://github.com/matthieugomez/StringDistances.jl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add type in kwars

pull/1/head
matthieugomez 2015-10-24 17:21:36 -04:00
parent 25a38cff8d
commit 37c8d848cd
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -12,7 +12,7 @@
- [x] Cosine Distance
- [x] Jaccard Distance
Support for ASCII, UTF-8 and Unicode
Should work with ASCII, UTF-8 and Unicode
# Syntax
There are two possible syntaxes for any distance:

4
src/edit_distances.jl
View File

@ -158,7 +158,7 @@ damerau_levenshtein(s1::AbstractString, s2::AbstractString) = evaluate(DamerauLe
##
##############################################################################
type JaroWinkler{T1 <: Number, T2 <: Number, T3 <: Integer}
type JaroWinkler{T1 <: Real, T2 <: Real, T3 <: Integer}
scaling_factor::T1 # scaling factor. Default to 0.1
boosting_threshold::T2 # boost threshold. Default to 0.7
long_threshold::T3 # long string adjustment. Default to 5
@ -230,7 +230,7 @@ function evaluate(dist::JaroWinkler, s1::AbstractString, s2::AbstractString)
end
function jaro_winkler(s1::AbstractString, s2::AbstractString;
scaling_factor = 0.1, boosting_threshold = 0.7, long_threshold = 5)
scaling_factor::Real = 0.1, boosting_threshold::Real = 0.7, long_threshold::Integer = 5)
evaluate(JaroWinkler(scaling_factor, boosting_threshold, long_threshold), s1, s2)
end

6
src/qgrams_distances.jl
View File

@ -91,7 +91,7 @@ function evaluate(dist::QGram, s1::AbstractString, s2::AbstractString)
return length(q1) - length(q2) + 2 * length(bag2)
end
qgram(s1::AbstractString, s2::AbstractString; q = 2) = evaluate(QGram(q), s1::AbstractString, s2::AbstractString)
qgram(s1::AbstractString, s2::AbstractString; q::Integer = 2) = evaluate(QGram(q), s1::AbstractString, s2::AbstractString)
##############################################################################
##
@ -123,7 +123,7 @@ function evaluate(dist::Cosine, s1::AbstractString, s2::AbstractString)
denominator == 0 ? 1.0 : 1.0 - numerator / denominator
end
cosine(s1::AbstractString, s2::AbstractString; q = 2) = evaluate(Cosine(q), s1::AbstractString, s2::AbstractString)
cosine(s1::AbstractString, s2::AbstractString; q::Integer = 2) = evaluate(Cosine(q), s1::AbstractString, s2::AbstractString)
##############################################################################
##
@ -159,4 +159,4 @@ function evaluate(dist::Jaccard, s1::AbstractString, s2::AbstractString)
return 1.0 - numerator / denominator
end
jaccard(s1::AbstractString, s2::AbstractString; q = 2) = evaluate(Jaccard(q), s1::AbstractString, s2::AbstractString)
jaccard(s1::AbstractString, s2::AbstractString; q::Integer = 2) = evaluate(Jaccard(q), s1::AbstractString, s2::AbstractString)