Fix MatrixView inheritance (#1687)

* Fix MatrixView inheritance * Consolidate `_MatTypes`
Nemocas · Feb 26, 2024 · 1c976c9 · 1c976c9
1 parent 4a1abac
commit 1c976c9
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 8 deletions.
diff --git a/src/matrix.jl b/src/matrix.jl
@@ -1,9 +1,15 @@
+# Types of all Flint-backed matrices
+const _FieldMatTypes = Union{QQMatrix, fpMatrix, FpMatrix, FqMatrix, fqPolyRepMatrix, FqPolyRepMatrix}
+const _MatTypes = Union{_FieldMatTypes, ZZMatrix, zzModMatrix, ZZModMatrix}
+
+
 ################################################################################
 #
 #  Support for view(A, :, i) and view(A, i, :)
 #
 ################################################################################
 
+# MatrixView{MatrixType, ElemType}
 struct MatrixView{S, T} <: AbstractVector{T}
   A::S
 end
@@ -18,16 +24,14 @@ Base.setindex!(V::MatrixView, z, i::Int) = setindex!(V, ZZ(z), i)
 
 Base.size(V::MatrixView) = (length(V.A), )
 
-const _MatTypes = Union{ZZMatrix, QQMatrix, zzModMatrix, ZZModMatrix, fpMatrix, FpMatrix, FqMatrix, fqPolyRepMatrix, FqPolyRepMatrix}
-
 function Base.view(x::_MatTypes, r::Int, c::UnitRange{Int})
   A = view(x, r:r, c)
-	return MatrixView{typeof(x), typeof(base_ring(x))}(A)
+	return MatrixView{typeof(x), elem_type(base_ring(x))}(A)
 end
 
 function Base.view(x::_MatTypes, r::UnitRange{Int}, c::Int)
   A = view(x, r, c:c)
-	return MatrixView{typeof(x), typeof(base_ring(x))}(A)
+	return MatrixView{typeof(x), elem_type(base_ring(x))}(A)
 end
 
 ################################################################################
@@ -36,8 +40,6 @@ end
 #
 ################################################################################
 
-const _FieldMatTypes = Union{QQMatrix, fpMatrix, FpMatrix, FqMatrix, fqPolyRepMatrix, FqPolyRepMatrix}
-
 function kernel(A::_FieldMatTypes; side::Symbol = :left)
   Solve.check_option(side, [:right, :left], "side")
 

diff --git a/test/flint/fmpq_mat-test.jl b/test/flint/fmpq_mat-test.jl
@@ -227,15 +227,20 @@ end
 
    A = S([1 2 3; 4 5 6; 7 8 9])
    v = @view A[2, :]
+   @test v isa AbstractVector{elem_type(QQ)}
    @test length(v) == 3
+   @test v[1] == 4
+   @test collect(v) == [4, 5, 6]
    v[2] = 7
    @test A == S([1 2 3; 4 7 6; 7 8 9])
    A = S([1 2 3; 4 5 6; 7 8 9])
    v = @view A[:, 3]
+   @test v isa AbstractVector{elem_type(QQ)}
    @test length(v) == 3
+   @test v[3] == 9
+   @test collect(v) == [3, 6, 9]
    v[1] = 1
    @test A == S([1 2 1; 4 5 6; 7 8 9])
-
 end
 
 @testset "QQMatrix.sub" begin

diff --git a/test/flint/fmpz_mat-test.jl b/test/flint/fmpz_mat-test.jl
@@ -191,14 +191,18 @@ end
 
    A = S([1 2 3; 4 5 6; 7 8 9])
    v = @view A[2, :]
+   @test v isa AbstractVector{elem_type(FlintZZ)}
    @test length(v) == 3
    @test v[1] == 4
+   @test collect(v) == [4, 5, 6]
    v[2] = 7
    @test A == S([1 2 3; 4 7 6; 7 8 9])
    A = S([1 2 3; 4 5 6; 7 8 9])
    v = @view A[:, 3]
-   @test v[3] == 9
+   @test v isa AbstractVector{elem_type(FlintZZ)}
    @test length(v) == 3
+   @test v[3] == 9
+   @test collect(v) == [3, 6, 9]
    v[1] = 1
    @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/fmpz_mod_mat-test.jl b/test/flint/fmpz_mod_mat-test.jl
@@ -728,12 +728,18 @@ end
 
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/fq_default_mat-test.jl b/test/flint/fq_default_mat-test.jl
@@ -743,12 +743,18 @@ end
   S = matrix_space(F17, 3, 3)
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(F17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(F17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/fq_mat-test.jl b/test/flint/fq_mat-test.jl
@@ -714,12 +714,18 @@ end
   S = matrix_space(F17, 3, 3)
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(F17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(F17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/fq_nmod_mat-test.jl b/test/flint/fq_nmod_mat-test.jl
@@ -714,12 +714,18 @@ end
   S = matrix_space(F17, 3, 3)
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(F17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(F17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/gfp_fmpz_mat-test.jl b/test/flint/gfp_fmpz_mat-test.jl
@@ -614,12 +614,18 @@ end
 
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/gfp_mat-test.jl b/test/flint/gfp_mat-test.jl
@@ -830,12 +830,18 @@ end
 
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end

diff --git a/test/flint/nmod_mat-test.jl b/test/flint/nmod_mat-test.jl
@@ -787,12 +787,18 @@ end
 
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[2, :]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[1] == 4
+  @test collect(v) == [4, 5, 6]
   v[2] = 7
   @test A == S([1 2 3; 4 7 6; 7 8 9])
   A = S([1 2 3; 4 5 6; 7 8 9])
   v = @view A[:, 3]
+  @test v isa AbstractVector{elem_type(Z17)}
   @test length(v) == 3
+  @test v[3] == 9
+  @test collect(v) == [3, 6, 9]
   v[1] = 1
   @test A == S([1 2 1; 4 5 6; 7 8 9])
 end