Merge pull request JuliaLang#15314 from pkofod/pkm/testsvd

Systematically address SubArrays in test/linalg/svd.jl
laurentbartholdi · Mar 3, 2016 · 96a4ca1 · 96a4ca1
2 parents 385f465 + b72e620
commit 96a4ca1
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 47 deletions.
diff --git a/test/linalg/svd.jl b/test/linalg/svd.jl
@@ -19,56 +19,65 @@ a2real = randn(n,n)/2
 a2img  = randn(n,n)/2
 
 for eltya in (Float32, Float64, Complex64, Complex128, Int)
-    a = eltya == Int ? rand(1:7, n, n) : convert(Matrix{eltya}, eltya <: Complex ? complex(areal, aimg) : areal)
-    a2 = eltya == Int ? rand(1:7, n, n) : convert(Matrix{eltya}, eltya <: Complex ? complex(a2real, a2img) : a2real)
-    asym = a'+a                  # symmetric indefinite
-    apd  = a'*a                 # symmetric positive-definite
-    ε = εa = eps(abs(float(one(eltya))))
+    aa = eltya == Int ? rand(1:7, n, n) : convert(Matrix{eltya}, eltya <: Complex ? complex(areal, aimg) : areal)
+    aa2 = eltya == Int ? rand(1:7, n, n) : convert(Matrix{eltya}, eltya <: Complex ? complex(a2real, a2img) : a2real)
+    for atype in ("Array", "SubArray")
+        if atype == "Array"
+            a = aa
+            a2 = aa2
+        else
+            a = sub(aa, 1:n, 1:n)
+            a2 = sub(aa2, 1:n, 1:n)
+        end
+        asym = a'+a                  # symmetric indefinite
+        apd  = a'*a                 # symmetric positive-definite
+        ε = εa = eps(abs(float(one(eltya))))
 
-debug && println("\ntype of a: ", eltya, "\n")
+    debug && println("\ntype of a: ", eltya, "\n")
 
-debug && println("singular value decomposition")
-    usv = svdfact(a)
-    @test usv[:S] === svdvals(usv)
-    @test usv[:U] * (Diagonal(usv[:S]) * usv[:Vt]) ≈ a
-    @test full(usv) ≈ a
-    @test usv[:Vt]' ≈ usv[:V]
-    @test_throws KeyError usv[:Z]
-    b = rand(eltya,n)
-    @test usv\b ≈ a\b
+    debug && println("singular value decomposition")
+        usv = svdfact(a)
+        @test usv[:S] === svdvals(usv)
+        @test usv[:U] * (Diagonal(usv[:S]) * usv[:Vt]) ≈ a
+        @test full(usv) ≈ a
+        @test usv[:Vt]' ≈ usv[:V]
+        @test_throws KeyError usv[:Z]
+        b = rand(eltya,n)
+        @test usv\b ≈ a\b
 
-    if eltya <: BlasFloat
-        svdz = svdfact!(ones(eltya,0,0))
-        @test svdz[:U] ≈ eye(eltya,0,0)
-        @test svdz[:S] ≈ real(zeros(eltya,0))
-        @test svdz[:Vt] ≈ eye(eltya,0,0)
-    end
+        if eltya <: BlasFloat
+            svdz = svdfact!(ones(eltya,0,0))
+            @test svdz[:U] ≈ eye(eltya,0,0)
+            @test svdz[:S] ≈ real(zeros(eltya,0))
+            @test svdz[:Vt] ≈ eye(eltya,0,0)
+        end
 
-debug && println("Generalized svd")
-    a_svd = a[1:n1, :]
-    gsvd = svdfact(a,a_svd)
-    @test gsvd[:U]*gsvd[:D1]*gsvd[:R]*gsvd[:Q]' ≈ a
-    @test gsvd[:V]*gsvd[:D2]*gsvd[:R]*gsvd[:Q]' ≈ a_svd
-    @test usv[:Vt]' ≈ usv[:V]
-    @test_throws KeyError usv[:Z]
-    @test_throws KeyError gsvd[:Z]
-    @test gsvd[:vals] ≈ svdvals(a,a_svd)
-    α = eltya == Int ? -1 : rand(eltya)
-    β = svdfact(α)
-    @test β[:S] == [abs(α)]
-    @test svdvals(α) == abs(α)
-    u,v,q,d1,d2,r0 = svd(a,a_svd)
-    @test u ≈ gsvd[:U]
-    @test v ≈ gsvd[:V]
-    @test d1 ≈ gsvd[:D1]
-    @test d2 ≈ gsvd[:D2]
-    @test q ≈ gsvd[:Q]
-    @test gsvd[:a].^2 + gsvd[:b].^2 ≈ ones(eltya,length(gsvd[:a]))
+    debug && println("Generalized svd")
+        a_svd = a[1:n1, :]
+        gsvd = svdfact(a,a_svd)
+        @test gsvd[:U]*gsvd[:D1]*gsvd[:R]*gsvd[:Q]' ≈ a
+        @test gsvd[:V]*gsvd[:D2]*gsvd[:R]*gsvd[:Q]' ≈ a_svd
+        @test usv[:Vt]' ≈ usv[:V]
+        @test_throws KeyError usv[:Z]
+        @test_throws KeyError gsvd[:Z]
+        @test gsvd[:vals] ≈ svdvals(a,a_svd)
+        α = eltya == Int ? -1 : rand(eltya)
+        β = svdfact(α)
+        @test β[:S] == [abs(α)]
+        @test svdvals(α) == abs(α)
+        u,v,q,d1,d2,r0 = svd(a,a_svd)
+        @test u ≈ gsvd[:U]
+        @test v ≈ gsvd[:V]
+        @test d1 ≈ gsvd[:D1]
+        @test d2 ≈ gsvd[:D2]
+        @test q ≈ gsvd[:Q]
+        @test gsvd[:a].^2 + gsvd[:b].^2 ≈ ones(eltya,length(gsvd[:a]))
 
-    #testing the other layout for D1 & D2
-    b = rand(eltya,n,2*n)
-    c = rand(eltya,n,2*n)
-    gsvd = svdfact(b,c)
-    @test gsvd[:U]*gsvd[:D1]*gsvd[:R]*gsvd[:Q]' ≈ b
-    @test gsvd[:V]*gsvd[:D2]*gsvd[:R]*gsvd[:Q]' ≈ c
+        #testing the other layout for D1 & D2
+        b = rand(eltya,n,2*n)
+        c = rand(eltya,n,2*n)
+        gsvd = svdfact(b,c)
+        @test gsvd[:U]*gsvd[:D1]*gsvd[:R]*gsvd[:Q]' ≈ b
+        @test gsvd[:V]*gsvd[:D2]*gsvd[:R]*gsvd[:Q]' ≈ c
+    end
 end
diff --git a/test/numbers.jl b/test/numbers.jl
@@ -2775,6 +2775,8 @@ let T = Rational
     @test_approx_eq x^true big(xf)^true
     @test_approx_eq x^false big(xf)^false
     @test_approx_eq x^1 big(xf)^1
+    @test_approx_eq xf^Rational(2, 1) xf*xf
+    @test Complex(1., 1.)^Rational(2,1) == Complex(1., 1.)*Complex(1.,1.) == Complex(0., 2.)
 end
 
 for Tf = (Float16, Float32, Float64), Ti = (Int16, Int32, Int64)