Add support for julia-v0.5 slice->view change (#48)

Author: davidavdav

src/Distances.jl

@@ -2,6 +2,8 @@ __precompile__()
 
 module Distances
 
+import Compat.view
+
 export
     # generic types/functions
     PreMetric,

src/common.jl

@@ -103,7 +103,7 @@ function sumsq_percol{T}(a::AbstractMatrix{T})
     n = size(a, 2)
     r = Array(T, n)
     for j = 1:n
-        aj = slice(a, :, j)
+        aj = view(a, :, j)
         r[j] = dot(aj, aj)
     end
     return r
@@ -115,7 +115,7 @@ function wsumsq_percol{T1, T2}(w::AbstractArray{T1}, a::AbstractMatrix{T2})
     T = typeof(one(T1)*one(T2))
     r = Array(T, n)
     for j = 1:n
-        aj = slice(a, :, j)
+        aj = view(a, :, j)
         s = zero(T)
         @simd for i = 1:m
             @inbounds s += w[i] * abs2(aj[i])
@@ -131,13 +131,11 @@ function dot_percol!(r::AbstractArray, a::AbstractMatrix, b::AbstractMatrix)
     size(b) == (m,n) && length(r) == n ||
         throw(DimensionMismatch("Inconsistent array dimensions."))
     for j = 1:n
-        aj = slice(a,:,j)
-        bj = slice(b,:,j)
+        aj = view(a,:,j)
+        bj = view(b,:,j)
         r[j] = dot(aj, bj)
     end
     return r
 end
 
 dot_percol(a::AbstractMatrix, b::AbstractMatrix) = dot_percol!(Array(Float64, size(a,2)), a, b)
-
-

src/generic.jl

@@ -33,7 +33,7 @@ function colwise!(r::AbstractArray, metric::PreMetric, a::AbstractVector, b::Abs
     n = size(b, 2)
     length(r) == n || throw(DimensionMismatch("Incorrect size of r."))
     for j = 1 : n
-        @inbounds r[j] = evaluate(metric, a, slice(b, :, j))
+        @inbounds r[j] = evaluate(metric, a, view(b, :, j))
     end
     r
 end
@@ -42,7 +42,7 @@ function colwise!(r::AbstractArray, metric::PreMetric, a::AbstractMatrix, b::Abs
     n = size(a, 2)
     length(r) == n || throw(DimensionMismatch("Incorrect size of r."))
     for j = 1 : n
-        @inbounds r[j] = evaluate(metric, slice(a, :, j), b)
+        @inbounds r[j] = evaluate(metric, view(a, :, j), b)
     end
     r
 end
@@ -51,7 +51,7 @@ function colwise!(r::AbstractArray, metric::PreMetric, a::AbstractMatrix, b::Abs
     n = get_common_ncols(a, b)
     length(r) == n || throw(DimensionMismatch("Incorrect size of r."))
     for j = 1 : n
-        @inbounds r[j] = evaluate(metric, slice(a, :, j), slice(b, :, j))
+        @inbounds r[j] = evaluate(metric, view(a, :, j), view(b, :, j))
     end
     r
 end
@@ -86,9 +86,9 @@ function pairwise!(r::AbstractMatrix, metric::PreMetric, a::AbstractMatrix, b::A
     nb = size(b, 2)
     size(r) == (na, nb) || throw(DimensionMismatch("Incorrect size of r."))
     for j = 1 : size(b, 2)
-        bj = slice(b,:,j)
+        bj = view(b,:,j)
         for i = 1 : size(a, 2)
-            @inbounds r[i,j] = evaluate(metric, slice(a,:,i), bj)
+            @inbounds r[i,j] = evaluate(metric, view(a,:,i), bj)
         end
     end
     r
@@ -102,9 +102,9 @@ function pairwise!(r::AbstractMatrix, metric::SemiMetric, a::AbstractMatrix)
     n = size(a, 2)
     size(r) == (n, n) || throw(DimensionMismatch("Incorrect size of r."))
     for j = 1 : n
-        aj = slice(a,:,j)
+        aj = view(a,:,j)
         for i = j+1 : n
-            @inbounds r[i,j] = evaluate(metric, slice(a,:,i), aj)
+            @inbounds r[i,j] = evaluate(metric, view(a,:,i), aj)
         end
         @inbounds r[j,j] = 0
         for i = 1 : j-1
@@ -132,5 +132,3 @@ function pairwise(metric::SemiMetric, a::AbstractMatrix)
     r = Array(result_type(metric, a, a), (n, n))
     pairwise!(r, metric, a)
 end
-
-