feat: adjust to upcoming Nemo finite field changes

JohnAAbbott · Jan 4, 2024 · 7a9ea0c · 7a9ea0c
1 parent 3792dc1
commit 7a9ea0c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/number/n_transExt.jl b/src/number/n_transExt.jl
@@ -358,6 +358,13 @@ function (F::Singular.N_FField)(x::fpFieldElem)
    return n_transExt(F, x.data)
 end
 
+function (F::Singular.N_FField)(x::FqFieldElem)
+   if characteristic(F) != characteristic(parent(x))
+      throw(ArgumentError("wrong characteristic"))
+   end
+   return n_transExt(F, lift(Nemo.ZZ, x))
+end
+
 function (F::Singular.N_FField)(x::Union{n_Q, Nemo.QQFieldElem, Rational})
    return F(numerator(x)) // F(denominator(x))
 end

diff --git a/test/libsingular/nemo-test.jl b/test/libsingular/nemo-test.jl
@@ -102,11 +102,11 @@ end
 end
 
 @testset "Nemo.fqPolyRepFieldElem" begin
-   F, _ = Nemo.finite_field(Nemo.next_prime(fld(typemax(Int),2)), 2, "a")
+   F, _ = Nemo.Native.finite_field(Nemo.next_prime(fld(typemax(Int),2)), 2, "a")
    R, _ = polynomial_ring(F, ["x", "y"])
    @test R isa Singular.PolyRing{Singular.n_FieldElem{Nemo.fqPolyRepFieldElem}}
 
-   F, a = Nemo.finite_field(7, 2, "a")
+   F, a = Nemo.Native.finite_field(7, 2, "a")
 
    R, (x, y) = polynomial_ring(F, ["x", "y"])
 
@@ -162,11 +162,11 @@ end
 end
 
 @testset "Nemo.FqPolyRepFieldElem" begin
-   F, _ = Nemo.finite_field(Nemo.next_prime(Nemo.ZZ(10)^50), 2, "a")
+   F, _ = Nemo.Native.finite_field(Nemo.next_prime(Nemo.ZZ(10)^50), 2, "a")
    R, _ = polynomial_ring(F, ["x", "y"])
    @test R isa Singular.PolyRing{Singular.n_FieldElem{Nemo.FqPolyRepFieldElem}}
 
-   F, a = Nemo.finite_field(Nemo.ZZ(7), 2, "a")
+   F, a = Nemo.Native.finite_field(Nemo.ZZ(7), 2, "a")
 
    R, (x, y) = polynomial_ring(F, ["x", "y"])
 
@@ -276,7 +276,7 @@ end
 
 @testset "Nemo.gfp_fmpz_mod.polynomial_ring" begin
 
-   U = Nemo.GF(Nemo.ZZRingElem(11))
+   U = Nemo.Native.GF(Nemo.ZZRingElem(11))
 
    R, (x, y) = polynomial_ring(U, ["x", "y"])
 
@@ -318,7 +318,7 @@ end
 
 @testset "Nemo.gfp_fmpz_mod.WeylAlgebra" begin
 
-   U = Nemo.GF(Nemo.ZZRingElem(11))
+   U = Nemo.Native.GF(Nemo.ZZRingElem(11))
 
    R, (x, y, dx, dy) = @inferred WeylAlgebra(U, ["x", "y"])
 
@@ -375,20 +375,20 @@ end
     @test F(one(R)*i) == one(F)*i
   end
 
-  S = Nemo.GF(5)
+  S = Nemo.Native.GF(5)
   @test_throws ErrorException S(one(F))
   @test_throws ErrorException F(one(S))
 end
 
 @testset "Nemo.fpFieldElem" begin
-  R = Nemo.GF(7)
+  R = Nemo.Native.GF(7)
   F = Fp(7)
   for i in -10:10
     @test R(one(F)*i) == one(R)*i
     @test F(one(R)*i) == one(F)*i
   end
 
-  S = Nemo.GF(5)
+  S = Nemo.Native.GF(5)
   @test_throws ErrorException S(one(F))
   @test_throws ErrorException F(one(S))
 end

diff --git a/test/number/n_transExt-test.jl b/test/number/n_transExt-test.jl
@@ -75,8 +75,8 @@ end
    @test F(1//2) == big(1//2)
    @test F(1//2) == QQ(1//2)
    @test F(1//2) == Nemo.QQ(1//2)
-   @test F(Nemo.GF(5)(3)) == 1//2
-   @test_throws Exception F(Nemo.GF(7)(3))
+   @test F(Nemo.Native.GF(5)(3)) == 1//2
+   @test_throws Exception F(Nemo.Native.GF(7)(3))
 end
 
 @testset "n_transExt.unary_ops" begin