Skip to content

Commit aaa99e9

Browse files
fredrikekrefredrikekre
committed
fix review comments
1 parent 44b70a7 commit aaa99e9

File tree

7 files changed

+23
-24
lines changed

7 files changed

+23
-24
lines changed

‎src/StaticArrays.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ import LinearAlgebra: transpose, adjoint, eye, vecdot, eigvals, eigen, lyap, tr,
1919
kron, diag, norm, dot, diagm, lu, svd, svdvals, svdfact,
2020
factorize, ishermitian, issymmetric, isposdef, normalize,
2121
normalize!, Eigen, det, logdet, cross, diff, qr
22-
const TransposeVector{T, V<:AbstractVector{T}} = Transpose{T, V}
23-
const AdjointVector{T, V<:AbstractVector{T}} = Adjoint{T, V}
2422

2523
export StaticScalar, StaticArray, StaticVector, StaticMatrix
2624
export Scalar, SArray, SVector, SMatrix

‎src/deque.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ end
4444
end
4545
end
4646

47-
@deprecate shirt popfirst
47+
@deprecate shift popfirst
4848
@inline popfirst(vec::StaticVector) = _popfirst(Size(vec), vec)
4949
@generated function _popfirst(::Size{s}, vec::StaticVector) where {s}
5050
newlen = s[1] - 1

‎src/io.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11

22
@inline function read!(io::IO, ::Type{SA}) where {SA<:StaticArray}
3-
# Copy Base implementation of `read!` for primitive types. This is less
4-
# efficient in 0.6 that we'd like because creating the Ref allocates.
53
elements = Ref{NTuple{length(SA),eltype(SA)}}()
64
read!(io, elements)
75
SA(elements[])

‎src/linalg.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ end
375375
end
376376

377377
@inline function kron(
378-
a::Union{TransposeVector{<:Number,<:StaticVector}, AdjointVector{<:Number,<:StaticVector}},
379-
b::Union{TransposeVector{<:Number,<:StaticVector}, AdjointVector{<:Number,<:StaticVector}})
378+
a::Union{Transpose{<:Number,<:StaticVector}, Adjoint{<:Number,<:StaticVector}},
379+
b::Union{Transpose{<:Number,<:StaticVector}, Adjoint{<:Number,<:StaticVector}})
380380
_kron_tvec_x_tvec(_length_limit, Size(a), Size(b), a, b)
381381
end
382382
@generated function _kron_tvec_x_tvec(::Length{length_limit}, ::Size{SA}, ::Size{SB}, a, b) where {length_limit,SA,SB}
@@ -394,7 +394,7 @@ end
394394
end
395395

396396
@inline function kron(
397-
a::Union{TransposeVector{<:Number,<:StaticVector}, AdjointVector{<:Number,<:StaticVector}},
397+
a::Union{Transpose{<:Number,<:StaticVector}, Adjoint{<:Number,<:StaticVector}},
398398
b::StaticVector)
399399
_kron_tvec_x_vec(_length_limit, Size(a), Size(b), a, b)
400400
end
@@ -414,7 +414,7 @@ end
414414

415415
@inline function kron(
416416
a::StaticVector,
417-
b::Union{TransposeVector{<:Number,<:StaticVector}, AdjointVector{<:Number,<:StaticVector}})
417+
b::Union{Transpose{<:Number,<:StaticVector}, Adjoint{<:Number,<:StaticVector}})
418418
_kron_vec_x_tvec(_length_limit, Size(a), Size(b), a, b)
419419
end
420420
@generated function _kron_vec_x_tvec(::Length{length_limit}, ::Size{SA}, ::Size{SB}, a, b) where {length_limit,SA,SB}
@@ -463,7 +463,7 @@ end
463463

464464
@inline function kron(
465465
a::StaticMatrix,
466-
b::Union{TransposeVector{<:Number,<:StaticVector}, AdjointVector{<:Number,<:StaticVector}})
466+
b::Union{Transpose{<:Number,<:StaticVector}, Adjoint{<:Number,<:StaticVector}})
467467
_kron_mat_x_tvec(_length_limit, Size(a), Size(b), a, b)
468468
end
469469
@generated function _kron_mat_x_tvec(::Length{length_limit}, ::Size{SA}, ::Size{SB}, a, b) where {length_limit,SA,SB}
@@ -481,7 +481,7 @@ end
481481
end
482482

483483
@inline function kron(
484-
a::Union{TransposeVector{<:Number,<:StaticVector}, AdjointVector{<:Number,<:StaticVector}},
484+
a::Union{Transpose{<:Number,<:StaticVector}, Adjoint{<:Number,<:StaticVector}},
485485
b::StaticMatrix)
486486
_kron_tvec_x_mat(_length_limit, Size(a), Size(b), a, b)
487487
end

‎src/mapreduce.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
## map / map! ##
55
################
66

7+
# In 0.6 the three methods below could be replaced with
8+
# `map(f, as::Union{<:StaticArray,AbstractArray}...)` which included at least one `StaticArray`
9+
# this is not the case on 0.7 and we instead hope to find a StaticArray in the first two arguments.
710
@inline function map(f, a1::StaticArray, as::AbstractArray...)
811
_map(f, same_size(a1, as...), a1, as...)
912
end

‎src/matrix_multiply.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import LinearAlgebra: BlasFloat, matprod, mul!
88
@inline *(A::StaticMatrix, B::StaticVector) = _mul(Size(A), Size(B), A, B)
99
@inline *(A::StaticMatrix, B::StaticMatrix) = _mul(Size(A), Size(B), A, B)
1010
@inline *(A::StaticVector, B::StaticMatrix) = *(reshape(A, Size(Size(A)[1], 1)), B)
11-
@inline *(A::StaticVector, B::TransposeVector{<:Any, <:StaticVector}) = _mul(Size(A), Size(B), A, B)
12-
@inline *(A::StaticVector, B::AdjointVector{<:Any, <:StaticVector}) = _mul(Size(A), Size(B), A, B)
11+
@inline *(A::StaticVector, B::Transpose{<:Any, <:StaticVector}) = _mul(Size(A), Size(B), A, B)
12+
@inline *(A::StaticVector, B::Adjoint{<:Any, <:StaticVector}) = _mul(Size(A), Size(B), A, B)
1313

1414
@inline mul!(dest::StaticVecOrMat, A::StaticMatrix, B::StaticVector) = _mul!(Size(dest), dest, Size(A), Size(B), A, B)
1515
@inline mul!(dest::StaticVecOrMat, A::StaticMatrix, B::StaticMatrix) = _mul!(Size(dest), dest, Size(A), Size(B), A, B)
1616
@inline mul!(dest::StaticVecOrMat, A::StaticVector, B::StaticMatrix) = mul!(dest, reshape(A, Size(Size(A)[1], 1)), B)
17-
@inline mul!(dest::StaticVecOrMat, A::StaticVector, B::TransposeVector{<:Any, <:StaticVector}) = _mul!(Size(dest), dest, Size(A), Size(B), A, B)
18-
@inline mul!(dest::StaticVecOrMat, A::StaticVector, B::AdjointVector{<:Any, <:StaticVector}) = _mul!(Size(dest), dest, Size(A), Size(B), A, B)
17+
@inline mul!(dest::StaticVecOrMat, A::StaticVector, B::Transpose{<:Any, <:StaticVector}) = _mul!(Size(dest), dest, Size(A), Size(B), A, B)
18+
@inline mul!(dest::StaticVecOrMat, A::StaticVector, B::Adjoint{<:Any, <:StaticVector}) = _mul!(Size(dest), dest, Size(A), Size(B), A, B)
1919

2020
#@inline *{TA<:LinearAlgebra.BlasFloat,Tb}(A::StaticMatrix{TA}, b::StaticVector{Tb})
2121

@@ -59,7 +59,7 @@ end
5959

6060
# outer product
6161
@generated function _mul(::Size{sa}, ::Size{sb}, a::StaticVector{<: Any, Ta},
62-
b::Union{TransposeVector{Tb, <:StaticVector}, AdjointVector{Tb, <:StaticVector}}) where {sa, sb, Ta, Tb}
62+
b::Union{Transpose{Tb, <:StaticVector}, Adjoint{Tb, <:StaticVector}}) where {sa, sb, Ta, Tb}
6363
newsize = (sa[1], sb[2])
6464
exprs = [:(a[$i]*b[$j]) for i = 1:sa[1], j = 1:sb[2]]
6565

@@ -228,7 +228,7 @@ end
228228
end
229229

230230
@generated function _mul!(::Size{sc}, c::StaticMatrix, ::Size{sa}, ::Size{sb}, a::StaticVector,
231-
b::Union{TransposeVector{<:Any, <:StaticVector}, AdjointVector{<:Any, <:StaticVector}}) where {sa, sb, sc}
231+
b::Union{Transpose{<:Any, <:StaticVector}, Adjoint{<:Any, <:StaticVector}}) where {sa, sb, sc}
232232
if sa[1] != sc[1] || sb[2] != sc[2]
233233
throw(DimensionMismatch("Tried to multiply arrays of size $sa and $sb and assign to array of size $sc"))
234234
end

‎test/eigen.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ using StaticArrays, Test, LinearAlgebra
104104
v = randn(SVector{3,Float64})
105105
m = v*v'
106106
vv = sum(abs2, v)
107-
vals, vecs = eigen(m)
107+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
108108

109109
@test vecs'*vecs ≈ one(SMatrix{3,3,Float64})
110110
@test vals ≈ SVector(0.0, 0.0, vv)
@@ -115,7 +115,7 @@ using StaticArrays, Test, LinearAlgebra
115115
v2 -= dot(v,v2)*v/(vv)
116116
v2v2 = sum(abs2, v2)
117117
m += v2*v2'
118-
vals, vecs = eigen(m)
118+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
119119

120120
@test vecs'*vecs ≈ one(SMatrix{3,3,Float64})
121121
if vv < v2v2
@@ -127,15 +127,15 @@ using StaticArrays, Test, LinearAlgebra
127127

128128
# Degeneracy (2 large)
129129
m = -99*(v*v')/vv + 100*one(SMatrix{3,3,Float64})
130-
vals, vecs = eigen(m)
130+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
131131

132132
@test vecs'*vecs ≈ one(SMatrix{3,3,Float64})
133133
@test vals ≈ SVector(1.0, 100.0, 100.0)
134134
@test eigvals(m) ≈ vals
135135

136136
# Degeneracy (2 small)
137137
m = (v*v')/vv + 1e-2*one(SMatrix{3,3,Float64})
138-
vals, vecs = eigen(m)
138+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
139139

140140
@test vecs'*vecs ≈ one(SMatrix{3,3,Float64})
141141
@test vals ≈ SVector(1e-2, 1e-2, 1.01)
@@ -145,7 +145,7 @@ using StaticArrays, Test, LinearAlgebra
145145
m = @SMatrix [1.0 0.0 0.0;
146146
0.0 1.0 1.0;
147147
0.0 1.0 1.0]
148-
vals, vecs = eigen(m)
148+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
149149

150150
@test vals ≈ [0.0, 1.0, 2.0]
151151
@test vecs*diagm(Val(0) => vals)*vecs' ≈ m
@@ -154,7 +154,7 @@ using StaticArrays, Test, LinearAlgebra
154154
m = @SMatrix [1.0 0.0 1.0;
155155
0.0 1.0 0.0;
156156
1.0 0.0 1.0]
157-
vals, vecs = eigen(m)
157+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
158158

159159
@test vals ≈ [0.0, 1.0, 2.0]
160160
@test vecs*diagm(Val(0) => vals)*vecs' ≈ m
@@ -163,7 +163,7 @@ using StaticArrays, Test, LinearAlgebra
163163
m = @SMatrix [1.0 1.0 0.0;
164164
1.0 1.0 0.0;
165165
0.0 0.0 1.0]
166-
vals, vecs = eigen(m)
166+
vals, vecs = eigen(m)::Eigen{<:Any,<:Any,<:SMatrix,<:SVector}
167167

168168
@test vals ≈ [0.0, 1.0, 2.0]
169169
@test vecs*diagm(Val(0) => vals)*vecs' ≈ m

0 commit comments

Comments
 (0)