Skip to content

Rename 5-arg Base.view methods #2071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2025
Merged

Rename 5-arg Base.view methods #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85bbf10
Rename 5-arg `Base.view` methods
lgoettgens May 6, 2025
8a39d6d
Adapt tests
lgoettgens May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Deprecations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,7 @@
@deprecate coefficient_ring(k::PadicField) base_field(k)
@deprecate coefficient_ring(k::QadicField) base_field(k)

# To be deprecated in 0.48
# To be deprecated in a future breaking release
Base.Array(a::ZZMatrix; S::Type{T} = ZZRingElem) where {T} = Matrix{T}(a)

Base.view(x::_MatTypes, r1::Int, c1::Int, r2::Int, c2::Int) = _view_window(x, r1, c1, r2, c2)

Check warning on line 100 in src/Deprecations.jl

View check run for this annotation

Codecov / codecov/patch

src/Deprecations.jl#L100 

Added line #L100 was not covered by tests
2 changes: 1 addition & 1 deletion src/flint/fmpq_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ is_zero_initialized(::Type{QQMatrix}) = true
#
###############################################################################

function Base.view(x::QQMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::QQMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))

Expand Down
2 changes: 1 addition & 1 deletion src/flint/fmpz_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function _checkrange_or_empty(l::Int, start::Int, stop::Int)
_checkbounds(l, stop))
end

function Base.view(x::ZZMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::ZZMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/fmpz_mod_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ end
#
################################################################################

function Base.view(x::ZZModMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::ZZModMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/fq_default_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ end
#
################################################################################

function Base.view(x::FqMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::FqMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/fq_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ end
#
################################################################################

function Base.view(x::FqPolyRepMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::FqPolyRepMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/fq_nmod_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ end
#
################################################################################

function Base.view(x::fqPolyRepMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::fqPolyRepMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/gfp_fmpz_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ end
#
################################################################################

function Base.view(x::FpMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::FpMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/gfp_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ end
#
################################################################################

function Base.view(x::fpMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::fpMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
2 changes: 1 addition & 1 deletion src/flint/nmod_mat.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ end
#
################################################################################

function Base.view(x::zzModMatrix, r1::Int, c1::Int, r2::Int, c2::Int)
function _view_window(x::zzModMatrix, r1::Int, c1::Int, r2::Int, c2::Int)

_checkrange_or_empty(nrows(x), r1, r2) ||
Base.throw_boundserror(x, (r1:r2, c1:c2))
Expand Down
4 changes: 2 additions & 2 deletions src/matrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ const _MatTypes = Union{_FieldMatTypes, ZZMatrix, zzModMatrix, ZZModMatrix}
################################################################################

function Base.view(x::_MatTypes, r::AbstractUnitRange{Int}, c::AbstractUnitRange{Int})
return Base.view(x, first(r), first(c), last(r), last(c))
return _view_window(x, first(r), first(c), last(r), last(c))
end

function sub(x::_MatTypes, r1::Int, c1::Int, r2::Int, c2::Int)
return deepcopy(view(x, r1, c1, r2, c2))
return deepcopy(view(x, r1:r2, c1:c2))
end

function sub(x::_MatTypes, r::AbstractUnitRange{Int}, c::AbstractUnitRange{Int})
Expand Down
4 changes: 2 additions & 2 deletions test/flint/fmpq_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ end

a = matrix(QQ, 4, 4, [-1//2 ZZRingElem(2)^100 3 -4; 5 -1//2 ZZRingElem(2)^100 6; 7 5 -1//2 8; 9 10 11 12])
@test hash(a, UInt(5)) == hash(deepcopy(a), UInt(5))
@test hash(view(a, 1,1, 2,2)) == hash(view(a, 1,1, 2,2))
@test hash(view(a, 1:2, 1:2)) == hash(view(a, 1:2, 1:2))

C = QQ[1 2 3; 4 5 6; 7 8 9]
C[3, :] = QQ[7 7 7]
Expand All @@ -226,7 +226,7 @@ end

A = S([1 2 3; 4 5 6; 7 8 9])

B = @inferred view(A, 1, 1, 2, 2)
B = @inferred view(A, 1:2, 1:2)

@test typeof(B) == QQMatrix
@test B == matrix_space(QQ, 2, 2)([1 2; 4 5])
Expand Down
4 changes: 2 additions & 2 deletions test/flint/fmpz_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ end

a = matrix(ZZ, 4, 4, [-1 ZZRingElem(2)^100 3 -4; 5 -1 ZZRingElem(2)^100 6; 7 5 -1 8; 9 10 11 12])
@test hash(a, UInt(5)) == hash(deepcopy(a), UInt(5))
@test hash(view(a, 1,1, 2,2)) == hash(view(a, 2,2, 3,3))
@test hash(view(a, 1:2, 1:2)) == hash(view(a, 2:3, 2:3))

C = ZZ[1 2 3; 4 5 6; 7 8 9]
C[3, :] = ZZ[7 7 7]
Expand All @@ -198,7 +198,7 @@ end

A = S([1 2 3; 4 5 6; 7 8 9])

B = @inferred view(A, 1, 1, 2, 2)
B = @inferred view(A, 1:2, 1:2)

@test typeof(B) == ZZMatrix
@test B == matrix_space(ZZ, 2, 2)([1 2; 4 5])
Expand Down
22 changes: 11 additions & 11 deletions test/flint/fmpz_mod_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,33 +795,33 @@ end

b = S([ 2 1 0 1; 0 0 0 0; 0 1 2 0 ])

t = view(a, 1, 1, 3, 3)
t = view(a, 1:3, 1:3)

@test t == a

@test view(a, 1, 1, 3, 3) == view(a, 1:3, 1:3)
@test view(a, 1, 1, 3, 3) == sub(a, 1, 1, 3, 3)
@test view(a, 1, 1, 3, 3) == sub(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == view(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == sub(a, 1, 1, 3, 3)
@test view(a, 1:3, 1:3) == sub(a, 1:3, 1:3)

t = view(a, 1, 1, 2, 2)
t = view(a, 1:2, 1:2)

@test t == Z17[1 2; 3 2]

t = view(a, 2, 2, 3, 2)
t = view(a, 2:3, 2:2)

@test t == transpose(Z17[2 0])

@test view(a, 2, 2, 3, 2) == view(a, 2:3, 2:2)
@test view(a, 2, 2, 3, 2) == sub(a, 2, 2, 3, 2)
@test view(a, 2, 2, 3, 2) == sub(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == view(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == sub(a, 2, 2, 3, 2)
@test view(a, 2:3, 2:2) == sub(a, 2:3, 2:2)

@test_throws BoundsError view(a, 3, 3, 5, 5)
@test_throws BoundsError view(a, 3:5, 3:5)

S = matrix_space(Z17, 3, 3)

A = S([1 2 3; 4 5 6; 7 8 9])

B = @inferred view(A, 1, 1, 2, 2)
B = @inferred view(A, 1:2, 1:2)

@test typeof(B) == ZZModMatrix
@test B == matrix_space(Z17, 2, 2)([1 2; 4 5])
Expand Down
22 changes: 11 additions & 11 deletions test/flint/fq_default_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,27 +827,27 @@ end

b = S([ 2 1 0 1; 0 0 0 0; 0 1 2 0 ])

t = view(a, 1, 1, 3, 3)
t = view(a, 1:3, 1:3)

@test t == a

@test view(a, 1, 1, 3, 3) == view(a, 1:3, 1:3)
@test view(a, 1, 1, 3, 3) == sub(a, 1, 1, 3, 3)
@test view(a, 1, 1, 3, 3) == sub(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == view(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == sub(a, 1, 1, 3, 3)
@test view(a, 1:3, 1:3) == sub(a, 1:3, 1:3)

t = view(a, 1, 1, 2, 2)
t = view(a, 1:2, 1:2)

@test t == F17[1 2; 3 2]

t = view(a, 2, 2, 3, 2)
t = view(a, 2:3, 2:2)

@test t == transpose(F17[2 0;])
@test t == transpose(F17[2 0])

@test view(a, 2, 2, 3, 2) == view(a, 2:3, 2:2)
@test view(a, 2, 2, 3, 2) == sub(a, 2, 2, 3, 2)
@test view(a, 2, 2, 3, 2) == sub(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == view(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == sub(a, 2, 2, 3, 2)
@test view(a, 2:3, 2:2) == sub(a, 2:3, 2:2)

@test_throws BoundsError view(a, 2, 2, 5, 5)
@test_throws BoundsError view(a, 3:5, 3:5)

a = 0
GC.gc()
Expand Down
22 changes: 11 additions & 11 deletions test/flint/fq_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,27 +776,27 @@ end

b = S([ 2 1 0 1; 0 0 0 0; 0 1 2 0 ])

t = view(a, 1, 1, 3, 3)
t = view(a, 1:3, 1:3)

@test t == a

@test view(a, 1, 1, 3, 3) == view(a, 1:3, 1:3)
@test view(a, 1, 1, 3, 3) == sub(a, 1, 1, 3, 3)
@test view(a, 1, 1, 3, 3) == sub(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == view(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == sub(a, 1, 1, 3, 3)
@test view(a, 1:3, 1:3) == sub(a, 1:3, 1:3)

t = view(a, 1, 1, 2, 2)
t = view(a, 1:2, 1:2)

@test t == F17[1 2; 3 2]

t = view(a, 2, 2, 3, 2)
t = view(a, 2:3, 2:2)

@test t == transpose(F17[2 0;])
@test t == transpose(F17[2 0])

@test view(a, 2, 2, 3, 2) == view(a, 2:3, 2:2)
@test view(a, 2, 2, 3, 2) == sub(a, 2, 2, 3, 2)
@test view(a, 2, 2, 3, 2) == sub(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == view(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == sub(a, 2, 2, 3, 2)
@test view(a, 2:3, 2:2) == sub(a, 2:3, 2:2)

@test_throws BoundsError view(a, 2, 2, 5, 5)
@test_throws BoundsError view(a, 3:5, 3:5)

a = 0
GC.gc()
Expand Down
22 changes: 11 additions & 11 deletions test/flint/fq_nmod_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,27 +776,27 @@ end

b = S([ 2 1 0 1; 0 0 0 0; 0 1 2 0 ])

t = view(a, 1, 1, 3, 3)
t = view(a, 1:3, 1:3)

@test t == a

@test view(a, 1, 1, 3, 3) == view(a, 1:3, 1:3)
@test view(a, 1, 1, 3, 3) == sub(a, 1, 1, 3, 3)
@test view(a, 1, 1, 3, 3) == sub(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == view(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == sub(a, 1, 1, 3, 3)
@test view(a, 1:3, 1:3) == sub(a, 1:3, 1:3)

t = view(a, 1, 1, 2, 2)
t = view(a, 1:2, 1:2)

@test t == F17[1 2; 3 2]

t = view(a, 2, 2, 3, 2)
t = view(a, 2:3, 2:2)

@test t == transpose(F17[2 0;])
@test t == transpose(F17[2 0])

@test view(a, 2, 2, 3, 2) == view(a, 2:3, 2:2)
@test view(a, 2, 2, 3, 2) == sub(a, 2, 2, 3, 2)
@test view(a, 2, 2, 3, 2) == sub(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == view(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == sub(a, 2, 2, 3, 2)
@test view(a, 2:3, 2:2) == sub(a, 2:3, 2:2)

@test_throws BoundsError view(a, 2, 2, 5, 5)
@test_throws BoundsError view(a, 3:5, 3:5)

a = 0
GC.gc()
Expand Down
24 changes: 11 additions & 13 deletions test/flint/gfp_fmpz_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,35 +565,33 @@ end

b = S([ 2 1 0 1; 0 0 0 0; 0 1 2 0 ])

t = view(a, 1, 1, 3, 3)
t = view(a, 1:3, 1:3)

@test t == a

@test view(a, 1, 1, 3, 3) == view(a, 1:3, 1:3)
@test view(a, 1, 1, 3, 3) == sub(a, 1, 1, 3, 3)
@test view(a, 1, 1, 3, 3) == sub(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == view(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == sub(a, 1, 1, 3, 3)
@test view(a, 1:3, 1:3) == sub(a, 1:3, 1:3)

@test isempty(view(a, 2, 2, 1, 1))

t = view(a, 1, 1, 2, 2)
t = view(a, 1:2, 1:2)

@test t == Z17[1 2; 3 2]

t = view(a, 2, 2, 3, 2)
t = view(a, 2:3, 2:2)

@test t == transpose(Z17[2 0])

@test view(a, 2, 2, 3, 2) == view(a, 2:3, 2:2)
@test view(a, 2, 2, 3, 2) == sub(a, 2, 2, 3, 2)
@test view(a, 2, 2, 3, 2) == sub(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == view(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == sub(a, 2, 2, 3, 2)
@test view(a, 2:3, 2:2) == sub(a, 2:3, 2:2)

@test_throws BoundsError view(a, 3, 3, 5, 5)
@test_throws BoundsError view(a, 3:5, 3:5)

S = matrix_space(Z17, 3, 3)

A = S([1 2 3; 4 5 6; 7 8 9])

B = @inferred view(A, 1, 1, 2, 2)
B = @inferred view(A, 1:2, 1:2)

@test typeof(B) == FpMatrix
@test B == matrix_space(Z17, 2, 2)([1 2; 4 5])
Expand Down
22 changes: 11 additions & 11 deletions test/flint/gfp_mat-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,33 +888,33 @@ end

b = S([ 2 1 0 1; 0 0 0 0; 0 1 2 0 ])

t = view(a, 1, 1, 3, 3)
t = view(a, 1:3, 1:3)

@test t == a

@test view(a, 1, 1, 3, 3) == view(a, 1:3, 1:3)
@test view(a, 1, 1, 3, 3) == sub(a, 1, 1, 3, 3)
@test view(a, 1, 1, 3, 3) == sub(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == view(a, 1:3, 1:3)
@test view(a, 1:3, 1:3) == sub(a, 1, 1, 3, 3)
@test view(a, 1:3, 1:3) == sub(a, 1:3, 1:3)

t = view(a, 1, 1, 2, 2)
t = view(a, 1:2, 1:2)

@test t == Z17[1 2; 3 2]

t = view(a, 2, 2, 3, 2)
t = view(a, 2:3, 2:2)

@test t == transpose(Z17[2 0])

@test view(a, 2, 2, 3, 2) == view(a, 2:3, 2:2)
@test view(a, 2, 2, 3, 2) == sub(a, 2, 2, 3, 2)
@test view(a, 2, 2, 3, 2) == sub(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == view(a, 2:3, 2:2)
@test view(a, 2:3, 2:2) == sub(a, 2, 2, 3, 2)
@test view(a, 2:3, 2:2) == sub(a, 2:3, 2:2)

@test_throws BoundsError view(a, 2, 2, 5, 5)
@test_throws BoundsError view(a, 3:5, 3:5)

S = matrix_space(Z17, 3, 3)

A = S([1 2 3; 4 5 6; 7 8 9])

B = @inferred view(A, 1, 1, 2, 2)
B = @inferred view(A, 1:2, 1:2)

@test typeof(B) == fpMatrix
@test B == matrix_space(Z17, 2, 2)([1 2; 4 5])
Expand Down
Loading
Loading