update tests

Author: Roger-luo

test/grad.jl

@@ -46,39 +46,58 @@ Base.length(x::DummyType) = size(x.X, 1)
 
     @testset "multi vars jacobian/grad" begin
         rng, fdm = MersenneTwister(123456), central_fdm(5, 1)
+        
         f1(x, y) = x * y + x
-        x, y = rand(rng, 3, 3), rand(rng, 3, 3)
-        jac_xs = jacobian(fdm, f1, x, y)
-        @test jac_xs[1] ≈ jacobian(fdm, x->f1(x, y), x)
-        @test jac_xs[2] ≈ jacobian(fdm, y->f1(x, y), y)
+        f2(x, y) = sum(x * y + x)
+        f3(x::Tuple) = sum(x[1]) + x[2]
+        f4(d::Dict) = sum(d[:x]) + d[:y]
 
-        # mixed scalar and matrices
-        x, y = rand(3, 3), 2
-        jac_xs = jacobian(fdm, f1, x, y)
-        @test jac_xs[1] ≈ jacobian(fdm, x->f1(x, y), x)
-        @test jac_xs[2] ≈ jacobian(fdm, y->f1(x, y), y)
+        @testset "jacobian" begin
+            @testset "check multiple matrices" begin
+                x, y = rand(rng, 3, 3), rand(rng, 3, 3)
+                jac_xs = jacobian(fdm, f1, x, y)
+                @test jac_xs[1] ≈ jacobian(fdm, x->f1(x, y), x)
+                @test jac_xs[2] ≈ jacobian(fdm, y->f1(x, y), y)
+            end
 
-        f2(x, y) = sum(x * y + x)
-        x, y = rand(rng, 3, 3), rand(rng, 3, 3)
-        dxs = grad(fdm, f2, x, y)
-        @test dxs[1] ≈ grad(fdm, x->f2(x, y), x)
-        @test dxs[2] ≈ grad(fdm, y->f2(x, y), y)
+            @testset "check mixed scalar and matrices" begin
+                x, y = rand(3, 3), 2
+                jac_xs = jacobian(fdm, f1, x, y)
+                @test jac_xs[1] ≈ jacobian(fdm, x->f1(x, y), x)
+                @test jac_xs[2] ≈ jacobian(fdm, y->f1(x, y), y)
+            end
+        end
 
-        x, y = rand(rng, 3, 3), 2
-        dxs = grad(fdm, f2, x, y)
-        @test dxs[1] ≈ grad(fdm, x->f2(x, y), x)
-        @test dxs[2] ≈ grad(fdm, y->f2(x, y), y)
+        @testset "grad" begin
+            @testset "check multiple matrices" begin
+                x, y = rand(rng, 3, 3), rand(rng, 3, 3)
+                dxs = grad(fdm, f2, x, y)
+                @test dxs[1] ≈ grad(fdm, x->f2(x, y), x)
+                @test dxs[2] ≈ grad(fdm, y->f2(x, y), y)
+            end
 
-        f3(x::Tuple) = sum(x[1]) + x[2]
-        dxs = grad(fdm, f3, (x, y))
-        @test dxs[1] ≈ grad(fdm, x->f3((x, y)), x)
-        @test dxs[2] ≈ grad(fdm, y->f3((x, y)), y)
+            @testset "check mixed scalar & matrices" begin
+                x, y = rand(rng, 3, 3), 2
+                dxs = grad(fdm, f2, x, y)
+                @test dxs[1] ≈ grad(fdm, x->f2(x, y), x)
+                @test dxs[2] ≈ grad(fdm, y->f2(x, y), y)        
+            end
 
-        f4(d::Dict) = sum(d[:x]) + d[:y]
-        d = Dict(:x=>x, :y=>y)
-        dxs = grad(fdm, f4, d)
-        @test dxs[:x] ≈ grad(fdm, x->f3((x, y)), x)
-        @test dxs[:y] ≈ grad(fdm, y->f3((x, y)), y)
+            @testset "check tuple" begin
+                x, y = rand(rng, 3, 3), 2
+                dxs = grad(fdm, f3, (x, y))
+                @test dxs[1] ≈ grad(fdm, x->f3((x, y)), x)
+                @test dxs[2] ≈ grad(fdm, y->f3((x, y)), y)    
+            end
+
+            @testset "check dict" begin
+                x, y = rand(rng, 3, 3), 2
+                d = Dict(:x=>x, :y=>y)
+                dxs = grad(fdm, f4, d)
+                @test dxs[:x] ≈ grad(fdm, x->f3((x, y)), x)
+                @test dxs[:y] ≈ grad(fdm, y->f3((x, y)), y)
+            end
+        end
     end
 
     function test_to_vec(x)