Merge branch 'algebraic-solving:main' into intervals

Author: ederc

.github/workflows/CI.yml

@@ -41,13 +41,13 @@ jobs:
             os: macOS-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # For Codecov, we must also fetch the parent of the HEAD commit to
           # be able to properly deal with PRs / merges
           fetch-depth: 2
       - name: "Set up Julia"
-        uses: julia-actions/setup-julia@v1
+        uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.julia-version }}
           arch: ${{ matrix.julia-arch }}
@@ -76,7 +76,7 @@ jobs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@latest
       - uses: julia-actions/julia-docdeploy@latest

.github/workflows/CleanupDocPreview.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout gh-pages branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: gh-pages
       - name: Delete preview

Project.toml

@@ -1,7 +1,7 @@
 name = "AlgebraicSolving"
 uuid = "66b61cbe-0446-4d5d-9090-1ff510639f9d"
 authors = ["ederc <[email protected]>", "Mohab Safey El Din <[email protected]", "Rafael Mohr <[email protected]>"]
-version = "0.4.13"
+version = "0.4.15"
 
 [deps]
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -17,7 +17,7 @@ msolve_jll = "6d01cc9a-e8f6-580e-8c54-544227e08205"
 
 [compat]
 LoopVectorization = "0.12"
-Nemo = "0.43"
+Nemo = "0.43, 0.44, 0.45"
 StaticArrays = "1"
 julia = "1.6"
 LinearAlgebra = "1.6"
@@ -26,4 +26,4 @@ Markdown = "1.6"
 Printf = "1.6"
 Random = "1.6"
 Test = "1.6"
-msolve_jll = "0.6.5"
+msolve_jll = "0.600.501"

docs/Project.toml

@@ -8,4 +8,4 @@ Nemo = "2edaba10-b0f1-5616-af89-8c11ac63239a"
 
 [compat]
 Documenter = "0.26"
-msolve_jll = "0.6.1"
+msolve_jll = "0.600.501"

src/algorithms/groebner-bases.jl

@@ -147,7 +147,8 @@ function _core_groebner_basis(
         error("At the moment we only supports finite fields.")
     end
 
-    lens, cfs, exps = _convert_to_msolve(F)
+    # nr_gens might change if F contains zero polynomials
+    lens, cfs, exps, nr_gens = _convert_to_msolve(F)
 
     gb_ld  = Ref(Cint(0))
     gb_len = Ref(Ptr{Cint}(0))

src/interfaces/nemo.jl

@@ -21,6 +21,8 @@ function _convert_to_msolve(
     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
+
+    lens = Int32[]
     # get coefficients
     if field_char == 0
         cfs = BigInt[]
@@ -29,15 +31,21 @@ function _convert_to_msolve(
     end
     if field_char == 0
         for i in 1:nr_gens
-            for cf in coefficients(F[i])
-                push!(cfs, BigInt(numerator(cf)))
-                push!(cfs, BigInt(denominator(cf)))
+            if F[i] != R(0)
+                for cf in coefficients(F[i])
+                    push!(cfs, BigInt(numerator(cf)))
+                    push!(cfs, BigInt(denominator(cf)))
+                end
+                push!(lens, length(F[i]))
             end
         end
     else
         for i in 1:nr_gens
-            for cf in coefficients(F[i])
-                push!(cfs, Int32(lift(Nemo.ZZ, cf)))
+            if F[i] != R(0)
+                for cf in coefficients(F[i])
+                    push!(cfs, Int32(lift(Nemo.ZZ, cf)))
+                end
+                push!(lens, length(F[i]))
             end
         end
     end
@@ -50,7 +58,7 @@ function _convert_to_msolve(
         end
     end
 
-    return lens, cfs, exps
+    return lens, cfs, exps, length(lens)
 end
 
 @doc Markdown.doc"""

test/interfaces/nemo.jl

@@ -1,8 +1,13 @@
 @testset "Interfaces -> Nemo" begin
     R, (x,y,z) = polynomial_ring(QQ,["x","y","z"], internal_ordering=:degrevlex)
     F = [x^2+1-3, x*y-z, x*z^2-3*y^2]
-    cmp = (Int32[2, 2, 2], BigInt[1, 1, -2, 1, 1, 1, -1, 1, 1, 1, -3, 1], Int32[2, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 2, 0, 2, 0])
+    cmp = (Int32[2, 2, 2], BigInt[1, 1, -2, 1, 1, 1, -1, 1, 1, 1, -3, 1], Int32[2, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 2, 0, 2, 0], 3)
     @test AlgebraicSolving._convert_to_msolve(F) == cmp
+    # issue #54
+    R, (x1, x2) = polynomial_ring(GF(17), ["x1", "x2"])
+    I = Ideal([x1, R(0)])
+    cmp = (Int32[1], BigInt[1], Int32[1, 0], 1) 
+    @test AlgebraicSolving._convert_to_msolve(I.gens) == cmp
     for _GF in [GF, AlgebraicSolving.Nemo.Native.GF]
       R, (x,y,z) = polynomial_ring(_GF(2147483659),["x","y","z"], internal_ordering=:degrevlex)
       F = [x^2+1-3, x*y-z, x*z^2-3*y^2]
@@ -11,6 +16,6 @@
       R, (x,y,z) = polynomial_ring(_GF(101),["x","y","z"], internal_ordering=:degrevlex)
       F = [x^2+1-3, x*y-z, x*z^2-3*y^2]
       res = AlgebraicSolving._convert_to_msolve(F)
-      @test AlgebraicSolving._convert_finite_field_array_to_abstract_algebra(Int32(3), res..., R) == F
+      @test AlgebraicSolving._convert_finite_field_array_to_abstract_algebra(Int32(3), res[1], res[2], res[3], R) == F
     end
 end