Fix Random breakage and deprecations for v0.7

Author: Andy Ferris

src/StaticArrays.jl

@@ -4,15 +4,21 @@ module StaticArrays
 
 import Base: @_inline_meta, @_propagate_inbounds_meta, @_pure_meta, @propagate_inbounds, @pure
 
-import Base: getindex, setindex!, size, similar, vec, show,
-             length, convert, promote_op, promote_rule, map, map!, reduce, reducedim, mapreducedim,
-             mapreduce, broadcast, broadcast!, conj, transpose,
-             hcat, vcat, ones, zeros, eye, one, cross, vecdot, reshape, fill,
-             fill!, det, logdet, inv, eig, eigvals, eigfact, expm, logm, sqrtm, lyap, trace, kron, diag, vecnorm, norm, dot, diagm, diag,
-             lu, svd, svdvals, svdfact, factorize, ishermitian, issymmetric, isposdef,
-             iszero, sum, diff, prod, count, any, all, minimum,
-             maximum, extrema, mean, copy, rand, randn, randexp, rand!, randn!,
-             randexp!, normalize, normalize!, read, read!, write, Eigen
+import Base: getindex, setindex!, size, similar, vec, show, length, convert, promote_op,
+             promote_rule, map, map!, reduce, reducedim, mapreducedim, mapreduce, broadcast,
+             broadcast!, conj, transpose, hcat, vcat, ones, zeros, eye, one, cross, vecdot,
+             reshape, fill, fill!, det, logdet, inv, eig, eigvals, eigfact, expm, logm,
+             sqrtm, lyap, trace, kron, diag, vecnorm, norm, dot, diagm, diag, lu, svd,
+             svdvals, svdfact, factorize, ishermitian, issymmetric, isposdef, iszero, sum,
+             diff, prod, count, any, all, minimum, maximum, extrema, mean, copy, normalize,
+             normalize!, read, read!, write, Eigen
+
+if VERSION < v"0.7-"
+    import Base: rand, randn, randexp, rand!, randn!, randexp!
+else
+    using Random
+    import Random: rand, randn, randexp, rand!, randn!, randexp!
+end
 
 import Compat.adjoint
 

src/abstractarray.jl

@@ -11,7 +11,7 @@ end
 
 # This seems to confuse Julia a bit in certain circumstances (specifically for trailing 1's)
 @inline function Base.isassigned(a::StaticArray, i::Int...)
-    ii = sub2ind(size(a), i...)
+    ii = LinearIndices(size(a))[i...]
     1 <= ii <= length(a) ? true : false
 end
 

src/triangular.jl

@@ -16,7 +16,7 @@ import Base: \, Ac_ldiv_B, At_ldiv_B
 @inline *(rowvec::RowVector{<:Any,<:StaticVector}, A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}) = transpose(A * transpose(rowvec))
 @inline A_mul_Bt(rowvec::RowVector{<:Any,<:StaticVector}, A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}) = transpose(A * transpose(rowvec))
 @inline A_mul_Bt(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, rowvec::RowVector{<:Any,<:StaticVector}) = A * transpose(rowvec)
-@inline At_mul_Bt(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, rowvec::RowVector{<:Any,<:StaticVector}) = A.' * transpose(rowvec)
+@inline At_mul_Bt(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, rowvec::RowVector{<:Any,<:StaticVector}) = transpose(A) * transpose(rowvec)
 @inline A_mul_Bc(rowvec::RowVector{<:Any,<:StaticVector}, A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}) = adjoint(A * adjoint(rowvec))
 @inline A_mul_Bc(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, rowvec::RowVector{<:Any,<:StaticVector}) = A * adjoint(rowvec)
 @inline Ac_mul_Bc(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, rowvec::RowVector{<:Any,<:StaticVector}) = A' * adjoint(rowvec)
@@ -27,8 +27,8 @@ A_mul_Bc(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, B::StaticMatri
 A_mul_Bt(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, B::StaticMatrix) = (*)(A, transpose(B))
 Ac_mul_Bc(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, B::StaticMatrix) = Ac_mul_B(A, B')
 Ac_mul_Bc(A::StaticMatrix, B::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}) = A_mul_Bc(A', B)
-At_mul_Bt(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, B::StaticMatrix) = At_mul_B(A, B.')
-At_mul_Bt(A::StaticMatrix, B::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}) = A_mul_Bt(A.', B)
+At_mul_Bt(A::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}, B::StaticMatrix) = At_mul_B(A, transpose(B))
+At_mul_Bt(A::StaticMatrix, B::Base.LinAlg.AbstractTriangular{<:Any,<:StaticMatrix}) = A_mul_Bt(transpose(A), B)
 
 @inline \(A::Union{UpperTriangular{<:Any,<:StaticMatrix},LowerTriangular{<:Any,<:StaticMatrix}}, B::StaticVecOrMat) = _A_ldiv_B(Size(A), Size(B), A, B)
 @inline Ac_ldiv_B(A::Union{UpperTriangular{<:Any,<:StaticMatrix},LowerTriangular{<:Any,<:StaticMatrix}}, B::StaticVecOrMat) = _Ac_ldiv_B(Size(A), Size(B), A, B)
@@ -102,9 +102,9 @@ end
     code = quote end
     for j = 1:n
         for i = m:-1:1
-            ex = :(A.data[$(sub2ind(sa,i,i))].'*B[$(sub2ind(sb,i,j))])
+            ex = :(transpose(A.data[$(sub2ind(sa,i,i))])*B[$(sub2ind(sb,i,j))])
             for k = 1:i-1
-                ex = :($ex + A.data[$(sub2ind(sa,k,i))].'*B[$(sub2ind(sb,k,j))])
+                ex = :($ex + transpose(A.data[$(sub2ind(sa,k,i))])*B[$(sub2ind(sb,k,j))])
             end
             push!(code.args, :($(X[i,j]) = $ex))
         end
@@ -186,9 +186,9 @@ end
     code = quote end
     for j = 1:n
         for i = 1:m
-            ex = :(A.data[$(sub2ind(sa,i,i))].'*B[$(sub2ind(sb,i,j))])
+            ex = :(transpose(A.data[$(sub2ind(sa,i,i))])*B[$(sub2ind(sb,i,j))])
             for k = i+1:m
-                ex = :($ex + A.data[$(sub2ind(sa,k,i))].'*B[$(sub2ind(sb,k,j))])
+                ex = :($ex + transpose(A.data[$(sub2ind(sa,k,i))])*B[$(sub2ind(sb,k,j))])
             end
             push!(code.args, :($(X[i,j]) = $ex))
         end
@@ -267,9 +267,9 @@ end
     code = quote end
     for i = 1:m
         for j = 1:n
-            ex = :(A[$(sub2ind(sa,i,j))]*B[$(sub2ind(sb,j,j))].')
+            ex = :(A[$(sub2ind(sa,i,j))]*transpose(B[$(sub2ind(sb,j,j))]))
             for k = j+1:n
-                ex = :($ex + A[$(sub2ind(sa,i,k))]*B.data[$(sub2ind(sb,j,k))].')
+                ex = :($ex + A[$(sub2ind(sa,i,k))]*transpose(B.data[$(sub2ind(sb,j,k))]))
             end
             push!(code.args, :($(X[i,j]) = $ex))
         end
@@ -348,9 +348,9 @@ end
     code = quote end
     for i = 1:m
         for j = n:-1:1
-            ex = :(A[$(sub2ind(sa,i,j))]*B[$(sub2ind(sb,j,j))].')
+            ex = :(A[$(sub2ind(sa,i,j))]*transpose(B[$(sub2ind(sb,j,j))]))
             for k = 1:j-1
-                ex = :($ex + A[$(sub2ind(sa,i,k))]*B.data[$(sub2ind(sb,j,k))].')
+                ex = :($ex + A[$(sub2ind(sa,i,k))]*transpose(B.data[$(sub2ind(sb,j,k))]))
             end
             push!(code.args, :($(X[i,j]) = $ex))
         end

test/runtests.jl

@@ -1,5 +1,10 @@
 using StaticArrays
-using Base.Test
+if VERSION > v"0.7-"
+    using Test
+    using Random
+else
+    using Base.Test
+end
 
 # We generate a lot of matrices using rand(), but unit tests should be
 # deterministic. Therefore seed the RNG here (and further down, to avoid test