Skip to content

Commit 1555f56

Browse files
dkarraschdkarrasch
authored
minor code polish, use unicode (#60)
1 parent 8266129 commit 1555f56

File tree

5 files changed

+52
-52
lines changed

5 files changed

+52
-52
lines changed

‎src/blockmap.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ promote_to_lmaps(n, k, dim, A) = (promote_to_lmaps_(n[k], dim, A),)
172172
function isblocksquare(A::BlockMap)
173173
rows = A.rows
174174
N = length(rows)
175-
return all(r -> r == N, rows)
175+
return all(==(N), rows)
176176
end
177177

178178
# the following rules are sufficient but not necessary

‎src/composition.jl

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ struct CompositeMap{T, As<:Tuple{Vararg{LinearMap}}} <: LinearMap{T}
22
maps::As # stored in order of application to vector
33
function CompositeMap{T, As}(maps::As) where {T, As}
44
N = length(maps)
5-
for n = 2:N
5+
for n in 2:N
66
size(maps[n], 2) == size(maps[n-1], 1) || throw(DimensionMismatch("CompositeMap"))
77
end
8-
for n = 1:N
8+
for n in 1:N
99
promote_type(T, eltype(maps[n])) == T || throw(InexactError())
1010
end
1111
new{T, As}(maps)
@@ -40,11 +40,11 @@ end
4040

4141
# scalar multiplication and division
4242
function Base.:(*)(α::Number, A::LinearMap)
43-
T = promote_type(eltype(α), eltype(A))
43+
T = promote_type(typeof(α), eltype(A))
4444
return CompositeMap{T}(tuple(A, UniformScalingMap(α, size(A, 1))))
4545
end
4646
function Base.:(*)(α::Number, A::CompositeMap)
47-
T = promote_type(eltype(α), eltype(A))
47+
T = promote_type(typeof(α), eltype(A))
4848
Alast = last(A.maps)
4949
if Alast isa UniformScalingMap
5050
return CompositeMap{T}(tuple(Base.front(A.maps)..., UniformScalingMap(α * Alast.λ, size(Alast, 1))))
@@ -53,11 +53,11 @@ function Base.:(*)(α::Number, A::CompositeMap)
5353
end
5454
end
5555
function Base.:(*)(A::LinearMap, α::Number)
56-
T = promote_type(eltype(α), eltype(A))
56+
T = promote_type(typeof(α), eltype(A))
5757
return CompositeMap{T}(tuple(UniformScalingMap(α, size(A, 2)), A))
5858
end
5959
function Base.:(*)(A::CompositeMap, α::Number)
60-
T = promote_type(eltype(α), eltype(A))
60+
T = promote_type(typeof(α), eltype(A))
6161
Afirst = first(A.maps)
6262
if Afirst isa UniformScalingMap
6363
return CompositeMap{T}(tuple(UniformScalingMap(Afirst.λ * α, size(Afirst, 1)), Base.tail(A.maps)...))
@@ -70,28 +70,28 @@ Base.:(/)(A::LinearMap, α::Number) = A * inv(α)
7070
Base.:(-)(A::LinearMap) = -1 * A
7171

7272
# composition of linear maps
73-
function Base.:(*)(A1::CompositeMap, A2::CompositeMap)
74-
size(A1, 2) == size(A2, 1) || throw(DimensionMismatch("*"))
75-
T = promote_type(eltype(A1), eltype(A2))
76-
return CompositeMap{T}(tuple(A2.maps..., A1.maps...))
73+
function Base.:(*)(A₁::CompositeMap, A₂::CompositeMap)
74+
size(A₁, 2) == size(A₂, 1) || throw(DimensionMismatch("*"))
75+
T = promote_type(eltype(A₁), eltype(A₂))
76+
return CompositeMap{T}(tuple(A₂.maps..., A₁.maps...))
7777
end
78-
function Base.:(*)(A1::LinearMap, A2::CompositeMap)
79-
size(A1, 2) == size(A2, 1) || throw(DimensionMismatch("*"))
80-
T = promote_type(eltype(A1), eltype(A2))
81-
return CompositeMap{T}(tuple(A2.maps..., A1))
78+
function Base.:(*)(A₁::LinearMap, A₂::CompositeMap)
79+
size(A₁, 2) == size(A₂, 1) || throw(DimensionMismatch("*"))
80+
T = promote_type(eltype(A₁), eltype(A₂))
81+
return CompositeMap{T}(tuple(A₂.maps..., A₁))
8282
end
83-
function Base.:(*)(A1::CompositeMap, A2::LinearMap)
84-
size(A1, 2) == size(A2, 1) || throw(DimensionMismatch("*"))
85-
T = promote_type(eltype(A1), eltype(A2))
86-
return CompositeMap{T}(tuple(A2, A1.maps...))
83+
function Base.:(*)(A₁::CompositeMap, A₂::LinearMap)
84+
size(A₁, 2) == size(A₂, 1) || throw(DimensionMismatch("*"))
85+
T = promote_type(eltype(A₁), eltype(A₂))
86+
return CompositeMap{T}(tuple(A₂, A₁.maps...))
8787
end
88-
function Base.:(*)(A1::LinearMap, A2::LinearMap)
89-
size(A1, 2) == size(A2, 1) || throw(DimensionMismatch("*"))
90-
T = promote_type(eltype(A1),eltype(A2))
91-
return CompositeMap{T}(tuple(A2, A1))
88+
function Base.:(*)(A₁::LinearMap, A₂::LinearMap)
89+
size(A₁, 2) == size(A₂, 1) || throw(DimensionMismatch("*"))
90+
T = promote_type(eltype(A₁), eltype(A₂))
91+
return CompositeMap{T}(tuple(A₂, A₁))
9292
end
93-
Base.:(*)(A1::LinearMap, A2::UniformScaling{T}) where {T} = A1 * A2[1,1]
94-
Base.:(*)(A1::UniformScaling{T}, A2::LinearMap) where {T} = A1[1,1] * A2
93+
Base.:(*)(A₁::LinearMap, A₂::UniformScaling) = A₁ * A₂.λ
94+
Base.:(*)(A₁::UniformScaling, A₂::LinearMap) = A₁.λ * A₂
9595

9696
# special transposition behavior
9797
LinearAlgebra.transpose(A::CompositeMap{T}) where {T} = CompositeMap{T}(map(transpose, reverse(A.maps)))
@@ -114,7 +114,7 @@ function A_mul_B!(y::AbstractVector, A::CompositeMap, x::AbstractVector)
114114
if N>2
115115
dest = Array{T}(undef, size(A.maps[2], 1))
116116
end
117-
for n=2:N-1
117+
for n in 2:N-1
118118
try
119119
resize!(dest, size(A.maps[n], 1))
120120
catch err

‎src/linearcombination.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ struct LinearCombination{T, As<:Tuple{Vararg{LinearMap}}} <: LinearMap{T}
33
function LinearCombination{T, As}(maps::As) where {T, As}
44
N = length(maps)
55
sz = size(maps[1])
6-
for n = 1:N
6+
for n in 1:N
77
size(maps[n]) == sz || throw(DimensionMismatch("LinearCombination"))
88
promote_type(T, eltype(maps[n])) == T || throw(InexactError())
99
end
@@ -20,23 +20,23 @@ LinearAlgebra.ishermitian(A::LinearCombination) = all(ishermitian, A.maps) # suf
2020
LinearAlgebra.isposdef(A::LinearCombination) = all(isposdef, A.maps) # sufficient but not necessary
2121

2222
# adding linear maps
23-
function Base.:(+)(A1::LinearCombination, A2::LinearCombination)
24-
size(A1) == size(A2) || throw(DimensionMismatch("+"))
25-
T = promote_type(eltype(A1), eltype(A2))
26-
return LinearCombination{T}(tuple(A1.maps..., A2.maps...))
23+
function Base.:(+)(A₁::LinearCombination, A₂::LinearCombination)
24+
size(A₁) == size(A₂) || throw(DimensionMismatch("+"))
25+
T = promote_type(eltype(A₁), eltype(A₂))
26+
return LinearCombination{T}(tuple(A₁.maps..., A₂.maps...))
2727
end
28-
function Base.:(+)(A1::LinearMap, A2::LinearCombination)
29-
size(A1) == size(A2) || throw(DimensionMismatch("+"))
30-
T = promote_type(eltype(A1), eltype(A2))
31-
return LinearCombination{T}(tuple(A1, A2.maps...))
28+
function Base.:(+)(A₁::LinearMap, A₂::LinearCombination)
29+
size(A₁) == size(A₂) || throw(DimensionMismatch("+"))
30+
T = promote_type(eltype(A₁), eltype(A₂))
31+
return LinearCombination{T}(tuple(A₁, A₂.maps...))
3232
end
33-
Base.:(+)(A1::LinearCombination, A2::LinearMap) = +(A2, A1)
34-
function Base.:(+)(A1::LinearMap, A2::LinearMap)
35-
size(A1)==size(A2) || throw(DimensionMismatch("+"))
36-
T = promote_type(eltype(A1), eltype(A2))
37-
return LinearCombination{T}(tuple(A1, A2))
33+
Base.:(+)(A₁::LinearCombination, A₂::LinearMap) = +(A₂, A₁)
34+
function Base.:(+)(A₁::LinearMap, A₂::LinearMap)
35+
size(A₁) == size(A₂) || throw(DimensionMismatch("+"))
36+
T = promote_type(eltype(A₁), eltype(A₂))
37+
return LinearCombination{T}(tuple(A₁, A₂))
3838
end
39-
Base.:(-)(A1::LinearMap, A2::LinearMap) = +(A1, -A2)
39+
Base.:(-)(A₁::LinearMap, A₂::LinearMap) = +(A₁, -A₂)
4040

4141
# comparison of LinearCombination objects, sufficient but not necessary
4242
Base.:(==)(A::LinearCombination, B::LinearCombination) = (eltype(A) == eltype(B) && A.maps == B.maps)
@@ -52,7 +52,7 @@ function A_mul_B!(y::AbstractVector, A::LinearCombination, x::AbstractVector)
5252
l = length(A.maps)
5353
if l>1
5454
z = similar(y)
55-
for n=2:l
55+
for n in 2:l
5656
A_mul_B!(z, A.maps[n], x)
5757
y .+= z
5858
end

‎src/uniformscalingmap.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function LinearAlgebra.mul!(y::AbstractVector, J::UniformScalingMap{T}, x::Abstr
7070
end
7171

7272
# combine LinearMap and UniformScaling objects in linear combinations
73-
Base.:(+)(A1::LinearMap, A2::UniformScaling) = A1 + UniformScalingMap(A2.λ, size(A1, 1))
74-
Base.:(+)(A1::UniformScaling, A2::LinearMap) = UniformScalingMap(A1.λ, size(A2, 1)) + A2
75-
Base.:(-)(A1::LinearMap, A2::UniformScaling) = A1 - UniformScalingMap(A2.λ, size(A1, 1))
76-
Base.:(-)(A1::UniformScaling, A2::LinearMap) = UniformScalingMap(A1.λ, size(A2, 1)) - A2
73+
Base.:(+)(A₁::LinearMap, A₂::UniformScaling) = A₁ + UniformScalingMap(A₂.λ, size(A₁, 1))
74+
Base.:(+)(A₁::UniformScaling, A₂::LinearMap) = UniformScalingMap(A₁.λ, size(A₂, 1)) + A₂
75+
Base.:(-)(A₁::LinearMap, A₂::UniformScaling) = A₁ - UniformScalingMap(A₂.λ, size(A₁, 1))
76+
Base.:(-)(A₁::UniformScaling, A₂::LinearMap) = UniformScalingMap(A₁.λ, size(A₂, 1)) - A₂

‎src/wrappedmap.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ Ac_mul_B!(y::AbstractVector, A::WrappedMap, x::AbstractVector) =
3434
ishermitian(A) ? A_mul_B!(y, A.lmap, x) : Ac_mul_B!(y, A.lmap, x)
3535

3636
# combine LinearMap and Matrix objects: linear combinations and map composition
37-
Base.:(+)(A1::LinearMap, A2::AbstractMatrix) = +(A1, WrappedMap(A2))
38-
Base.:(+)(A1::AbstractMatrix, A2::LinearMap) = +(WrappedMap(A1), A2)
39-
Base.:(-)(A1::LinearMap, A2::AbstractMatrix) = -(A1, WrappedMap(A2))
40-
Base.:(-)(A1::AbstractMatrix, A2::LinearMap) = -(WrappedMap(A1), A2)
37+
Base.:(+)(A₁::LinearMap, A₂::AbstractMatrix) = +(A₁, WrappedMap(A₂))
38+
Base.:(+)(A₁::AbstractMatrix, A₂::LinearMap) = +(WrappedMap(A₁), A₂)
39+
Base.:(-)(A₁::LinearMap, A₂::AbstractMatrix) = -(A₁, WrappedMap(A₂))
40+
Base.:(-)(A₁::AbstractMatrix, A₂::LinearMap) = -(WrappedMap(A₁), A₂)
4141

42-
Base.:(*)(A1::LinearMap, A2::AbstractMatrix) = *(A1, WrappedMap(A2))
43-
Base.:(*)(A1::AbstractMatrix, A2::LinearMap) = *(WrappedMap(A1), A2)
42+
Base.:(*)(A₁::LinearMap, A₂::AbstractMatrix) = *(A₁, WrappedMap(A₂))
43+
Base.:(*)(A₁::AbstractMatrix, A₂::LinearMap) = *(WrappedMap(A₁), A₂)

0 commit comments

Comments
 (0)