diff --git a/Project.toml b/Project.toml index 09d9df076..f68723060 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Singular" uuid = "bcd08a7b-43d2-5ff7-b6d4-c458787f915c" -version = "0.23.5" +version = "0.23.6" [deps] AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d" @@ -19,12 +19,12 @@ lib4ti2_jll = "1493ae25-0f90-5c0e-a06c-8c5077d6d66f" libsingular_julia_jll = "ae4fbd8f-ecdb-54f8-bbce-35570499b30e" [compat] -AbstractAlgebra = "0.41, 0.42" +AbstractAlgebra = "0.43.1" BinaryWrappers = "~0.1.1" CxxWrap = "0.14" Libdl = "1.6" LinearAlgebra = "1.6" -Nemo = "0.45, 0.46" +Nemo = "0.47" Pidfile = "1.3" Pkg = "1.6" Random = "1.6" diff --git a/src/Singular.jl b/src/Singular.jl index b977a7efb..4d801c0ca 100644 --- a/src/Singular.jl +++ b/src/Singular.jl @@ -48,7 +48,7 @@ import AbstractAlgebra: AbstractAlgebra, diagonal_matrix, factor, import AbstractAlgebra: pretty, Lowercase, LowercaseOff, Indent, Dedent, terse, is_terse -import Nemo: add!, addeq!, base_ring, canonical_unit, +import Nemo: add!, base_ring, canonical_unit, change_base_ring, characteristic, check_parent, codomain, coeff, coefficients, compose, constant_coefficient, contains, content, crt, diff --git a/src/libsingular/antic/nf_elem.jl b/src/libsingular/antic/nf_elem.jl index 3d513891e..a9a9ad096 100644 --- a/src/libsingular/antic/nf_elem.jl +++ b/src/libsingular/antic/nf_elem.jl @@ -93,7 +93,7 @@ function nf_elemInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r)::Nemo.AbsSimpleNumFieldElem bb = julia(b)::Nemo.AbsSimpleNumFieldElem - Nemo.addeq!(aa, bb) + Nemo.add!(aa, bb) nothing end diff --git a/src/libsingular/flint/fmpq.jl b/src/libsingular/flint/fmpq.jl index d84e02a46..1a7a88104 100644 --- a/src/libsingular/flint/fmpq.jl +++ b/src/libsingular/flint/fmpq.jl @@ -89,7 +89,7 @@ function fmpqInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r)::Nemo.QQFieldElem bb = julia(b)::Nemo.QQFieldElem - Nemo.addeq!(aa, bb) + Nemo.add!(aa, bb) nothing end diff --git a/src/libsingular/flint/fmpz.jl b/src/libsingular/flint/fmpz.jl index bc6846aa0..09ed091ba 100644 --- a/src/libsingular/flint/fmpz.jl +++ b/src/libsingular/flint/fmpz.jl @@ -89,7 +89,7 @@ function fmpzInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r)::Nemo.ZZRingElem bb = julia(b)::Nemo.ZZRingElem - Nemo.addeq!(aa, bb) + Nemo.add!(aa, bb) nothing end diff --git a/src/libsingular/flint/fq.jl b/src/libsingular/flint/fq.jl index ae48fea76..1041472cb 100644 --- a/src/libsingular/flint/fq.jl +++ b/src/libsingular/flint/fq.jl @@ -93,7 +93,7 @@ function fqInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r)::Nemo.FqPolyRepFieldElem bb = julia(b)::Nemo.FqPolyRepFieldElem - Nemo.addeq!(aa, bb) + Nemo.add!(aa, bb) nothing end diff --git a/src/libsingular/flint/fq_nmod.jl b/src/libsingular/flint/fq_nmod.jl index 8b31f4731..0bdf6c23d 100644 --- a/src/libsingular/flint/fq_nmod.jl +++ b/src/libsingular/flint/fq_nmod.jl @@ -93,7 +93,7 @@ function fq_nmodInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r)::Nemo.fqPolyRepFieldElem bb = julia(b)::Nemo.fqPolyRepFieldElem - Nemo.addeq!(aa, bb) + Nemo.add!(aa, bb) nothing end diff --git a/src/libsingular/nemo/Fields.jl b/src/libsingular/nemo/Fields.jl index 690372168..34af92646 100644 --- a/src/libsingular/nemo/Fields.jl +++ b/src/libsingular/nemo/Fields.jl @@ -99,7 +99,7 @@ function nemoFieldInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r) bb = julia(b) - cc = Nemo.addeq!(aa, bb) + cc = Nemo.add!(aa, bb) n = number(cc, aa) setindex_internal_void(reinterpret(Ptr{Cvoid},a), n) nothing diff --git a/src/libsingular/nemo/Rings.jl b/src/libsingular/nemo/Rings.jl index 4d1acd442..5000cb7ae 100644 --- a/src/libsingular/nemo/Rings.jl +++ b/src/libsingular/nemo/Rings.jl @@ -99,7 +99,7 @@ function nemoRingInpAdd(a::Ptr{Ptr{Cvoid}}, b::Ptr{Cvoid}, cf::Ptr{Cvoid}) r = unsafe_load(a) aa = julia(r) bb = julia(b) - cc = Nemo.addeq!(aa, bb) + cc = Nemo.add!(aa, bb) n = number(cc, aa) setindex_internal_void(reinterpret(Ptr{Cvoid},a), n) nothing diff --git a/src/number/n_GF.jl b/src/number/n_GF.jl index 0bd67cf06..d43ec0b0d 100644 --- a/src/number/n_GF.jl +++ b/src/number/n_GF.jl @@ -242,7 +242,7 @@ end # ############################################################################### -function addeq!(x::n_GF, y::n_GF) +function add!(x::n_GF, y::n_GF) x.ptr = GC.@preserve x y libSingular.n_InpAdd(x.ptr, y.ptr, parent(x).ptr) return x end diff --git a/src/number/n_Q.jl b/src/number/n_Q.jl index cfc17a60f..f83e71bb5 100644 --- a/src/number/n_Q.jl +++ b/src/number/n_Q.jl @@ -291,7 +291,7 @@ reconstruct(x::Integer, y::n_Z) = reconstruct(ZZ(x), y) # ############################################################################### -function addeq!(x::n_Q, y::n_Q) +function add!(x::n_Q, y::n_Q) c = parent(x) GC.@preserve x y c begin x.ptr = libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr) diff --git a/src/number/n_Z.jl b/src/number/n_Z.jl index 6c54d5b6a..ba1ee941d 100644 --- a/src/number/n_Z.jl +++ b/src/number/n_Z.jl @@ -314,7 +314,7 @@ end # ############################################################################### -function addeq!(x::n_Z, y::n_Z) +function add!(x::n_Z, y::n_Z) c = parent(x) x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr) return x diff --git a/src/number/n_Zn.jl b/src/number/n_Zn.jl index bd4d6f069..42b4d8643 100644 --- a/src/number/n_Zn.jl +++ b/src/number/n_Zn.jl @@ -225,7 +225,7 @@ end # ############################################################################### -function addeq!(x::n_Zn, y::n_Zn) +function add!(x::n_Zn, y::n_Zn) c = parent(x) x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr) return x diff --git a/src/number/n_Zp.jl b/src/number/n_Zp.jl index 197c799b1..5471e20b2 100644 --- a/src/number/n_Zp.jl +++ b/src/number/n_Zp.jl @@ -203,7 +203,7 @@ end # ############################################################################### -function addeq!(x::n_Zp, y::n_Zp) +function add!(x::n_Zp, y::n_Zp) c = parent(x) x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr) return x diff --git a/src/number/n_algExt.jl b/src/number/n_algExt.jl index 29f16ba9f..f80b6954d 100644 --- a/src/number/n_algExt.jl +++ b/src/number/n_algExt.jl @@ -235,7 +235,7 @@ end # ############################################################################### -function addeq!(x::n_algExt, y::n_algExt) +function add!(x::n_algExt, y::n_algExt) R = parent(x) x.ptr = GC.@preserve x y R libSingular.n_InpAdd(x.ptr, y.ptr, R.ptr) return x diff --git a/src/number/n_transExt.jl b/src/number/n_transExt.jl index c15871352..11a89de6a 100644 --- a/src/number/n_transExt.jl +++ b/src/number/n_transExt.jl @@ -284,7 +284,7 @@ end # ############################################################################### -function addeq!(x::n_transExt, y::n_transExt) +function add!(x::n_transExt, y::n_transExt) c = parent(x) x.ptr = GC.@preserve x y c libSingular.n_InpAdd(x.ptr, y.ptr, c.ptr) return x diff --git a/src/number/n_unknown.jl b/src/number/n_unknown.jl index 11a5454d3..c003e95d2 100644 --- a/src/number/n_unknown.jl +++ b/src/number/n_unknown.jl @@ -417,8 +417,8 @@ for (rw, rew) in [(:RingWrapper, :RingElemWrapper), return ($rew){S, T}(one(R.data), R) end - function addeq!(z::($rew){S, T}, a::($rew){S, T}) where {S, T} - z.data = addeq!(z.data, a.data) + function add!(z::($rew){S, T}, a::($rew){S, T}) where {S, T} + z.data = add!(z.data, a.data) return z end diff --git a/src/poly/poly.jl b/src/poly/poly.jl index e91b89a2d..badc9519c 100644 --- a/src/poly/poly.jl +++ b/src/poly/poly.jl @@ -1358,7 +1358,7 @@ function sort_terms!(x::SPolyUnion) return x end -function addeq!(x::SPolyUnion, y::SPolyUnion) +function add!(x::SPolyUnion, y::SPolyUnion) R = parent(x) GC.@preserve x y R begin if y.ptr == C_NULL