Merge pull request #17 from ederc/f4-finite-field-fix

ederc · web-flow · commit c7300b05c8b7 · 2023-07-27T14:20:32.000+02:00
F4 finite field fix
diff --git a/Project.toml b/Project.toml
@@ -2,7 +2,7 @@ name = "AlgebraicSolving"
 uuid = "66b61cbe-0446-4d5d-9090-1ff510639f9d"
 authors = ["ederc <ederc@mathematik.uni-kl.de>",
         "Mohab Safey El Din <Mohab.Safey@lip6.fr"]
-version = "0.3.3"
+version = "0.3.4"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -14,4 +14,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 [compat]
 julia = "1.6"
 msolve_jll = "0.4.6"
-Nemo = "0.32.5, 0.33, 0.34, 0.35"
+Nemo = "0.35.1"
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -9,4 +9,4 @@ Nemo = "2edaba10-b0f1-5616-af89-8c11ac63239a"
 [compat]
 Documenter = "0.26"
 msolve_jll = "0.4.1"
-Nemo = "0.32.0"
+Nemo = "0.35.1"
diff --git a/src/algorithms/groebner-bases.jl b/src/algorithms/groebner-bases.jl
@@ -27,13 +27,13 @@ At the moment the underlying algorithm is based on variants of Faugère's F4 Alg
 julia> using AlgebraicSolving
 
 julia> R, (x,y,z) = PolynomialRing(GF(101),["x","y","z"], ordering=:degrevlex)
-(Multivariate Polynomial Ring in x, y, z over Galois field with characteristic 101, Nemo.gfp_mpoly[x, y, z])
+(Multivariate polynomial ring in 3 variables over GF(101), Nemo.fpMPolyRingElem[x, y, z])
 
 julia> I = Ideal([x+2*y+2*z-1, x^2+2*y^2+2*z^2-x, 2*x*y+2*y*z-y])
-Nemo.gfp_mpoly[x + 2*y + 2*z + 100, x^2 + 2*y^2 + 2*z^2 + 100*x, 2*x*y + 2*y*z + 100*y]
+Nemo.fpMPolyRingElem[x + 2*y + 2*z + 100, x^2 + 2*y^2 + 2*z^2 + 100*x, 2*x*y + 2*y*z + 100*y]
 
 julia> eliminate(I, 2)
-1-element Vector{Nemo.gfp_mpoly}:
+1-element Vector{Nemo.fpMPolyRingElem}:
  z^4 + 38*z^3 + 95*z^2 + 95*z
 ```
 """
@@ -81,20 +81,20 @@ At the moment the underlying algorithm is based on variants of Faugère's F4 Alg
 julia> using AlgebraicSolving
 
 julia> R, (x,y,z) = PolynomialRing(GF(101),["x","y","z"], ordering=:degrevlex)
-(Multivariate Polynomial Ring in x, y, z over Galois field with characteristic 101, Nemo.gfp_mpoly[x, y, z])
+(Multivariate polynomial ring in 3 variables over GF(101), Nemo.fpMPolyRingElem[x, y, z])
 
 julia> I = Ideal([x+2*y+2*z-1, x^2+2*y^2+2*z^2-x, 2*x*y+2*y*z-y])
-Nemo.gfp_mpoly[x + 2*y + 2*z + 100, x^2 + 2*y^2 + 2*z^2 + 100*x, 2*x*y + 2*y*z + 100*y]
+Nemo.fpMPolyRingElem[x + 2*y + 2*z + 100, x^2 + 2*y^2 + 2*z^2 + 100*x, 2*x*y + 2*y*z + 100*y]
 
 julia> groebner_basis(I)
-4-element Vector{Nemo.gfp_mpoly}:
+4-element Vector{Nemo.fpMPolyRingElem}:
  x + 2*y + 2*z + 100
  y*z + 82*z^2 + 10*y + 40*z
  y^2 + 60*z^2 + 20*y + 81*z
  z^3 + 28*z^2 + 64*y + 13*z
 
 julia> groebner_basis(I, eliminate=2)
-1-element Vector{Nemo.gfp_mpoly}:
+1-element Vector{Nemo.fpMPolyRingElem}:
  z^4 + 38*z^3 + 95*z^2 + 95*z
 ```
 """
diff --git a/src/algorithms/solvers.jl b/src/algorithms/solvers.jl
@@ -216,13 +216,13 @@ is greater then zero an empty array is returned.
 julia> using AlgebraicSolving
 
 julia> R,(x1,x2,x3) = PolynomialRing(QQ, ["x1","x2","x3"])
-(Multivariate Polynomial Ring in x1, x2, x3 over Rational Field, Nemo.fmpq_mpoly[x1, x2, x3])
+(Multivariate polynomial ring in 3 variables over QQ, Nemo.QQMPolyRingElem[x1, x2, x3])
 
 julia> I = Ideal([x1+2*x2+2*x3-1, x1^2+2*x2^2+2*x3^2-x1, 2*x1*x2+2*x2*x3-x2])
-Nemo.fmpq_mpoly[x1 + 2*x2 + 2*x3 - 1, x1^2 - x1 + 2*x2^2 + 2*x3^2, 2*x1*x2 + 2*x2*x3 - x2]
+Nemo.QQMPolyRingElem[x1 + 2*x2 + 2*x3 - 1, x1^2 - x1 + 2*x2^2 + 2*x3^2, 2*x1*x2 + 2*x2*x3 - x2]
 
 julia> rational_parametrization(I)
-AlgebraicSolving.RationalParametrization([:x1, :x2, :x3], fmpz[], 84*x^4 - 40*x^3 + x^2 + x, 336*x^3 - 120*x^2 + 2*x + 1, AbstractAlgebra.PolyElem[184*x^3 - 80*x^2 + 4*x + 1, 36*x^3 - 18*x^2 + 2*x])
+AlgebraicSolving.RationalParametrization([:x1, :x2, :x3], Nemo.ZZRingElem[], 84*x^4 - 40*x^3 + x^2 + x, 336*x^3 - 120*x^2 + 2*x + 1, AbstractAlgebra.PolyRingElem[184*x^3 - 80*x^2 + 4*x + 1, 36*x^3 - 18*x^2 + 2*x])
 ```
 """
 function rational_parametrization(
@@ -269,18 +269,18 @@ the rational roots of the ideal.
 julia> using AlgebraicSolving
 
 julia> R,(x1,x2,x3) = PolynomialRing(QQ, ["x1","x2","x3"])
-(Multivariate Polynomial Ring in x1, x2, x3 over Rational Field, Nemo.fmpq_mpoly[x1, x2, x3])
+(Multivariate polynomial ring in 3 variables over QQ, Nemo.QQMPolyRingElem[x1, x2, x3])
 
 julia> I = Ideal([x1+2*x2+2*x3-1, x1^2+2*x2^2+2*x3^2-x1, 2*x1*x2+2*x2*x3-x2])
-Nemo.fmpq_mpoly[x1 + 2*x2 + 2*x3 - 1, x1^2 - x1 + 2*x2^2 + 2*x3^2, 2*x1*x2 + 2*x2*x3 - x2]
+Nemo.QQMPolyRingElem[x1 + 2*x2 + 2*x3 - 1, x1^2 - x1 + 2*x2^2 + 2*x3^2, 2*x1*x2 + 2*x2*x3 - x2]
 
 julia> rat_sols = rational_solutions(I)
-2-element Vector{Vector{fmpq}}:
+2-element Vector{Vector{Nemo.QQFieldElem}}:
  [1, 0, 0]
  [1//3, 0, 1//3]
 
 julia> map(r->map(p->evaluate(p, r), I.gens), rat_sols)
-2-element Vector{Vector{fmpq}}:
+2-element Vector{Vector{Nemo.QQFieldElem}}:
  [0, 0, 0]
  [0, 0, 0]
 ```
@@ -365,13 +365,13 @@ is greater than zero an empty array is returned.
 julia> using AlgebraicSolving
 
 julia> R,(x1,x2,x3) = PolynomialRing(QQ, ["x1","x2","x3"])
-(Multivariate Polynomial Ring in x1, x2, x3 over Rational Field, Nemo.fmpq_mpoly[x1, x2, x3])
+(Multivariate polynomial ring in 3 variables over QQ, Nemo.QQMPolyRingElem[x1, x2, x3])
 
 julia> I = Ideal([x1+2*x2+2*x3-1, x1^2+2*x2^2+2*x3^2-x1, 2*x1*x2+2*x2*x3-x2])
-Nemo.fmpq_mpoly[x1 + 2*x2 + 2*x3 - 1, x1^2 - x1 + 2*x2^2 + 2*x3^2, 2*x1*x2 + 2*x2*x3 - x2]
+Nemo.QQMPolyRingElem[x1 + 2*x2 + 2*x3 - 1, x1^2 - x1 + 2*x2^2 + 2*x3^2, 2*x1*x2 + 2*x2*x3 - x2]
 
 julia> real_solutions(I)
-4-element Vector{Vector{fmpq}}:
+4-element Vector{Vector{Nemo.QQFieldElem}}:
  [5416829397//8589934592, 2708414699//8589934592, -2844258330290649520990905062759917788583//21778071482940061661655974875633165533184]
  [1, 0, 0]
  [1945971683//8589934592, 972985841//8589934592, 744426424910260862653434112767010536665//2722258935367507707706996859454145691648]
diff --git a/src/examples/katsura.jl b/src/examples/katsura.jl
@@ -25,7 +25,7 @@ Also note that indices have been shifted to start from 1.
 julia> using AlgebraicSolving
 
 julia> katsura(2)
-Nemo.fmpq_mpoly[x1 + 2*x2 + 2*x3 - 1, x1^2 + 2*x2^2 + 2*x3^2 - x1, 2*x1*x2 + 2*x2*x3 - x2]
+Nemo.QQMPolyRingElem[x1 + 2*x2 + 2*x3 - 1, x1^2 + 2*x2^2 + 2*x3^2 - x1, 2*x1*x2 + 2*x2*x3 - x2]
 ```
 """
 function katsura(log_solutions::Int, characteristic::Int=0)
@@ -50,10 +50,10 @@ Returns the Katsura ideal in the given polynomial ring `R`.
 julia> using AlgebraicSolving
 
 julia> R, _ = QQ["x", "y", "z"]
-(Multivariate Polynomial Ring in x, y, z over Rational Field, Nemo.fmpq_mpoly[x, y, z])
+(Multivariate polynomial ring in 3 variables over QQ, Nemo.QQMPolyRingElem[x, y, z])
 
 julia> katsura(R)
-Nemo.fmpq_mpoly[x + 2*y + 2*z - 1, x^2 - x + 2*y^2 + 2*z^2, 2*x*y + 2*y*z - y]
+Nemo.QQMPolyRingElem[x + 2*y + 2*z - 1, x^2 - x + 2*y^2 + 2*z^2, 2*x*y + 2*y*z - y]
 ```
 """
 function katsura(R::MPolyRing)
diff --git a/src/exports.jl b/src/exports.jl
@@ -1,3 +1,3 @@
 export PolynomialRing, MPolyRing, GFElem, MPoly, MPolyElem, FiniteField, GF,
-       characteristic, ZZ, QQ, vars, nvars, ngens, fmpz, fmpq, fmpq_poly,
-       base_ring, coefficient_ring, evaluate
+       characteristic, degree, ZZ, QQ, vars, nvars, ngens, fmpz, fmpq, fmpq_poly,
+       base_ring, coefficient_ring, evaluate, prime_field
diff --git a/src/imports.jl b/src/imports.jl
@@ -7,6 +7,7 @@ using LinearAlgebra
 import Nemo:
     bell,
     binomial,
+    degree,
     denominator,
     divexact,
     divides,
@@ -42,10 +43,14 @@ import Nemo:
     PolyElem,
     PolynomialRing,
     PolyRing,
+    prime_field,
     primorial,
     QQ,
+    QQFieldElem,
+    QQMPolyRingElem,
     rising_factorial,
     root,
     unit,
     vars,
-    ZZ
+    ZZ,
+    ZZRingElem
diff --git a/src/interfaces/nemo.jl b/src/interfaces/nemo.jl
@@ -18,8 +18,8 @@ function _convert_to_msolve(
     nr_terms   = sum(lens)
     field_char = characteristic(R)
 
-    if field_char > 2^31
-        error("At the moment we only support finite fields up to prime characteristic < 2^31.")
+    if field_char > 2^31 || degree(base_ring(R)) != 1
+        error("At the moment we only support prime fields up to prime characteristic < 2^31.")
     end
     # get coefficients
     if field_char == 0
@@ -37,7 +37,7 @@ function _convert_to_msolve(
     else
         for i in 1:nr_gens
             for cf in coefficients(F[i])
-                push!(cfs, Int32(data(cf)))
+                push!(cfs, Int32(data(prime_field(base_ring(R))(cf))))
             end
         end
     end
@@ -85,7 +85,7 @@ function _convert_finite_field_gb_to_abstract_algebra(
     nr_vars = nvars(R)
     CR      = coefficient_ring(R)
 
-    basis = Nemo.gfp_mpoly[]
+    basis = []
     #= basis = Vector{MPolyElem}(undef, bld) =#
 
     len   = 0
