Added SubArray tests for linalg/givens.jl.

JuliaLang · Mar 6, 2016 · fde21d3 · fde21d3
1 parent 5afe41e
commit fde21d3
Showing 1 changed file with 48 additions and 38 deletions.
diff --git a/test/linalg/givens.jl b/test/linalg/givens.jl
@@ -15,50 +15,60 @@ for elty in (Float32, Float64, Complex64, Complex128)
     else
         A = convert(Matrix{elty}, complex(randn(10,10),randn(10,10)))
     end
-    Ac = copy(A)
-    R = Base.LinAlg.Rotation(Base.LinAlg.Givens{elty}[])
-    for j = 1:8
-        for i = j+2:10
-            G, _ = givens(A, j+1, i, j)
-            A_mul_B!(G, A)
-            A_mul_Bc!(A, G)
-            A_mul_B!(G, R)
+    for Atype in ("Array", "SubArray")
+        if Atype == "Array"
+            A = A
+        else
+            A = sub(A, 1:10, 1:10)
+        end
+        Ac = copy(A)
+        R = Base.LinAlg.Rotation(Base.LinAlg.Givens{elty}[])
+        for j = 1:8
+            for i = j+2:10
+                G, _ = givens(A, j+1, i, j)
+                A_mul_B!(G, A)
+                A_mul_Bc!(A, G)
+                A_mul_B!(G, R)
 
-            @test A_mul_B!(G,eye(elty,10,10)) == [G[i,j] for i=1:10,j=1:10]
+                @test A_mul_B!(G,eye(elty,10,10)) == [G[i,j] for i=1:10,j=1:10]
 
-            # test transposes
-            @test_approx_eq ctranspose(G)*G*eye(10) eye(elty, 10)
-            @test_approx_eq ctranspose(R)*(R*eye(10)) eye(elty, 10)
-            @test_throws ErrorException transpose(G)
-            @test_throws ErrorException transpose(R)
+                # test transposes
+                @test_approx_eq ctranspose(G)*G*eye(10) eye(elty, 10)
+                @test_approx_eq ctranspose(R)*(R*eye(10)) eye(elty, 10)
+                @test_throws ErrorException transpose(G)
+                @test_throws ErrorException transpose(R)
+            end
         end
-    end
-    @test_throws ArgumentError givens(A, 3, 3, 2)
-    @test_throws ArgumentError givens(one(elty),zero(elty),2,2)
-    G, _ = givens(one(elty),zero(elty),11,12)
-    @test_throws DimensionMismatch A_mul_B!(G, A)
-    @test_throws DimensionMismatch A_mul_Bc!(A,G)
-    @test_approx_eq abs(A) abs(hessfact(Ac)[:H])
-    @test_approx_eq norm(R*eye(elty, 10)) one(elty)
+        @test_throws ArgumentError givens(A, 3, 3, 2)
+        @test_throws ArgumentError givens(one(elty),zero(elty),2,2)
+        G, _ = givens(one(elty),zero(elty),11,12)
+        @test_throws DimensionMismatch A_mul_B!(G, A)
+        @test_throws DimensionMismatch A_mul_Bc!(A,G)
+        @test_approx_eq abs(A) abs(hessfact(Ac)[:H])
+        @test_approx_eq norm(R*eye(elty, 10)) one(elty)
 
-    G, _ = givens(one(elty),zero(elty),9,10)
-    @test_approx_eq ctranspose(G*eye(elty,10))*(G*eye(elty,10)) eye(elty, 10)
-    K, _ = givens(zero(elty),one(elty),9,10)
-    @test_approx_eq ctranspose(K*eye(elty,10))*(K*eye(elty,10)) eye(elty, 10)
+        G, _ = givens(one(elty),zero(elty),9,10)
+        @test_approx_eq ctranspose(G*eye(elty,10))*(G*eye(elty,10)) eye(elty, 10)
+        K, _ = givens(zero(elty),one(elty),9,10)
+        @test_approx_eq ctranspose(K*eye(elty,10))*(K*eye(elty,10)) eye(elty, 10)
 
-    # test that Givens * work for vectors
-    x = A[:,1]
-    G, r = givens(x[2], x[4], 2, 4)
-    @test (G*x)[2] ≈ r
-    @test abs((G*x)[4]) < eps(real(elty))
+        # test that Givens * work for vectors
+        if Atype == "Array"
+            x = A[:, 1]
+        else
+            x = sub(A, 1:10, 1)
+        end
+        G, r = givens(x[2], x[4], 2, 4)
+        @test (G*x)[2] ≈ r
+        @test abs((G*x)[4]) < eps(real(elty))
 
-    x = A[:,1]
-    G, r = givens(x, 2, 4)
-    @test (G*x)[2] ≈ r
-    @test abs((G*x)[4]) < eps(real(elty))
+        G, r = givens(x, 2, 4)
+        @test (G*x)[2] ≈ r
+        @test abs((G*x)[4]) < eps(real(elty))
 
-    G, r = givens(x, 4, 2)
-    @test (G*x)[4] ≈ r
-    @test abs((G*x)[2]) < eps(real(elty))
+        G, r = givens(x, 4, 2)
+        @test (G*x)[4] ≈ r
+        @test abs((G*x)[2]) < eps(real(elty))
+    end
 end
 end #let