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

add inbounds

pull/1/head
matthieugomez 2015-10-22 12:51:43 -04:00
parent 97a966db99
commit d95fa1ac2b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/StringDistances.jl
View File

@ -28,7 +28,7 @@ type Hamming end
function evaluate(dist::Hamming, s1::AbstractString, s2::AbstractString) function evaluate(dist::Hamming, s1::AbstractString, s2::AbstractString)
length(s1) > length(s2) && return evaluate(dist, s2, s1) length(s1) > length(s2) && return evaluate(dist, s2, s1)
count = 0 count = 0
for i in 1:length(s1) @inbounds for i in 1:length(s1)
count += s1[i] != s2[i] count += s1[i] != s2[i]
end end
count += length(s2) - length(s1) count += length(s2) - length(s1)
@ -50,10 +50,10 @@ function evaluate(dist::Levenshtein, s1::AbstractString, s2::AbstractString)
length(s2) == 0 && return 0 length(s2) == 0 && return 0
dist = Array(Int, length(s1) + 1) dist = Array(Int, length(s1) + 1)
for i1 in 1:length(s1) @inbounds for i1 in 1:length(s1)
dist[i1 + 1] = i1 dist[i1 + 1] = i1
end end
for i2 in 1:length(s2) @inbounds for i2 in 1:length(s2)
dist[1] = i2 dist[1] = i2
lastdiag = i2 - 1 lastdiag = i2 - 1
for i1 in 1:length(s1) for i1 in 1:length(s1)
@ -87,7 +87,7 @@ function evaluate(dist::JaroWinkler, s1::AbstractString, s2::AbstractString)
t = 0 # half number of transpositions t = 0 # half number of transpositions
flag = fill(false, length(s2)) flag = fill(false, length(s2))
prevpos = 0 prevpos = 0
for i1 in 1:length(s1) @inbounds for i1 in 1:length(s1)
ch = s1[i1] ch = s1[i1]
i2low = max(1, i1 - maxdist) i2low = max(1, i1 - maxdist)
i2high = min(length(s2), i1 + maxdist) i2high = min(length(s2), i1 + maxdist)