Merge pull request #31 from KristofferC/kc/typess

fix some hard coding of types

Author: KristofferC

src/common.jl

@@ -98,25 +98,26 @@ function sqrt!(a::AbstractArray)
     a
 end
 
-function sumsq_percol(a::AbstractMatrix)
+function sumsq_percol{T}(a::AbstractMatrix{T})
     m = size(a, 1)
     n = size(a, 2)
-    r = Array(Float64, n)
+    r = Array(T, n)
     for j = 1:n
         aj = view(a,:,j)
         r[j] = dot(aj, aj)
     end
     return r
 end
 
-function wsumsq_percol(w::AbstractArray, a::AbstractMatrix)
+function wsumsq_percol{T1, T2}(w::AbstractArray{T1}, a::AbstractMatrix{T2})
     m = size(a, 1)
     n = size(a, 2)
-    r = Array(Float64, n)
+    T = typeof(one(T1)*one(T2))
+    r = Array(T, n)
     for j = 1:n
         aj = view(a,:,j)
-        s = 0.
-        for i = 1:m
+        s = zero(T)
+        @simd for i = 1:m
             @inbounds s += w[i] * abs2(aj[i])
         end
         r[j] = s

src/wmetrics.jl

@@ -64,7 +64,7 @@ function evaluate(d::UnionWeightedMetrics, a::AbstractArray, b::AbstractArray)
     end
     s = eval_start(d, a, b)
     if size(a) == size(b)
-        for I in eachindex(a, b, d.weights)
+        @simd for I in eachindex(a, b, d.weights)
             @inbounds ai = a[I]
             @inbounds bi = b[I]
             @inbounds wi = d.weights[I]