From 7e014b55412f75129c500ec6347eaa27fef42c6f Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Wed, 14 Feb 2024 16:23:09 +0100 Subject: [PATCH] `ordering` -> `internal_ordering` --- src/flint/FlintTypes.jl | 10 +++--- src/flint/fmpq_mpoly.jl | 2 +- src/flint/fmpz_mod_mpoly.jl | 2 +- src/flint/fmpz_mpoly.jl | 2 +- src/flint/fq_default_mpoly.jl | 4 +-- src/flint/fq_nmod_mpoly.jl | 2 +- src/flint/nmod_mpoly.jl | 2 +- test/flint/fmpq_mpoly-test.jl | 48 ++++++++++++++--------------- test/flint/fmpz_mpoly-test.jl | 48 ++++++++++++++--------------- test/flint/fq_default_mpoly-test.jl | 48 ++++++++++++++--------------- test/flint/fq_nmod_mpoly-test.jl | 48 ++++++++++++++--------------- test/flint/gfp_fmpz_mpoly-test.jl | 48 ++++++++++++++--------------- test/flint/gfp_mpoly-test.jl | 48 ++++++++++++++--------------- test/flint/nmod_mpoly-test.jl | 48 ++++++++++++++--------------- test/generic/MPoly-test.jl | 8 ++--- 15 files changed, 184 insertions(+), 184 deletions(-) diff --git a/src/flint/FlintTypes.jl b/src/flint/FlintTypes.jl index 01678c287..6f565ae25 100644 --- a/src/flint/FlintTypes.jl +++ b/src/flint/FlintTypes.jl @@ -6877,24 +6877,24 @@ const _fq_default_mpoly_union = Union{AbstractAlgebra.Generic.MPoly{FqPolyRepFie base_ring::FqField typ::Int # keep these in sync with @fq_default_mpoly_do_op - function FqMPolyRing(R::FqField, s::Vector{Symbol}, ordering::Symbol = :lex, cached::Bool = true) - return get_cached!(FqDefaultMPolyID, (R, s, ordering), cached) do + function FqMPolyRing(R::FqField, s::Vector{Symbol}, internal_ordering::Symbol = :lex, cached::Bool = true) + return get_cached!(FqDefaultMPolyID, (R, s, internal_ordering), cached) do # in the following all constructors should use chached = false m = modulus(R) p = characteristic(R) if fits(UInt, p) Fq = Native.GF(UInt(p)) if isone(degree(m)) - Fqx = polynomial_ring(Fq, s, cached = cached, ordering = ordering)[1] + Fqx = polynomial_ring(Fq, s, cached = cached, internal_ordering = internal_ordering)[1] return new(Fqx, R, 3) end mm = polynomial_ring(Fq, "x")[1](lift(polynomial_ring(ZZ, "x")[1], m)) Fq = Native.FiniteField(mm, R.var, cached = cached, check = false)[1] - Fqx = polynomial_ring(Fq, s, cached = cached, ordering = ordering)[1] + Fqx = polynomial_ring(Fq, s, cached = cached, internal_ordering = internal_ordering)[1] return new(Fqx, R, 2) end Fq = FqPolyRepField(m, Symbol(R.var), cached, check = false) - Fqx = AbstractAlgebra.Generic.polynomial_ring(Fq, s, cached = cached, ordering = ordering)[1] + Fqx = AbstractAlgebra.Generic.polynomial_ring(Fq, s, cached = cached, internal_ordering = internal_ordering)[1] return new(Fqx, R, 1) end::FqMPolyRing end diff --git a/src/flint/fmpq_mpoly.jl b/src/flint/fmpq_mpoly.jl index 57954aa49..d27211d43 100644 --- a/src/flint/fmpq_mpoly.jl +++ b/src/flint/fmpq_mpoly.jl @@ -30,7 +30,7 @@ number_of_variables(a::QQMPolyRing) = ccall((:fmpq_mpoly_ctx_nvars, libflint), I base_ring(a::QQMPolyRing) = FlintQQ -function ordering(a::QQMPolyRing) +function internal_ordering(a::QQMPolyRing) b = ccall((:fmpq_mpoly_ctx_ord, libflint), Cint, (Ref{QQMPolyRing}, ), a) return flint_orderings[b + 1] end diff --git a/src/flint/fmpz_mod_mpoly.jl b/src/flint/fmpz_mod_mpoly.jl index f990ff595..314115dd0 100644 --- a/src/flint/fmpz_mod_mpoly.jl +++ b/src/flint/fmpz_mod_mpoly.jl @@ -47,7 +47,7 @@ modulus(R::($rtype)) = modulus(base_ring(R)) modulus(f::($etype)) = modulus(base_ring(parent(f))) -function ordering(a::($rtype)) +function internal_ordering(a::($rtype)) b = a.ord # b = ccall((:fmpz_mod_mpoly_ctx_ord, libflint), Cint, (Ref{zzModMPolyRing}, ), a) return flint_orderings[b + 1] diff --git a/src/flint/fmpz_mpoly.jl b/src/flint/fmpz_mpoly.jl index e3c8ab660..0eef820fa 100644 --- a/src/flint/fmpz_mpoly.jl +++ b/src/flint/fmpz_mpoly.jl @@ -30,7 +30,7 @@ number_of_variables(a::ZZMPolyRing) = ccall((:fmpz_mpoly_ctx_nvars, libflint), I base_ring(a::ZZMPolyRing) = FlintZZ -function ordering(a::ZZMPolyRing) +function internal_ordering(a::ZZMPolyRing) b = ccall((:fmpz_mpoly_ctx_ord, libflint), Cint, (Ref{ZZMPolyRing}, ), a) return flint_orderings[b + 1] end diff --git a/src/flint/fq_default_mpoly.jl b/src/flint/fq_default_mpoly.jl index fffffb616..727406014 100644 --- a/src/flint/fq_default_mpoly.jl +++ b/src/flint/fq_default_mpoly.jl @@ -22,8 +22,8 @@ modulus(R::FqMPolyRing) = modulus(base_ring(R)) modulus(f::FqMPolyRingElem) = modulus(base_ring(parent(f))) -function ordering(a::FqMPolyRing) - return ordering(a.data) +function internal_ordering(a::FqMPolyRing) + return internal_ordering(a.data) end function gens(R::FqMPolyRing) diff --git a/src/flint/fq_nmod_mpoly.jl b/src/flint/fq_nmod_mpoly.jl index 7cb3f50c9..bc2cda09c 100644 --- a/src/flint/fq_nmod_mpoly.jl +++ b/src/flint/fq_nmod_mpoly.jl @@ -29,7 +29,7 @@ number_of_variables(a::fqPolyRepMPolyRing) = a.nvars base_ring(a::fqPolyRepMPolyRing) = a.base_ring -function ordering(a::fqPolyRepMPolyRing) +function internal_ordering(a::fqPolyRepMPolyRing) b = a.ord # b = ccall((:fq_nmod_mpoly_ctx_ord, libflint), Cint, (Ref{fqPolyRepMPolyRing}, ), a) return flint_orderings[b + 1] diff --git a/src/flint/nmod_mpoly.jl b/src/flint/nmod_mpoly.jl index c8034f752..f5cdb02d3 100644 --- a/src/flint/nmod_mpoly.jl +++ b/src/flint/nmod_mpoly.jl @@ -43,7 +43,7 @@ modulus(R::($rtype)) = modulus(base_ring(R)) modulus(f::($etype)) = modulus(base_ring(parent(f))) -function ordering(a::($rtype)) +function internal_ordering(a::($rtype)) b = a.ord # b = ccall((:nmod_mpoly_ctx_ord, libflint), Cint, (Ref{zzModMPolyRing}, ), a) return flint_orderings[b + 1] diff --git a/test/flint/fmpq_mpoly-test.jl b/test/flint/fmpq_mpoly-test.jl index 6f39f60c0..3384d4f01 100644 --- a/test/flint/fmpq_mpoly-test.jl +++ b/test/flint/fmpq_mpoly-test.jl @@ -5,14 +5,14 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -112,7 +112,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == 0 @@ -171,10 +171,10 @@ end @test (i1 == i2) == (monomial(f, i1) == monomial(f, i2)) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -238,7 +238,7 @@ end R = FlintQQ for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = -8*x^5*y^3*z^5+9*x^5*y^2*z^3-8*x^4*y^5*z^4-10*x^4*y^3*z^2+8*x^3*y^2*z-10*x*y^3* z^4-4*x*y-10*x*z^2+8*y^2*z^5-9*y^2*z^3 @@ -260,7 +260,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -277,7 +277,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -300,7 +300,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100, -100:100) @@ -340,7 +340,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -366,7 +366,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -393,7 +393,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -422,7 +422,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -458,7 +458,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -505,7 +505,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(FlintQQ, var_names, ordering = ord) + S, varlist = polynomial_ring(FlintQQ, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -550,7 +550,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(FlintQQ, var_names, ordering = ord) + S, varlist = polynomial_ring(FlintQQ, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -576,7 +576,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100, -100:100) @@ -659,7 +659,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -697,7 +697,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100, -100:100) @@ -715,7 +715,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(FlintQQ, var_names; ordering=ord) + R, vars_R = polynomial_ring(FlintQQ, var_names; internal_ordering=ord) for iter in 1:10 f = R() @@ -749,7 +749,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(FlintQQ, var_names; ordering=ord) + R, vars_R = polynomial_ring(FlintQQ, var_names; internal_ordering=ord) for iter in 1:10 f = R() diff --git a/test/flint/fmpz_mpoly-test.jl b/test/flint/fmpz_mpoly-test.jl index b23f24571..6b59c2f48 100644 --- a/test/flint/fmpz_mpoly-test.jl +++ b/test/flint/fmpz_mpoly-test.jl @@ -5,14 +5,14 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -112,7 +112,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == 0 @@ -160,10 +160,10 @@ end @test (i1 == i2) == (monomial(f, i1) == monomial(f, i2)) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -227,7 +227,7 @@ end R = FlintZZ for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = -8*x^5*y^3*z^5+9*x^5*y^2*z^3-8*x^4*y^5*z^4-10*x^4*y^3*z^2+8*x^3*y^2*z-10*x*y^3*z^4-4*x*y-10*x*z^2+8*y^2*z^5-9*y^2*z^3 @@ -248,7 +248,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -265,7 +265,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -288,7 +288,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100, -100:100) @@ -324,7 +324,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -346,7 +346,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -373,7 +373,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -402,7 +402,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -438,7 +438,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -485,7 +485,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(FlintZZ, var_names, ordering = ord) + S, varlist = polynomial_ring(FlintZZ, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -534,7 +534,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(FlintZZ, var_names, ordering = ord) + S, varlist = polynomial_ring(FlintZZ, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -560,7 +560,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100, -100:100) @@ -644,7 +644,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -682,7 +682,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100, -100:100) @@ -700,7 +700,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(FlintZZ, var_names; ordering=ord) + R, vars_R = polynomial_ring(FlintZZ, var_names; internal_ordering=ord) for iter in 1:10 f = R() @@ -734,7 +734,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(FlintZZ, var_names; ordering=ord) + R, vars_R = polynomial_ring(FlintZZ, var_names; internal_ordering=ord) for iter in 1:10 f = R() diff --git a/test/flint/fq_default_mpoly-test.jl b/test/flint/fq_default_mpoly-test.jl index 5cd2021fa..b18fd017c 100644 --- a/test/flint/fq_default_mpoly-test.jl +++ b/test/flint/fq_default_mpoly-test.jl @@ -10,14 +10,14 @@ local test_fields = (finite_field(23, 1, "a"), var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -120,7 +120,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == characteristic(R) @@ -173,10 +173,10 @@ end @test f == sum((coeff(f, i) * S([R(1)], [Nemo.exponent_vector(f, i)]) for i in 1:length(f))) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -243,7 +243,7 @@ end @testset "FqMPolyRingElem.multivariate_coeff" begin for (R, a) in test_fields for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = 15*x^5*y^3*z^5+9*x^5*y^2*z^3+15*x^4*y^5*z^4+13*x^4*y^3*z^2+8*x^3*y^2*z+13*x*y^3*z^4+19*a*x*y+13*x*z^2+8*y^2*z^5+14*y^2*z^3 @@ -264,7 +264,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -281,7 +281,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -304,7 +304,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -340,7 +340,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -362,7 +362,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -388,7 +388,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test divexact(2*gen(S, 1), 2) == gen(S, 1) @test divexact(2*gen(S, 1), R(2)) == gen(S, 1) @@ -420,7 +420,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -456,7 +456,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -505,7 +505,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5) @@ -554,7 +554,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -583,7 +583,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -637,7 +637,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -675,7 +675,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100) @@ -695,7 +695,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, _ = polynomial_ring(R, var_names; ordering=ord) + S, _ = polynomial_ring(R, var_names; internal_ordering=ord) for iter in 1:10 f = S() @@ -731,7 +731,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, _ = polynomial_ring(R, var_names; ordering=ord) + S, _ = polynomial_ring(R, var_names; internal_ordering=ord) for iter in 1:10 f = S() diff --git a/test/flint/fq_nmod_mpoly-test.jl b/test/flint/fq_nmod_mpoly-test.jl index 8b60ab813..88707e8d0 100644 --- a/test/flint/fq_nmod_mpoly-test.jl +++ b/test/flint/fq_nmod_mpoly-test.jl @@ -5,14 +5,14 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -125,7 +125,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == 23 @@ -173,10 +173,10 @@ end @test f == sum((coeff(f, i) * S([R(1)], [Nemo.exponent_vector_fmpz(f, i)]) for i in 1:length(f))) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -249,7 +249,7 @@ end R, a = Native.finite_field(23, 5, "a") for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = 15*x^5*y^3*z^5+9*x^5*y^2*z^3+15*x^4*y^5*z^4+13*x^4*y^3*z^2+8*x^3*y^2*z+13*x*y^3*z^4+19*a*x*y+13*x*z^2+8*y^2*z^5+14*y^2*z^3 @@ -270,7 +270,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -287,7 +287,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -310,7 +310,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -346,7 +346,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -368,7 +368,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -395,7 +395,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -424,7 +424,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -460,7 +460,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -509,7 +509,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5) @@ -552,7 +552,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -578,7 +578,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -661,7 +661,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -699,7 +699,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100) @@ -719,7 +719,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() @@ -755,7 +755,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() diff --git a/test/flint/gfp_fmpz_mpoly-test.jl b/test/flint/gfp_fmpz_mpoly-test.jl index 372d65bc8..0d3f02fca 100644 --- a/test/flint/gfp_fmpz_mpoly-test.jl +++ b/test/flint/gfp_fmpz_mpoly-test.jl @@ -5,14 +5,14 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -82,7 +82,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == 23 @@ -135,10 +135,10 @@ end @test f == sum((coeff(f, i) * S([R(1)], [Nemo.exponent_vector_fmpz(f, i)]) for i in 1:length(f))) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -217,7 +217,7 @@ end R = Native.GF(ZZRingElem(23)) for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = 15*x^5*y^3*z^5+9*x^5*y^2*z^3+15*x^4*y^5*z^4+13*x^4*y^3*z^2+8*x^3*y^2*z+13*x*y^3*z^4+19*x*y+13*x*z^2+8*y^2*z^5+14*y^2*z^3 @@ -238,7 +238,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -255,7 +255,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -278,7 +278,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -314,7 +314,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -336,7 +336,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -363,7 +363,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -397,7 +397,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -433,7 +433,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -482,7 +482,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5) @@ -530,7 +530,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -556,7 +556,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -617,7 +617,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -655,7 +655,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100) @@ -675,7 +675,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() @@ -733,7 +733,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() diff --git a/test/flint/gfp_mpoly-test.jl b/test/flint/gfp_mpoly-test.jl index b5a8cbc22..9cd0a423d 100644 --- a/test/flint/gfp_mpoly-test.jl +++ b/test/flint/gfp_mpoly-test.jl @@ -5,14 +5,14 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -109,7 +109,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == 23 @@ -162,10 +162,10 @@ end @test f == sum((coeff(f, i) * S([R(1)], [Nemo.exponent_vector_fmpz(f, i)]) for i in 1:length(f))) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -238,7 +238,7 @@ end R = Native.GF(23) for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = 15*x^5*y^3*z^5+9*x^5*y^2*z^3+15*x^4*y^5*z^4+13*x^4*y^3*z^2+8*x^3*y^2*z+13*x*y^3*z^4+19*x*y+13*x*z^2+8*y^2*z^5+14*y^2*z^3 @@ -259,7 +259,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -276,7 +276,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -299,7 +299,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -335,7 +335,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -357,7 +357,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -384,7 +384,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -418,7 +418,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -454,7 +454,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -503,7 +503,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5) @@ -551,7 +551,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -577,7 +577,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -665,7 +665,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -703,7 +703,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100) @@ -723,7 +723,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() @@ -781,7 +781,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() diff --git a/test/flint/nmod_mpoly-test.jl b/test/flint/nmod_mpoly-test.jl index c34a26077..4566feff0 100644 --- a/test/flint/nmod_mpoly-test.jl +++ b/test/flint/nmod_mpoly-test.jl @@ -5,14 +5,14 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) - SS, varlist = polynomial_ring(R, var_names, ordering = ord) + SS, varlist = polynomial_ring(R, var_names, internal_ordering = ord) @test S === SS - SSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) - SSSS, varlist = polynomial_ring(R, var_names, ordering = ord, cached = false) + SSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) + SSSS, varlist = polynomial_ring(R, var_names, internal_ordering = ord, cached = false) @test !(SSS === SSSS) @@ -124,7 +124,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) g = gens(S) @test characteristic(S) == 23 @@ -177,10 +177,10 @@ end @test f == sum((coeff(f, i) * S([R(1)], [Nemo.exponent_vector_fmpz(f, i)]) for i in 1:length(f))) end - deg = is_degree(ordering(S)) - rev = is_reverse(ordering(S)) + deg = is_degree(internal_ordering(S)) + rev = is_reverse(internal_ordering(S)) - @test ord == ordering(S) + @test ord == internal_ordering(S) @test isone(one(S)) @@ -259,7 +259,7 @@ end R, = residue_ring(FlintZZ, 23) for ord in Nemo.flint_orderings - S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; ordering=ord) + S, (x, y, z) = polynomial_ring(R, ["x", "y", "z"]; internal_ordering=ord) f = 15*x^5*y^3*z^5+9*x^5*y^2*z^3+15*x^4*y^5*z^4+13*x^4*y^3*z^2+8*x^3*y^2*z+13*x*y^3*z^4+19*x*y+13*x*z^2+8*y^2*z^5+14*y^2*z^3 @@ -280,7 +280,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -297,7 +297,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -320,7 +320,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -356,7 +356,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 d = rand(-100:100) @@ -378,7 +378,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -405,7 +405,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100) @@ -439,7 +439,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -475,7 +475,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -524,7 +524,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5) @@ -570,7 +570,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:4, 0:5, -10:10) @@ -596,7 +596,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = rand(S, 0:5, 0:100) @@ -684,7 +684,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for iter = 1:100 f = S() @@ -722,7 +722,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(R, var_names, ordering = ord) + S, varlist = polynomial_ring(R, var_names, internal_ordering = ord) for j in 1:100 f = rand(S, 0:5, 0:100) @@ -742,7 +742,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() @@ -800,7 +800,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - R, vars_R = polynomial_ring(R23, var_names; ordering=ord) + R, vars_R = polynomial_ring(R23, var_names; internal_ordering=ord) for iter in 1:10 f = R() diff --git a/test/generic/MPoly-test.jl b/test/generic/MPoly-test.jl index 52df40733..c325831b9 100644 --- a/test/generic/MPoly-test.jl +++ b/test/generic/MPoly-test.jl @@ -6,7 +6,7 @@ var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(K, var_names, ordering = ord) + S, varlist = polynomial_ring(K, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -30,7 +30,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(K, var_names, ordering = ord) + S, varlist = polynomial_ring(K, var_names, internal_ordering = ord) for iter = 1:10 f = rand(S, 0:5, 0:100, -100:100) @@ -55,7 +55,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(K, var_names, ordering = ord) + S, varlist = polynomial_ring(K, var_names, internal_ordering = ord) for iter = 1:10 f = S(0) @@ -90,7 +90,7 @@ end var_names = ["x$j" for j in 1:num_vars] ord = rand_ordering() - S, varlist = polynomial_ring(K, var_names, ordering = ord) + S, varlist = polynomial_ring(K, var_names, internal_ordering = ord) for iter = 1:10 f = S(0)