From 37c8d848cd2b2ec7979919daf3472870a4cb3c73 Mon Sep 17 00:00:00 2001 From: matthieugomez Date: Sat, 24 Oct 2015 17:21:36 -0400 Subject: [PATCH] add type in kwars --- README.md | 2 +- src/edit_distances.jl | 4 ++-- src/qgrams_distances.jl | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b8aa07f..f80ddbb 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/src/edit_distances.jl b/src/edit_distances.jl index fb43f2a..d3dd1f7 100644 --- a/src/edit_distances.jl +++ b/src/edit_distances.jl @@ -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 diff --git a/src/qgrams_distances.jl b/src/qgrams_distances.jl index 57fd239..bab0095 100644 --- a/src/qgrams_distances.jl +++ b/src/qgrams_distances.jl @@ -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) \ No newline at end of file +jaccard(s1::AbstractString, s2::AbstractString; q::Integer = 2) = evaluate(Jaccard(q), s1::AbstractString, s2::AbstractString) \ No newline at end of file