File tree Expand file tree Collapse file tree 3 files changed +19
-2
lines changed Expand file tree Collapse file tree 3 files changed +19
-2
lines changed Original file line number Diff line number Diff line change 1
1
name = " ApproxFunBase"
2
2
uuid = " fbd15aa5-315a-5a7d-a8a4-24992e37be05"
3
- version = " 0.8.4 "
3
+ version = " 0.8.5 "
4
4
5
5
[deps ]
6
6
AbstractFFTs = " 621f4979-c628-5d54-868e-fcf4e3e8185c"
Original file line number Diff line number Diff line change @@ -765,7 +765,7 @@ function BlockBandedMatrix(S::Operator)
765
765
end
766
766
767
767
function default_BlockMatrix (S:: Operator )
768
- ret = PseudoBlockArray (zeros (size (S)),
768
+ ret = PseudoBlockArray (zeros (eltype (S), size (S)),
769
769
AbstractVector {Int} (blocklengths (rangespace (S))),
770
770
AbstractVector {Int} (blocklengths (domainspace (S))))
771
771
ret .= S
Original file line number Diff line number Diff line change @@ -2,6 +2,8 @@ using ApproxFunBase
2
2
using ApproxFunBase: ∞
3
3
using Aqua
4
4
using BandedMatrices
5
+ using BlockArrays
6
+ using BlockBandedMatrices
5
7
using DomainSets
6
8
using FillArrays
7
9
using InfiniteArrays
359
361
ApproxFunBase. mul_coefficients! (Operator (2 I), v)
360
362
@test v ≈ Float64[2 i^ 2 for i in 1 : 4 ]
361
363
end
364
+ @testset " Matrix types" begin
365
+ F = Multiplication (Fun (PointSpace (1 : 3 )), PointSpace (1 : 3 ))
366
+ function test_matrices (F)
367
+ A = AbstractMatrix (F)
368
+ @test Matrix (F) == BandedMatrix (F) == BlockBandedMatrix (F) == ApproxFunBase. RaggedMatrix (F) == A
369
+ DefBlk = ApproxFunBase. default_BlockMatrix (F)
370
+ DefBBlk = ApproxFunBase. default_BlockBandedMatrix (F)
371
+ DefB = ApproxFunBase. default_BandedMatrix (F)
372
+ DefM = ApproxFunBase. default_Matrix (F)
373
+ DefR = ApproxFunBase. default_RaggedMatrix (F)
374
+ @test DefBlk == DefBBlk == DefB == DefM == DefR == A
375
+ end
376
+ test_matrices (F)
377
+ test_matrices (im* F)
378
+ end
362
379
end
363
380
364
381
@testset " RowVector" begin
You can’t perform that action at this time.
0 commit comments