Skip to content

make MatrixSpace <: AA.MatSpace to support matrix random generation #299

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

Open
rfourquet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make MatrixSpace <: AA.MatSpace to support matrix random generation #299

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
2e37a9e
make MatrixSpace <: AA.MatSpace
rfourquet Nov 4, 2020
ccd9d6b
add tests for random matrices
rfourquet Nov 4, 2020
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
11 changes: 5 additions & 6 deletions src/matrix/MatrixTypes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
###############################################################################
#
# MatrixSpace/smatrix
# MatrixSpace/smatrix
#
###############################################################################

const MatrixSpaceID = Dict{Tuple{PolyRing, Int, Int}, Set}()

mutable struct MatrixSpace{T <: Nemo.RingElem} <: Set
mutable struct MatrixSpace{T <: Nemo.RingElem} <: AbstractAlgebra.MatSpace{T}
base_ring::PolyRing
nrows::Int
ncols::Int
Expand All @@ -20,7 +18,9 @@ mutable struct MatrixSpace{T <: Nemo.RingElem} <: Set
end
end

mutable struct smatrix{T <: Nemo.RingElem} <: Nemo.SetElem
const MatrixSpaceID = Dict{Tuple{PolyRing, Int, Int}, MatrixSpace}()

mutable struct smatrix{T <: Nemo.RingElem} <: AbstractAlgebra.MatElem{T}
ptr::libSingular.matrix_ptr
base_ring::PolyRing

Expand All @@ -43,4 +43,3 @@ end
function _smatrix_clear_fn(I::smatrix)
libSingular.mp_Delete(I.ptr, I.base_ring.ptr)
end

17 changes: 17 additions & 0 deletions test/matrix/smatrix-test.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,20 @@ end
@test M1 == M1
@test M1 == deepcopy(M1)
end

@testset "smatrix.rand..." begin
F = Fp(7)
R, _ = PolynomialRing(F, ["x"])
m = identity_matrix(R, 3)
M = parent(m)

f = rand(M, 1:2, 1:2)
@test parent(f) == M

R, _ = PolynomialRing(ZZ, ["x"])
m = identity_matrix(R, 3)
M = parent(m)

f = rand(M, 1:2, 1:2, 1:2)
@test parent(f) == M
end