Mercurial > repos > public > sbplib_julia
changeset 405:16dc5b19843d test/equidistantgrid
Fix exception handling in constructor of EquidistantGrid and add a bunch of tests
| author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
|---|---|
| date | Sat, 10 Oct 2020 20:05:39 +0200 |
| parents | 1936e38fe51e |
| children | c377fc37c04b |
| files | src/Grids/EquidistantGrid.jl test/testGrids.jl |
| diffstat | 2 files changed, 45 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Grids/EquidistantGrid.jl Mon Oct 05 10:45:30 2020 +0200 +++ b/src/Grids/EquidistantGrid.jl Sat Oct 10 20:05:39 2020 +0200 @@ -13,8 +13,9 @@ # General constructor function EquidistantGrid(size::NTuple{Dim, Int}, limit_lower::NTuple{Dim, T}, limit_upper::NTuple{Dim, T}) where Dim where T - @assert all(size.>0) - @assert all(limit_upper.-limit_lower .!= 0) + all(size.>0) || throw(DomainError("size must be postive")) + # TODO: Is it reasonable to restrict side lengths to be positive? + all(limit_upper.-limit_lower .> 0) || throw(DomainError("side lengths must be postive")) return new{Dim,T}(size, limit_lower, limit_upper) end end @@ -43,8 +44,8 @@ The spacing between the grid points of the grid. """ +# TODO: If we restrict side lenghts to be positive, then we should remove the abs here. spacing(grid::EquidistantGrid) = abs.(grid.limit_upper.-grid.limit_lower)./(grid.size.-1) -# TODO: Evaluate if divisions affect performance export spacing """ @@ -60,6 +61,7 @@ # # @Input: grid - an EquidistantGrid # @Return: points - the points of the grid. +# TODO: Does not work if side lengths are allowed to be negative. function points(grid::EquidistantGrid) # TODO: Make this return an abstract array? indices = Tuple.(CartesianIndices(grid.size))
--- a/test/testGrids.jl Mon Oct 05 10:45:30 2020 +0200 +++ b/test/testGrids.jl Sat Oct 10 20:05:39 2020 +0200 @@ -6,9 +6,48 @@ @testset "EquidistantGrid" begin @test EquidistantGrid(4,0.0,1.0) isa EquidistantGrid @test EquidistantGrid(4,0.0,8.0) isa EquidistantGrid - @test dimension(EquidistantGrid(4,0.0,1.0)) == 1 + # constuctor + @test_throws DomainError EquidistantGrid(0,0.0,1.0) + @test_throws DomainError EquidistantGrid(1,1.0,1.0) + @test_throws DomainError EquidistantGrid(1,1.0,-1.0) # TODO: Remove if we allow side lengths to be negative. @test EquidistantGrid(4,0.0,1.0) == EquidistantGrid((4,),(0.0,),(1.0,)) + # size + @test size(EquidistantGrid(4,0.0,1.0)) == (4,) + @test size(EquidistantGrid((5,3), (0.0,0.0), (2.0,1.0))) == (5,3) + + # dimension + @test dimension(EquidistantGrid(4,0.0,1.0)) == 1 + @test dimension(EquidistantGrid((5,3), (0.0,0.0), (2.0,1.0))) == 2 + + # spacing + @test [spacing(EquidistantGrid(4,0.0,1.0))...] ≈ [(1. /3,)...] atol=5e-13 + @test [spacing(EquidistantGrid((5,3), (0.0,-1.0), (2.0,1.0)))...] ≈ [(0.5, 1.)...] atol=5e-13 + # TODO: Include below if we allow side lengths to be negative. + #@test [spacing(EquidistantGrid((5,3), (0.0,1.0), (-1.0,-2.0)))...] ≈ [(0.25, 1.5)...] atol=5e-13 + + # inverse_spacing + @test [inverse_spacing(EquidistantGrid(4,0.0,1.0))...] ≈ [(3.,)...] atol=5e-13 + @test [inverse_spacing(EquidistantGrid((5,3), (0.0,-1.0), (2.0,1.0)))...] ≈ [(2, 1.)...] atol=5e-13 + # TODO: Include below if we allow side lengths to be negative. + #@test [inverse_spacing(EquidistantGrid((5,3), (0.0,1.0), (-1.0,-2.0)))...] ≈ [(4., 2. /3)...] atol=5e-13 + + # points + g = EquidistantGrid((5,3), (-1.0,0.0), (0.0,7.11)) + gp = points(g); + p = [(-1.,0.) (-1.,7.11/2) (-1.,7.11); + (-0.75,0.) (-0.75,7.11/2) (-0.75,7.11); + (-0.5,0.) (-0.5,7.11/2) (-0.5,7.11); + (-0.25,0.) (-0.25,7.11/2) (-0.25,7.11); + (0.,0.) (0.,7.11/2) (0.,7.11)] + approxequal = true; + for i ∈ eachindex(gp) + approxequal=approxequal*all(isapprox.(gp[i],p[i], atol=5e-13)); + end + @test approxequal == true + + + # restrict g = EquidistantGrid((5,3), (0.0,0.0), (2.0,1.0)) @test restrict(g, 1) == EquidistantGrid(5,0.0,2.0) @test restrict(g, 2) == EquidistantGrid(3,0.0,1.0)