Skip to content

Commit 2c29006

Browse files
abelsiqueiradpo
authored andcommitted
Remove dot operators
1 parent 1dc03e8 commit 2c29006

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

src/LinearOperators.jl

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -365,13 +365,8 @@ end
365365
+(op :: AbstractLinearOperator, M :: AbstractMatrix) = op + LinearOperator(M)
366366

367367
# Operator .+ scalar.
368-
@static if VERSION < v"0.6.0-"
369-
.+(op :: AbstractLinearOperator, x :: Number) = op + x * opOnes(op.nrow, op.ncol)
370-
.+(x :: Number, op :: AbstractLinearOperator) = x * opOnes(op.nrow, op.ncol) + op
371-
else
372-
+(op :: AbstractLinearOperator, x :: Number) = op + x * opOnes(op.nrow, op.ncol)
373-
+(x :: Number, op :: AbstractLinearOperator) = x * opOnes(op.nrow, op.ncol) + op
374-
end
368+
+(op :: AbstractLinearOperator, x :: Number) = op + x * opOnes(op.nrow, op.ncol)
369+
+(x :: Number, op :: AbstractLinearOperator) = x * opOnes(op.nrow, op.ncol) + op
375370

376371
# Operator - operator
377372
-(op1 :: AbstractLinearOperator, op2 :: AbstractLinearOperator) = op1 + (-op2)
@@ -381,13 +376,8 @@ end
381376
-(op :: AbstractLinearOperator, M :: AbstractMatrix) = op - LinearOperator(M)
382377

383378
# Operator - scalar.
384-
@static if VERSION < v"0.6.0-"
385-
.-(op :: AbstractLinearOperator, x :: Number) = op .+ (-x)
386-
.-(x :: Number, op :: AbstractLinearOperator) = x .+ (-op)
387-
else
388-
-(op :: AbstractLinearOperator, x :: Number) = op + (-x)
389-
-(x :: Number, op :: AbstractLinearOperator) = x + (-op)
390-
end
379+
-(op :: AbstractLinearOperator, x :: Number) = op + (-x)
380+
-(x :: Number, op :: AbstractLinearOperator) = x + (-op)
391381

392382

393383
# Utility functions.

test/test_linop.jl

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ function test_linop()
8787

8888
B2 = rand(ncol, ncol+1) + rand(ncol, ncol+1) * im;
8989
@testset "Operator ± scalar" begin
90-
opC = LinearOperator(A1) .+ 2.12345;
90+
opC = LinearOperator(A1) + 2.12345;
9191
@test(vecnorm(A1 .+ 2.12345 - full(opC)) <= rtol * vecnorm(A1 .+ 2.12345));
9292

93-
opC = 2.12345 .+ LinearOperator(A1);
93+
opC = 2.12345 + LinearOperator(A1);
9494
@test(vecnorm(A1 .+ 2.12345 - full(opC)) <= rtol * vecnorm(A1 .+ 2.12345));
9595

96-
opC = LinearOperator(A1) .- 2.12345;
96+
opC = LinearOperator(A1) - 2.12345;
9797
@test(vecnorm((A1 .- 2.12345) - full(opC)) <= rtol * vecnorm(A1 .- 2.12345));
9898

99-
opC = 2.12345 .- LinearOperator(A1);
99+
opC = 2.12345 - LinearOperator(A1);
100100
@test(vecnorm((2.12345 .- A1) - full(opC)) <= rtol * vecnorm(2.12345 .- A1));
101101

102102
C = A1 * B2;
@@ -126,17 +126,11 @@ function test_linop()
126126
@testset "Scalar × operator" begin
127127
opC = 2.12345 * LinearOperator(A1);
128128
@test(vecnorm(AA1 - full(opC)) <= rtol * vecnorm(AA1));
129-
130-
opC = 2.12345 .* LinearOperator(A1);
131-
@test(vecnorm(AA1 - full(opC)) <= rtol * vecnorm(AA1));
132129
end
133130

134131
@testset "Operator × scalar" begin
135132
opC = LinearOperator(A1) * 2.12345;
136133
@test(vecnorm(AA1 - full(opC)) <= rtol * vecnorm(AA1));
137-
138-
opC = LinearOperator(A1) .* 2.12345;
139-
@test(vecnorm(AA1 - full(opC)) <= rtol * vecnorm(AA1));
140134
end
141135
end
142136

0 commit comments

Comments
 (0)