Ticket #12142: trac_12142-singular_conversion.patch

sage/libs/singular/singular.pxd

@@ -22 +22 @@
 
 cdef FFgivE   si2sa_GFqGivaro(number *n, ring *_ring, Cache_givaro cache)
 cdef FFgf2eE  si2sa_GFqNTLGF2E(number *n, ring *_ring, Cache_ntl_gf2e cache)
-cdef object   si2sa_GFqPari(number *n, ring *_ring, object base)
+cdef object   si2sa_GFq_generic(number *n, ring *_ring, object base)
 cdef object   si2sa_ZZmod(number *n, ring *_ring, object base)
 
 cdef object   si2sa_NF(number *n, ring *_ring, object base)
@@ -40 +40 @@
 cdef number *sa2si_ZZ(Integer d, ring *_ring)
 
 cdef number *sa2si_GFqGivaro(int exp ,ring (*))
-cdef number *sa2si_GFqPari(object vector, ring *_ring)
 cdef number *sa2si_GFqNTLGF2E(FFgf2eE elem, ring *_ring)
+cdef number *sa2si_GFq_generic(object vector, ring *_ring)
 cdef inline number *sa2si_ZZmod(IntegerMod_abstract d, ring *_ring)
 
 cdef number *sa2si_NF(object element, ring *_ring)

sage/libs/singular/singular.pyx

@@ -43 +43 @@
 from sage.rings.rational_field import RationalField
 from sage.rings.integer_ring cimport IntegerRing_class
 from sage.rings.finite_rings.integer_mod_ring import IntegerModRing_generic
+from sage.rings.finite_rings.finite_field_base import FiniteField
 from sage.rings.finite_rings.finite_field_prime_modn import FiniteField_prime_modn
-from sage.rings.finite_rings.finite_field_ext_pari import FiniteField_ext_pari
 from sage.rings.finite_rings.finite_field_givaro import FiniteField_givaro
 from sage.rings.finite_rings.finite_field_ntl_gf2e import FiniteField_ntl_gf2e
 from sage.libs.pari.all import pari
@@ -202 +202 @@
         z = <napoly*>pNext(<poly*>z)
     return ret
 
-cdef object si2sa_GFqPari(number *n, ring *_ring, object base):
+cdef object si2sa_GFq_generic(number *n, ring *_ring, object base):
     """
     TESTS::
     
@@ -220 +220 @@
     cdef object ret
 
     if naIsZero(n):
-        return base._zero_element
+        return base.zero_element()
     elif naIsOne(n):
-        return base._one_element
+        return base.one_element()
     z = (<lnumber*>n).z
 
-    a = pari("a")
-    ret = pari(int(0)).Mod(int(_ring.ch))
+    a = base.gen()
+    ret = base.zero_element()
 
     while z:
         c = <long>napGetCoeff(z)
@@ -236 +236 @@
         elif c != 0:
             ret = ret  + c * a**e
         z = <napoly*>pNext(<poly*>z)
-    return base(ret)
+    return ret
 
 cdef object si2sa_NF(number *n, ring *_ring, object base):
     """
@@ -408 +408 @@
 
     return n1
 
-cdef number *sa2si_GFqPari(object elem, ring *_ring):
+cdef number *sa2si_GFq_generic(object elem, ring *_ring):
     """
     """
     cdef int i
     cdef number *n1, *n2, *a, *coeff, *apow1, *apow2
-    elem = elem._pari_().lift().lift()
+    elem = elem.polynomial()
 
     if _ring != currRing: rChangeCurrRing(_ring)
-    if len(elem) > 1:
+    if elem.degree() > 0:
         n1 = naInit(0, _ring)
         a = naPar(1)
         apow1 = naInit(1, _ring)
 
-        for i from 0 <= i < len(elem):
+        for i from 0 <= i <= elem.degree():
             coeff = naInit(int(elem[i]), _ring)
 
             if not naIsZero(coeff):
@@ -556 +556 @@
     elif PY_TYPE_CHECK(base, FiniteField_givaro):
         return si2sa_GFqGivaro(n, _ring, base._cache)
 
-    elif PY_TYPE_CHECK(base, FiniteField_ext_pari):
-        return si2sa_GFqPari(n, _ring, base)
-
     elif PY_TYPE_CHECK(base, FiniteField_ntl_gf2e):
         return si2sa_GFqNTLGF2E(n, _ring, <Cache_ntl_gf2e>base._cache)
 
+    elif PY_TYPE_CHECK(base, FiniteField):
+        return si2sa_GFq_generic(n, _ring, base)
+
     elif PY_TYPE_CHECK(base, NumberField) and base.is_absolute():
         return si2sa_NF(n, _ring, base)
 
@@ -587 +587 @@
     elif isinstance(elem._parent, FiniteField_givaro):
         return sa2si_GFqGivaro( (<FFgivE>elem)._cache.objectptr.convert(i, (<FFgivE>elem).element ), _ring )
 
-    elif PY_TYPE_CHECK(elem._parent, FiniteField_ext_pari):
-        return sa2si_GFqPari(elem, _ring)
-
     elif PY_TYPE_CHECK(elem._parent, FiniteField_ntl_gf2e):
         return sa2si_GFqNTLGF2E(elem, _ring)
 
+    elif PY_TYPE_CHECK(elem._parent, FiniteField):
+        return sa2si_GFq_generic(elem, _ring)
+
     elif PY_TYPE_CHECK(elem._parent, NumberField) and elem._parent.is_absolute():
         return sa2si_NF(elem, _ring)
     elif PY_TYPE_CHECK(elem._parent, IntegerModRing_generic):