max_fast not robust

baggepinnen · May 26, 2020 · 93e807b · 93e807b
1 parent ba4ce75
commit 93e807b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/dtw.jl b/src/dtw.jl
@@ -299,8 +299,7 @@ const LVB = LoopVectorization.VectorizationBase
     ninvγ = one(T) / γ
     v = LVB.SVec{4,T}((a, b, c, typemax(T)))
     v = v * ninvγ
-    maxv = Base.FastMath.max_fast(a,b,c) * ninvγ
+    maxv = maximum(v)#Base.FastMath.max_fast(a,b,c) * ninvγ
     ve = exp(v - maxv) * LVB.SVec{4,T}((one(T), one(T), one(T), zero(T)))
-
     γ*(log(sum(ve)) + maxv)
 end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -500,10 +500,8 @@ using Distances, Plots
         T = randn(100)
         d = DTW(5)
         D = distance_profile(d, Q, T)
-        @test D[1] ≈ d(Q, getwindow(T,10,1))
-        @test D[2] ≈ d(Q, getwindow(T,10,2))
-        @test D[91] ≈ d(Q, getwindow(T,10,91))
-
+        @test length(D) == 100-10+1
+        foreach(i->@test(D[i] ≈ d(Q, getwindow(T,10,i))), 1:91)
     end