Skip to content

Commit aa4b155

Browse files
authored
fix for issue #894 (#895)
* fix for issue #894 * bump version
1 parent 5e5a7a8 commit aa4b155

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "StaticArrays"
22
uuid = "90137ffa-7385-5640-81b9-e52037218182"
3-
version = "1.1.0"
3+
version = "1.1.1"
44

55
[deps]
66
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"

src/matrix_multiply.jl

+1-6
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,7 @@ end
113113
@generated function _mul(::Size{sa}, ::Size{sb}, a::StaticVector{<: Any, Ta},
114114
b::Union{Transpose{Tb, <:StaticVector}, Adjoint{Tb, <:StaticVector}}) where {sa, sb, Ta, Tb}
115115
newsize = (sa[1], sb[2])
116-
conjugate_b = b <: Adjoint
117-
if conjugate_b
118-
exprs = [:(a[$i] * adjoint(b[$j])) for i = 1:sa[1], j = 1:sb[2]]
119-
else
120-
exprs = [:(a[$i] * transpose(b[$j])) for i = 1:sa[1], j = 1:sb[2]]
121-
end
116+
exprs = [:(a[$i]*b[$j]) for i = 1:sa[1], j = 1:sb[2]]
122117

123118
return quote
124119
@_inline_meta

test/matrix_multiply.jl

+21
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,27 @@ mul_wrappers = [
136136
@test_throws DimensionMismatch cv_bad*rv
137137
end
138138

139+
@testset "vector-column vector" begin
140+
for T1 in [Float64, ComplexF64, SMatrix{2,2,Float64,4}, SMatrix{2,2,ComplexF64,4}],
141+
T2 in [Float64, ComplexF64, SMatrix{2,2,Float64,4}, SMatrix{2,2,ComplexF64,4}]
142+
143+
v1 = @SVector randn(T1, 4)
144+
v2 = @SVector randn(T2, 4)
145+
if T1 <: Number
146+
v1a = Array(v1)
147+
else
148+
v1a = Array(Array.(v1))
149+
end
150+
if T2 <: Number
151+
v2a = Array(v2)
152+
else
153+
v2a = Array(Array.(v2))
154+
end
155+
@test all(isapprox.(v1 * adjoint(v2), v1a * adjoint(v2a)))
156+
@test all(isapprox.(v1 * transpose(v2), v1a * transpose(v2a)))
157+
end
158+
end
159+
139160
@testset "Matrix-matrix" begin
140161
m = @SMatrix [1 2; 3 4]
141162
n = @SMatrix [2 3; 4 5]

0 commit comments

Comments
 (0)