Merge pull request #34 from KristofferC/kc/type_asserts

remove unnecessary type asserts

Author: KristofferC

src/mahalanobis.jl

@@ -23,22 +23,22 @@ sqmahalanobis(a::AbstractVector, b::AbstractVector, Q::AbstractMatrix) = evaluat
 
 function colwise!{T<:AbstractFloat}(r::AbstractArray, dist::SqMahalanobis{T}, a::AbstractMatrix, b::AbstractMatrix)
     Q = dist.qmat
-    m::Int, n::Int = get_colwise_dims(size(Q, 1), r, a, b)
+    m, n = get_colwise_dims(size(Q, 1), r, a, b)
     z = a - b
     dot_percol!(r, Q * z, z)
 end
 
 function colwise!{T<:AbstractFloat}(r::AbstractArray, dist::SqMahalanobis{T}, a::AbstractVector, b::AbstractMatrix)
     Q = dist.qmat
-    m::Int, n::Int = get_colwise_dims(size(Q, 1), r, a, b)
+    m, n = get_colwise_dims(size(Q, 1), r, a, b)
     z = a .- b
     Qz = Q * z
     dot_percol!(r, Q * z, z)
 end
 
 function pairwise!{T<:AbstractFloat}(r::AbstractMatrix, dist::SqMahalanobis{T}, a::AbstractMatrix, b::AbstractMatrix)
     Q = dist.qmat
-    m::Int, na::Int, nb::Int = get_pairwise_dims(size(Q, 1), r, a, b)
+    m, na, nb = get_pairwise_dims(size(Q, 1), r, a, b)
 
     Qa = Q * a
     Qb = Q * b
@@ -56,7 +56,7 @@ end
 
 function pairwise!{T<:AbstractFloat}(r::AbstractMatrix, dist::SqMahalanobis{T}, a::AbstractMatrix)
     Q = dist.qmat
-    m::Int, n::Int = get_pairwise_dims(size(Q, 1), r, a)
+    m, n = get_pairwise_dims(size(Q, 1), r, a)
 
     Qa = Q * a
     sa2 = dot_percol(a, Qa)
@@ -98,5 +98,3 @@ end
 function pairwise!{T<:AbstractFloat}(r::AbstractMatrix, dist::Mahalanobis{T}, a::AbstractMatrix)
     sqrt!(pairwise!(r, SqMahalanobis(dist.qmat), a))
 end
-
-

src/metrics.jl

@@ -198,7 +198,7 @@ function pdist!(r, sa2, sb2)
     r
 end
 function pairwise!(r::AbstractMatrix, dist::SqEuclidean, a::AbstractMatrix)
-    m::Int, n::Int = get_pairwise_dims(r, a)
+    m, n = get_pairwise_dims(r, a)
     At_mul_B!(r, a, a)
     sa2 = sumsq_percol(a)
     for j = 1 : n
@@ -215,7 +215,7 @@ end
 
 # Euclidean
 function pairwise!(r::AbstractMatrix, dist::Euclidean, a::AbstractMatrix, b::AbstractMatrix)
-    m::Int, na::Int, nb::Int = get_pairwise_dims(r, a, b)
+    m, na, nb = get_pairwise_dims(r, a, b)
     At_mul_B!(r, a, b)
     sa2 = sumsq_percol(a)
     sb2 = sumsq_percol(b)
@@ -228,7 +228,7 @@ function pairwise!(r::AbstractMatrix, dist::Euclidean, a::AbstractMatrix, b::Abs
     r
 end
 function pairwise!(r::AbstractMatrix, dist::Euclidean, a::AbstractMatrix)
-    m::Int, n::Int = get_pairwise_dims(r, a)
+    m, n = get_pairwise_dims(r, a)
     At_mul_B!(r, a, a)
     sa2 = sumsq_percol(a)
     for j = 1 : n
@@ -246,7 +246,7 @@ end
 
 # CosineDist
 function pairwise!(r::AbstractMatrix, dist::CosineDist, a::AbstractMatrix, b::AbstractMatrix)
-    m::Int, na::Int, nb::Int = get_pairwise_dims(r, a, b)
+    m, na, nb = get_pairwise_dims(r, a, b)
     At_mul_B!(r, a, b)
     ra = sqrt!(sumsq_percol(a))
     rb = sqrt!(sumsq_percol(b))
@@ -288,8 +288,3 @@ end
 function pairwise!(r::AbstractMatrix, dist::CorrDist, a::AbstractMatrix)
     pairwise!(r, CosineDist(), _centralize_colwise(a))
 end
-
-
-
-
-

src/wmetrics.jl

@@ -117,7 +117,7 @@ whamming(a::AbstractArray, b::AbstractArray, w::AbstractArray) = evaluate(Weight
 # SqEuclidean
 function pairwise!(r::AbstractMatrix, dist::WeightedSqEuclidean, a::AbstractMatrix, b::AbstractMatrix)
     w = dist.weights
-    m::Int, na::Int, nb::Int = get_pairwise_dims(length(w), r, a, b)
+    m, na, nb = get_pairwise_dims(length(w), r, a, b)
 
     sa2 = wsumsq_percol(w, a)
     sb2 = wsumsq_percol(w, b)
@@ -131,7 +131,7 @@ function pairwise!(r::AbstractMatrix, dist::WeightedSqEuclidean, a::AbstractMatr
 end
 function pairwise!(r::AbstractMatrix, dist::WeightedSqEuclidean, a::AbstractMatrix)
     w = dist.weights
-    m::Int, n::Int = get_pairwise_dims(length(w), r, a)
+    m, n = get_pairwise_dims(length(w), r, a)
 
     sa2 = wsumsq_percol(w, a)
     At_mul_B!(r, a, a .* w)
@@ -160,4 +160,4 @@ function pairwise!(r::AbstractMatrix, dist::WeightedEuclidean, a::AbstractMatrix
 end
 function pairwise!(r::AbstractMatrix, dist::WeightedEuclidean, a::AbstractMatrix)
     sqrt!(pairwise!(r, WeightedSqEuclidean(dist.weights), a))
-end
+end