annotate test/Grids/grid_test.jl @ 1490:a7689021d4c2 feature/grids/componentview

REVIEW: Add review comments to tests
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Sat, 30 Dec 2023 13:33:17 +0100
parents 62f9d0387a2a
children cfc24f132641
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
1 using Test
1245
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
2 using Sbplib.Grids
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
3 using Sbplib.LazyTensors
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
4 using StaticArrays
1245
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
5
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6 @testset "Grid" begin
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
7 struct DummyGrid{T,D} <: Grid{T,D} end
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
8
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
9 @test eltype(DummyGrid{Int, 2}) == Int
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
10 @test eltype(DummyGrid{Int, 2}()) == Int
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
11
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
12 @test ndims(DummyGrid{Int, 2}()) == 2
1272
3637daad71e8 Add function target_manifold_dim for Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1270
diff changeset
13
1332
ad31c1022e42 Rename function for coordinate size of a grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1324
diff changeset
14 @test coordinate_size(DummyGrid{Int, 1}()) == 1
ad31c1022e42 Rename function for coordinate size of a grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1324
diff changeset
15 @test coordinate_size(DummyGrid{SVector{3,Float64}, 2}()) == 3
1288
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
16
1333
79a2193da5c1 Implement coordinate_size() and component_type() types
Jonatan Werpers <jonatan@werpers.com>
parents: 1332
diff changeset
17 @test coordinate_size(DummyGrid{SVector{3,Float64}, 2}) == 3
79a2193da5c1 Implement coordinate_size() and component_type() types
Jonatan Werpers <jonatan@werpers.com>
parents: 1332
diff changeset
18
1288
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
19 @testset "component_type" begin
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
20 @test component_type(DummyGrid{Int,1}()) == Int
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
21 @test component_type(DummyGrid{Float64,1}()) == Float64
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
22 @test component_type(DummyGrid{Rational,1}()) == Rational
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
23
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
24 @test component_type(DummyGrid{SVector{3,Int},2}()) == Int
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
25 @test component_type(DummyGrid{SVector{2,Float64},3}()) == Float64
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
26 @test component_type(DummyGrid{SVector{4,Rational},4}()) == Rational
1333
79a2193da5c1 Implement coordinate_size() and component_type() types
Jonatan Werpers <jonatan@werpers.com>
parents: 1332
diff changeset
27
79a2193da5c1 Implement coordinate_size() and component_type() types
Jonatan Werpers <jonatan@werpers.com>
parents: 1332
diff changeset
28 @test component_type(DummyGrid{Float64,1}) == Float64
79a2193da5c1 Implement coordinate_size() and component_type() types
Jonatan Werpers <jonatan@werpers.com>
parents: 1332
diff changeset
29 @test component_type(DummyGrid{SVector{2,Float64},3}) == Float64
1288
7de1df0aad6a Add component_type function to Grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1279
diff changeset
30 end
1245
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
31 end
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
32
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
33 @testset "eval_on" begin
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
34 @test eval_on(ZeroDimGrid(@SVector[1.,2.]), x̄->x̄[1]+x̄[2]) isa LazyArray
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
35 @test eval_on(ZeroDimGrid(@SVector[1.,2.]), x̄->x̄[1]+x̄[2]) == fill(3.)
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
36 @test eval_on(ZeroDimGrid(@SVector[3.,2.]), x̄->x̄[1]+x̄[2]) == fill(5.)
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
37
1279
1157f889bf50 Clear out some TBDs
Jonatan Werpers <jonatan@werpers.com>
parents: 1276
diff changeset
38 @test eval_on(ZeroDimGrid(1.), x̄->2x̄) isa LazyArray
1157f889bf50 Clear out some TBDs
Jonatan Werpers <jonatan@werpers.com>
parents: 1276
diff changeset
39 @test eval_on(ZeroDimGrid(1.), x̄->2x̄) == fill(2.)
1157f889bf50 Clear out some TBDs
Jonatan Werpers <jonatan@werpers.com>
parents: 1276
diff changeset
40
1397
86026367a9ff Support evaluating scalars on grids
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1343
diff changeset
41 @test eval_on(ZeroDimGrid(@SVector[1.,2.]), π) isa LazyArray
86026367a9ff Support evaluating scalars on grids
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1343
diff changeset
42 @test eval_on(ZeroDimGrid(@SVector[1.,2.]), π) == fill(π)
86026367a9ff Support evaluating scalars on grids
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1343
diff changeset
43
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
44 @test eval_on(EquidistantGrid(range(0,1,length=4)), x->2x) isa LazyArray
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
45 @test eval_on(EquidistantGrid(range(0,1,length=4)), x->2x) == 2 .* range(0,1,length=4)
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
46
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
47
1252
c150eabaf656 Fix or mark tests broken where needed
Jonatan Werpers <jonatan@werpers.com>
parents: 1245
diff changeset
48 g = equidistant_grid((5,3), (0.0,0.0), (2.0,1.0))
c150eabaf656 Fix or mark tests broken where needed
Jonatan Werpers <jonatan@werpers.com>
parents: 1245
diff changeset
49
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
50 @test eval_on(g, x̄ -> 0.) isa LazyArray
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
51 @test eval_on(g, x̄ -> 0.) == fill(0., (5,3))
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
52
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
53 @test eval_on(g, x̄ -> sin(x̄[1])*cos(x̄[2])) == map(x̄->sin(x̄[1])*cos(x̄[2]), g)
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
54
1397
86026367a9ff Support evaluating scalars on grids
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1343
diff changeset
55 @test eval_on(g, π) == fill(π, (5,3))
86026367a9ff Support evaluating scalars on grids
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1343
diff changeset
56
1269
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
57 # Vector valued function
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
58 @test eval_on(g, x̄ -> @SVector[x̄[2], x̄[1]]) isa LazyArray{SVector{2,Float64}}
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
59 @test eval_on(g, x̄ -> @SVector[x̄[2], x̄[1]]) == map(x̄ -> @SVector[x̄[2], x̄[1]], g)
20f42cf0800c Add test for Grid and make them pass. Start implementing eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1252
diff changeset
60
1273
7fab13c07412 Allow multi-argument functions in eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1272
diff changeset
61 # Multi-argument functions
1252
c150eabaf656 Fix or mark tests broken where needed
Jonatan Werpers <jonatan@werpers.com>
parents: 1245
diff changeset
62 f(x,y) = sin(x)*cos(y)
1273
7fab13c07412 Allow multi-argument functions in eval_on
Jonatan Werpers <jonatan@werpers.com>
parents: 1272
diff changeset
63 @test eval_on(g, f) == map(x̄->f(x̄...), g)
1245
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
64 end
6323d2fe3b4f Add stub files for tests
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
65
1474
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
66 @testset "componentview" begin
1490
a7689021d4c2 REVIEW: Add review comments to tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1476
diff changeset
67 # REVIEW: I think we can reduce the index ranges.
1474
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
68 v = [@SMatrix[1 3; 2 4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
69
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
70 @test componentview(v, 1, 1) == [1 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
71 @test componentview(v, 1, 2) == [3 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
72 @test componentview(v, 2, 1) == [2 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
73
1476
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
74 @test componentview(v, 1, :) == [@SVector[1,3] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
75 @test componentview(v, 2, :) == [@SVector[2,4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
76 @test componentview(v, :, 1) == [@SVector[1,2] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
77 @test componentview(v, :, 2) == [@SVector[3,4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
78
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
79
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
80 A = @SMatrix[
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
81 1 4 7;
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
82 2 5 8;
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
83 3 6 9;
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
84 ]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
85 v = [A .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
86 @test componentview(v, 1:2, 1:2) == [@SMatrix[1 4;2 5] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
87 @test componentview(v, 2:3, 1:2) == [@SMatrix[2 5;3 6] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
88 end
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
89
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
90 @testset "ArrayComponentView" begin
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
91 v = [@SMatrix[1 3; 2 4] .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
92
1490
a7689021d4c2 REVIEW: Add review comments to tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1476
diff changeset
93 @test ArrayComponentView(v, (1,1)) == ArrayComponentView(v, (1,1)) # REVIEW: Does not test anything?
1476
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
94 @test ArrayComponentView(v, (1,1)) == ArrayComponentView(copy(v), (1,1))
1490
a7689021d4c2 REVIEW: Add review comments to tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 1476
diff changeset
95 # REVIEW: The two below are equivalent?
1476
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
96 @test ArrayComponentView(v, (1,1)) == [1 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4]
62f9d0387a2a Introduce a view type and implement sliced indexing for the components.
Jonatan Werpers <jonatan@werpers.com>
parents: 1474
diff changeset
97 @test [1 .+ 100*i .+ 10*j for i ∈ 1:3, j∈ 1:4] == ArrayComponentView(v, (1,1))
1474
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
98 end
276c38a48aac Start implementing componentview
Jonatan Werpers <jonatan@werpers.com>
parents: 1397
diff changeset
99
1270
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
100 @testset "_ncomponents" begin
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
101 @test Grids._ncomponents(Int) == 1
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
102 @test Grids._ncomponents(Float64) == 1
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
103 @test Grids._ncomponents(Rational) == 1
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
104
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
105 @test Grids._ncomponents(SVector{3,Int}) == 3
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
106 @test Grids._ncomponents(SVector{2,Float64}) == 2
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
107 @test Grids._ncomponents(SVector{4,Rational}) == 4
dcbac783e4c1 Factor out functions for getting the type and number of components in a type
Jonatan Werpers <jonatan@werpers.com>
parents: 1269
diff changeset
108 end