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.

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

The big renaming #1376

Merged
merged 18 commits into from
Feb 23, 2023
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
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: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Nemo"
uuid = "2edaba10-b0f1-5616-af89-8c11ac63239a"
version = "0.32.7"
version = "0.33.0-DEV"

[deps]
AbstractAlgebra = "c3fe647b-3220-5bb0-a1ea-a7954cac585d"
Expand All @@ -19,7 +19,7 @@ SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
AbstractAlgebra = "^0.27.3"
AbstractAlgebra = "^0.28"
Antic_jll = "~0.201.500"
Arb_jll = "~200.2300.000"
Calcium_jll = "~0.401.100"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bernoulli_polynomials.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ function benchmark_bernoulli()
print("benchmark_bernoulli ... ")

R, x = FlintQQ["x"]
S, t = PowerSeriesRing(R, 1000, "t")
S, t = power_series_ring(R, 1000, "t")

u = t + O(t^1000)

Expand Down
4 changes: 2 additions & 2 deletions benchmarks/charpoly_integers.jl
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
function benchmark_charpoly_int()
print("benchmark_charpoly_int ... ")
M = MatrixSpace(FlintZZ, 80, 80)()
M = matrix_space(FlintZZ, 80, 80)()

for i in 1:80
for j in 1:80
M[i, j] = rand(-20:20)
end
end

tt = @elapsed charpoly(PolynomialRing(FlintZZ, "x")[1], M)
tt = @elapsed charpoly(polynomial_ring(FlintZZ, "x")[1], M)
println("$tt")
end
6 changes: 3 additions & 3 deletions benchmarks/det_commutative_ring.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
function benchmark_znz_det()
print("benchmark_znz_det ... ")
n = 2003 * 1009
Zn = ResidueRing(FlintZZ, n)
R, x = PolynomialRing(Zn, "x")
Zn = residue_ring(FlintZZ, n)
R, x = polynomial_ring(Zn, "x")

M = MatrixSpace(R, 80, 80)()
M = matrix_space(R, 80, 80)()

for i in 1:80
for j in 1:80
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/det_field.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
function benchmark_nf_det()
print("benchmark_nf_det ... ")
QQx, x = PolynomialRing(FlintQQ, "x")
QQx, x = polynomial_ring(FlintQQ, "x")
K, a = AnticNumberField(x^3 + 3*x + 1, "a")
M = MatrixSpace(K, 80, 80)()
M = matrix_space(K, 80, 80)()

for i in 1:80
for j in 1:80
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/det_polynomials.jl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
function benchmark_det_poly_ring()
print("benchmark_det_poly_ring ... ")
ZZx, x = PolynomialRing(FlintZZ, "x")
M = MatrixSpace(ZZx, 40, 40)()
ZZx, x = polynomial_ring(FlintZZ, "x")
M = matrix_space(ZZx, 40, 40)()

for i in 1:40
for j in 1:40
M[i, j] = ZZx(map(fmpz, rand(-20:20, 3)))
M[i, j] = ZZx(map(ZZRingElem, rand(-20:20, 3)))
end
end

Expand Down
8 changes: 4 additions & 4 deletions benchmarks/fateman.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
function benchmark_fateman()
print("benchmark_fateman ... ")
R, x = PolynomialRing(FlintZZ, "x")
S, y = PolynomialRing(R, "y")
T, z = PolynomialRing(S, "z")
U, t = PolynomialRing(T, "t")
R, x = polynomial_ring(FlintZZ, "x")
S, y = polynomial_ring(R, "y")
T, z = polynomial_ring(S, "z")
U, t = polynomial_ring(T, "t")

p = (x + y + z + t + 1)^20

Expand Down
18 changes: 9 additions & 9 deletions benchmarks/gcdx.jl
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
function gcdx_bigint(a::fmpz, b::fmpz)
function gcdx_bigint(a::ZZRingElem, b::ZZRingElem)
g, s, t = gcdx(BigInt(a), BigInt(b))
return fmpz(g), fmpz(s), fmpz(t)
return ZZRingElem(g), ZZRingElem(s), ZZRingElem(t)
end

function gcdx_fmpz(a::fmpz, b::fmpz)
function gcdx_fmpz(a::ZZRingElem, b::ZZRingElem)
d = ZZ()
x = ZZ()
y = ZZ()
ccall((:fmpz_xgcd_canonical_bezout, libflint), Nothing,
(Ref{fmpz}, Ref{fmpz}, Ref{fmpz}, Ref{fmpz}, Ref{fmpz}), d, x, y, a, b)
(Ref{ZZRingElem}, Ref{ZZRingElem}, Ref{ZZRingElem}, Ref{ZZRingElem}, Ref{ZZRingElem}), d, x, y, a, b)
return d, x, y
end

function run_gcdx_bigint(x::Vector{fmpz}, y::Vector{fmpz})
function run_gcdx_bigint(x::Vector{ZZRingElem}, y::Vector{ZZRingElem})
for ix in x, iy in y
gcdx_bigint(ix, iy)
end
end

function run_gcdx_fmpz(x::Vector{fmpz}, y::Vector{fmpz})
function run_gcdx_fmpz(x::Vector{ZZRingElem}, y::Vector{ZZRingElem})
for ix in x, iy in y
gcdx_fmpz(ix, iy)
end
Expand All @@ -35,7 +35,7 @@ function benchmark_gcdx()
tt = @elapsed run_gcdx_bigint(x, y)
println("Small sized integers for BigInt-solution: $tt")
tt = @elapsed run_gcdx_fmpz(x, y)
println("Small sized integers for fmpz-solution: $tt")
println("Small sized integers for ZZRingElem-solution: $tt")

# mixed integers
range = ZZ(0):ZZ(2)^Sys.WORD_SIZE
Expand All @@ -45,7 +45,7 @@ function benchmark_gcdx()
tt = @elapsed run_gcdx_bigint(x, y)
println("Mixed sized integers for BigInt-solution: $tt")
tt = @elapsed run_gcdx_fmpz(x, y)
println("Mixed sized integers for fmpz-solution: $tt")
println("Mixed sized integers for ZZRingElem-solution: $tt")

# big integers
range = ZZ(0):ZZ(2)^512
Expand All @@ -55,5 +55,5 @@ function benchmark_gcdx()
tt = @elapsed run_gcdx_bigint(x, y)
println("Large sized integers for BigInt-solution: $tt")
tt = @elapsed run_gcdx_fmpz(x, y)
println("Large sized integers for fmpz-solution: $tt")
println("Large sized integers for ZZRingElem-solution: $tt")
end
4 changes: 2 additions & 2 deletions benchmarks/minpoly_finite_field.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function benchmark_minpoly_finite_field()

F, s = FlintFiniteField(103, 2, "s")

M = MatrixSpace(F, 80, 80)()
M = matrix_space(F, 80, 80)()

for i in 1:40
for j in 1:40
Expand All @@ -17,7 +17,7 @@ function benchmark_minpoly_finite_field()
similarity!(M, rand(1:80), F(rand(-3:3)))
end

tt = @elapsed minpoly(PolynomialRing(F, "x")[1], M)
tt = @elapsed minpoly(polynomial_ring(F, "x")[1], M)
println("$tt")
end

8 changes: 4 additions & 4 deletions benchmarks/minpoly_gcd_domain.jl
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
function benchmark_minpoly_gcd_domain()
print("benchmark_minpoly_gcd_domain ... ")
ZZx, x = PolynomialRing(ZZ, "x")
ZZx, x = polynomial_ring(ZZ, "x")

M = MatrixSpace(ZZx, 20, 20)()
M = matrix_space(ZZx, 20, 20)()

for i in 1:10
for j in 1:10
r = ZZx(map(fmpz, rand(-20:20, 3)))
r = ZZx(map(ZZRingElem, rand(-20:20, 3)))
M[i, j] = r
M[10 + i, 10 + j] = deepcopy(r)
end
Expand All @@ -16,6 +16,6 @@ function benchmark_minpoly_gcd_domain()
similarity!(M, rand(1:20), ZZx(rand(-3:3)))
end

tt = @elapsed minpoly(PolynomialRing(ZZx, "y")[1], M)
tt = @elapsed minpoly(polynomial_ring(ZZx, "y")[1], M)
println("$tt")
end
6 changes: 3 additions & 3 deletions benchmarks/minpoly_integers.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function benchmark_minpoly_integers()
print("benchmark_minpoly_integers ... ")
M = MatrixSpace(FlintZZ, 80, 80)()
M = matrix_space(FlintZZ, 80, 80)()

for i in 1:40
for j in 1:40
Expand All @@ -11,10 +11,10 @@ function benchmark_minpoly_integers()
end

for i in 1:10
similarity!(M, rand(1:80), fmpz(rand(-3:3)))
similarity!(M, rand(1:80), ZZRingElem(rand(-3:3)))
end

tt = @elapsed minpoly(PolynomialRing(FlintZZ, "x")[1], M)
tt = @elapsed minpoly(polynomial_ring(FlintZZ, "x")[1], M)
println("$tt")
end

10 changes: 5 additions & 5 deletions benchmarks/pearce.jl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
function benchmark_pearce()
print("benchmark_pearce ... ")
R, x = PolynomialRing(ZZ, "x")
S, y = PolynomialRing(R, "y")
T, z = PolynomialRing(S, "z")
U, t = PolynomialRing(T, "t")
V, u = PolynomialRing(U, "u")
R, x = polynomial_ring(ZZ, "x")
S, y = polynomial_ring(R, "y")
T, z = polynomial_ring(S, "z")
U, t = polynomial_ring(T, "t")
V, u = polynomial_ring(U, "u")

f = (x + y + 2z^2 + 3t^3 + 5u^5 + 1)^10
g = (u + t + 2z^2 + 3y^3 + 5x^5 + 1)^10
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/polynomials_number_field.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
function benchmark_poly_nf_elem()
print("benchmark_poly_nf_elem ... ")
R, x = CyclotomicField(20, "x")
S, y = PolynomialRing(R, "y")
S, y = polynomial_ring(R, "y")

f = (3x^7 + x^4 - 3x + 1)*y^3 + (2x^6-x^5+4x^4-x^3+x^2-1)*y +(-3x^7+2x^6-x^5+3x^3-2x^2+x)

Expand Down
6 changes: 3 additions & 3 deletions benchmarks/resultant.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
function benchmark_resultant()
print("benchmark_resultant ... ")
R, x = FiniteField(7, 11, "x")
S, y = PolynomialRing(R, "y")
T = ResidueRing(S, y^3 + 3x*y + 1)
U, z = PolynomialRing(T, "z")
S, y = polynomial_ring(R, "y")
T = residue_ring(S, y^3 + 3x*y + 1)
U, z = polynomial_ring(T, "z")

f = (3y^2 + y + x)*z^2 + ((x + 2)*y^2 + x + 1)*z + 4x*y + 3
g = (7y^2 - y + 2x + 7)*z^2 + (3y^2 + 4x + 1)*z + (2x + 1)*y + 1
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/solve_polynomials.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
function benchmark_solve_poly()
print("benchmark_solve_poly ... ")
R, x = PolynomialRing(FlintZZ, "x")
S, y = PolynomialRing(R, "y")
M = MatrixSpace(S, 20, 20)()
R, x = polynomial_ring(FlintZZ, "x")
S, y = polynomial_ring(R, "y")
M = matrix_space(S, 20, 20)()

for i in 1:20
for j in 1:20
Expand All @@ -12,7 +12,7 @@ function benchmark_solve_poly()
end
end

b = MatrixSpace(S, 20, 1)()
b = matrix_space(S, 20, 1)()

for j in 1:20
for k in 0:2
Expand Down
16 changes: 8 additions & 8 deletions docs/src/acb.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ Coerce zero into the Arb complex field.

```
R(n::Integer)
R(f::fmpz)
R(q::fmpq)
R(f::ZZRingElem)
R(q::QQFieldElem)
```

Coerce an integer or rational value into the Arb complex field.
Expand Down Expand Up @@ -248,8 +248,8 @@ contains(::acb, ::acb)

```@docs
contains(::acb, ::Integer)
contains(::acb, ::fmpz)
contains(::acb, ::fmpq)
contains(::acb, ::ZZRingElem)
contains(::acb, ::QQFieldElem)
```

The following functions are also provided for determining if a box intersects
Expand Down Expand Up @@ -292,10 +292,10 @@ Function |
-----------------------------|
`==(x::acb, y::Integer)` |
`==(x::Integer, y::acb)` |
`==(x::acb, y::fmpz)` |
`==(x::fmpz, y::acb)` |
`==(x::arb, y::fmpz)` |
`==(x::fmpz, y::arb)` |
`==(x::acb, y::ZZRingElem)` |
`==(x::ZZRingElem, y::acb)` |
`==(x::arb, y::ZZRingElem)` |
`==(x::ZZRingElem, y::arb)` |
`==(x::acb, y::Float64)` |
`==(x::Float64, y::acb)` |

Expand Down
20 changes: 10 additions & 10 deletions docs/src/algebraic.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ Methods to construct algebraic numbers include:
Arithmetic:

```julia
julia> fmpz(QQBar(3))
julia> ZZRingElem(QQBar(3))
3

julia> fmpq(QQBar(3) // 2)
julia> QQFieldElem(QQBar(3) // 2)
3//2

julia> QQBar(-1) ^ (QQBar(1) // 3)
Expand All @@ -69,7 +69,7 @@ Root 0.500000 + 0.866025*im of x^2 - x + 1
Solving the quintic equation:

```julia
julia> R, x = PolynomialRing(QQ, "x")
julia> R, x = polynomial_ring(QQ, "x")
(Univariate Polynomial Ring in x over Rational Field, x)

julia> v = roots(x^5-x-1, QQBar)
Expand Down Expand Up @@ -97,10 +97,10 @@ julia> eigenvalues(ZZ[1 1 0; 0 1 1; 1 0 1], QQBar)
**Interface**

```@docs
roots(f::fmpz_poly, R::CalciumQQBarField)
roots(f::fmpq_poly, R::CalciumQQBarField)
eigenvalues(A::fmpz_mat, R::CalciumQQBarField)
eigenvalues(A::fmpq_mat, R::CalciumQQBarField)
roots(f::ZZPolyRingElem, R::CalciumQQBarField)
roots(f::QQPolyRingElem, R::CalciumQQBarField)
eigenvalues(A::ZZMatrix, R::CalciumQQBarField)
eigenvalues(A::QQMatrix, R::CalciumQQBarField)
rand(R::CalciumQQBarField; degree::Int, bits::Int, randtype::Symbol=:null)
```

Expand Down Expand Up @@ -128,7 +128,7 @@ Retrieving the minimal polynomial and algebraic conjugates
of a given algebraic number:

```julia
julia> minpoly(PolynomialRing(ZZ, "x")[1], QQBar(1+2im))
julia> minpoly(polynomial_ring(ZZ, "x")[1], QQBar(1+2im))
x^2 - 2*x + 5

julia> conjugates(QQBar(1+2im))
Expand All @@ -147,8 +147,8 @@ is_rational(x::qqbar)
isreal(x::qqbar)
degree(x::qqbar)
is_algebraic_integer(x::qqbar)
minpoly(R::FmpzPolyRing, x::qqbar)
minpoly(R::FmpqPolyRing, x::qqbar)
minpoly(R::ZZPolyRing, x::qqbar)
minpoly(R::QQPolyRing, x::qqbar)
conjugates(a::qqbar)
denominator(x::qqbar)
numerator(x::qqbar)
Expand Down
Loading