import Hamming and hamming
parent
756a1114db
commit
ac97e49964
|
@ -8,7 +8,7 @@ module StringDistances
|
|||
##
|
||||
##############################################################################
|
||||
|
||||
import Distances: evaluate
|
||||
import Distances: evaluate, Hamming, hamming
|
||||
|
||||
export Hamming,
|
||||
Levenshtein,
|
||||
|
@ -25,7 +25,6 @@ jaro
|
|||
## Hamming
|
||||
##
|
||||
##############################################################################
|
||||
type Hamming end
|
||||
|
||||
function evaluate(dist::Hamming, s1::AbstractString, s2::AbstractString)
|
||||
length(s1) > length(s2) && return evaluate(dist, s2, s1)
|
||||
|
@ -36,8 +35,8 @@ function evaluate(dist::Hamming, s1::AbstractString, s2::AbstractString)
|
|||
count += length(s2) - length(s1)
|
||||
return count
|
||||
end
|
||||
hamming(s1::AbstractString, s2::AbstractString) = evaluate(Hamming(), s1, s2)
|
||||
|
||||
hamming(s1::AbstractString, s2::AbstractString) = evaluate(Hamming(), s1, s2)
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
|
@ -110,6 +109,7 @@ function evaluate(dist::Levenshtein, s1::AbstractString, s2::AbstractString)
|
|||
end
|
||||
return current
|
||||
end
|
||||
|
||||
levenshtein(s1::AbstractString, s2::AbstractString) = evaluate(Levenshtein(), s1, s2)
|
||||
|
||||
type DamerauLevenshtein end
|
||||
|
@ -166,6 +166,7 @@ function evaluate(dist::DamerauLevenshtein, s1::AbstractString, s2::AbstractStri
|
|||
end
|
||||
return current
|
||||
end
|
||||
|
||||
damerau_levenshtein(s1::AbstractString, s2::AbstractString) = evaluate(DamerauLevenshtein(), s1, s2)
|
||||
|
||||
##############################################################################
|
||||
|
|
Loading…
Reference in New Issue