Mercurial > repos > public > sbplib_julia
changeset 1441:c0c5e0620b83 bugfix/grids/tensor_grid_length
Merge default
| author | Jonatan Werpers <jonatan@werpers.com> |
|---|---|
| date | Wed, 22 Nov 2023 17:51:37 +0100 |
| parents | 48e16efaac7a (current diff) 28bd0ea7ee92 (diff) |
| children | fef23bf35c68 |
| files | src/Grids/tensor_grid.jl test/Grids/tensor_grid_test.jl |
| diffstat | 4 files changed, 21 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Grids/equidistant_grid.jl Thu Sep 07 16:31:29 2023 +0200 +++ b/src/Grids/equidistant_grid.jl Wed Nov 22 17:51:37 2023 +0100 @@ -29,6 +29,7 @@ Base.IteratorSize(::Type{<:EquidistantGrid}) = Base.HasShape{1}() Base.length(g::EquidistantGrid) = length(g.points) Base.size(g::EquidistantGrid) = size(g.points) +Base.size(g::EquidistantGrid, d) = size(g.points)[d] """
--- a/src/Grids/tensor_grid.jl Thu Sep 07 16:31:29 2023 +0200 +++ b/src/Grids/tensor_grid.jl Wed Nov 22 17:51:37 2023 +0100 @@ -43,9 +43,9 @@ _iterate_combine_coords((next,state)) = combine_coordinates(next...), state Base.IteratorSize(::Type{<:TensorGrid{<:Any, D}}) where D = Base.HasShape{D}() -Base.eltype(::Type{<:TensorGrid{T}}) where T = T Base.length(g::TensorGrid) = prod(length, g.grids) Base.size(g::TensorGrid) = LazyTensors.concatenate_tuples(size.(g.grids)...) +Base.size(g::TensorGrid, d) = size(g)[d] refine(g::TensorGrid, r::Int) = mapreduce(g->refine(g,r), TensorGrid, g.grids)
--- a/test/Grids/equidistant_grid_test.jl Thu Sep 07 16:31:29 2023 +0200 +++ b/test/Grids/equidistant_grid_test.jl Wed Nov 22 17:51:37 2023 +0100 @@ -31,6 +31,8 @@ @test size(EquidistantGrid(0:10)) == (11,) @test size(EquidistantGrid(0:0.1:10)) == (101,) + @test size(EquidistantGrid(0:0.1:10),1) == 101 + @test collect(EquidistantGrid(0:0.1:0.5)) == [0.0, 0.1, 0.2, 0.3, 0.4, 0.5] @test Base.IteratorSize(EquidistantGrid{Float64, StepRange{Float64}}) == Base.HasShape{1}() @@ -107,8 +109,13 @@ @testset "Base" begin @test eltype(equidistant_grid(4,0.0,1.0)) == Float64 @test eltype(equidistant_grid((4,3),(0,0),(1,3))) <: AbstractVector{Float64} + @test size(equidistant_grid(4,0.0,1.0)) == (4,) @test size(equidistant_grid((5,3), (0.0,0.0), (2.0,1.0))) == (5,3) + + @test size(equidistant_grid((5,3), (0.0,0.0), (2.0,1.0)),1) == 5 + @test size(equidistant_grid((5,3), (0.0,0.0), (2.0,1.0)),2) == 3 + @test ndims(equidistant_grid(4,0.0,1.0)) == 1 @test ndims(equidistant_grid((5,3), (0.0,0.0), (2.0,1.0))) == 2 end
--- a/test/Grids/tensor_grid_test.jl Thu Sep 07 16:31:29 2023 +0200 +++ b/test/Grids/tensor_grid_test.jl Wed Nov 22 17:51:37 2023 +0100 @@ -85,12 +85,24 @@ @test eltype(TensorGrid(g₁, g₄)) == SVector{3,Float64} @test eltype(TensorGrid(g₁, g₄, g₂)) == SVector{4,Float64} + @test eltype(typeof(TensorGrid(g₁, g₂))) == SVector{2,Float64} + @test eltype(typeof(TensorGrid(g₁, g₃))) == SVector{2,Float64} + @test eltype(typeof(TensorGrid(g₁, g₂, g₃))) == SVector{3,Float64} + @test eltype(typeof(TensorGrid(g₁, g₄))) == SVector{3,Float64} + @test eltype(typeof(TensorGrid(g₁, g₄, g₂))) == SVector{4,Float64} + @test size(TensorGrid(g₁, g₂)) == (11,6) @test size(TensorGrid(g₁, g₃)) == (11,10) @test size(TensorGrid(g₁, g₂, g₃)) == (11,6,10) @test size(TensorGrid(g₁, g₄)) == (11,) @test size(TensorGrid(g₁, g₄, g₂)) == (11,6) + @test size(TensorGrid(g₁, g₂, g₃),1) == 11 + @test size(TensorGrid(g₁, g₂, g₃),2) == 6 + @test size(TensorGrid(g₁, g₂, g₃),3) == 10 + @test size(TensorGrid(g₁, g₄, g₂),1) == 11 + @test size(TensorGrid(g₁, g₄, g₂),2) == 6 + @test length(TensorGrid(g₁, g₂)) == 66 @test length(TensorGrid(g₁, g₃)) == 110 @test length(TensorGrid(g₁, g₂, g₃)) == 660