Skip to content
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

Jump to bottom

Add setindex! for MatElem with linear indexing #1407

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Add setindex! for MatElem with linear indexing #1407

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
a123d03
Add `setindex!` for `MatElem` with linear indexing
lgoettgens Aug 17, 2023
fcf3ce8
Address comment
lgoettgens Aug 17, 2023
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
23 changes: 23 additions & 0 deletions src/Matrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,29 @@ Base.@propagate_inbounds function Base.setindex!(a::MatrixElem{T}, x, I::Cartesi
a
end

# linear indexing for row- or column- vectors
Base.@propagate_inbounds function getindex(M::MatrixElem, i::Integer)
if nrows(M) == 1
M[1, i]
elseif ncols(M) == 1
M[i, 1]
else
throw(ArgumentError("linear indexing not supported for non-vector matrices"))
end
end

Base.@propagate_inbounds function setindex!(M::MatrixElem, x, i::Integer)
if nrows(M) == 1
M[1, i] = x
return M
elseif ncols(M) == 1
M[i, 1] = x
return M
else
throw(ArgumentError("linear indexing not supported for non-vector matrices"))
end
end

# iteration

function Base.iterate(a::MatrixElem{T}, ij=(0, 1)) where T <: NCRingElement
Expand Down
17 changes: 0 additions & 17 deletions src/generic/Matrix.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,23 +100,6 @@ function deepcopy_internal(d::MatSpaceView{T}, dict::IdDict) where T <: NCRingEl
return MatSpaceView(deepcopy_internal(d.entries, dict), d.base_ring)
end

###############################################################################
#
# getindex
#
###############################################################################

# linear indexing for row- or column- vectors
Base.@propagate_inbounds function getindex(M::MatElem, x::Integer)
if nrows(M) == 1
M[1, x]
elseif ncols(M) == 1
M[x, 1]
else
throw(ArgumentError("linear indexing not supported for non-vector matrices"))
end
end

function Base.view(M::Mat{T}, rows::AbstractUnitRange{Int}, cols::AbstractUnitRange{Int}) where T <: NCRingElement
return MatSpaceView(view(M.entries, rows, cols), M.base_ring)
end
Expand Down
14 changes: 14 additions & 0 deletions test/generic/Matrix-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,20 @@ end
elseif length(A) >= 1
@test_throws ArgumentError A[1]
end
A = deepcopy(A)
if nr == 1
c = rand(1:nc)
d = rand(1:nc)
A[c] = A[d]
@test A[c] == A[1, d]
elseif nc == 1
r = rand(1:nr)
s = rand(1:nr)
A[r] = A[s]
@test A[r] == A[s, 1]
elseif length(A) >= 1
@test_throws ArgumentError (A[1] = zero(base_ring(A)))
end
end

for (_, (R, rand_params)) in RINGS
Expand Down
Loading