Integer conversion between python ints and PPLite::FLINT_Integer now accepts arbitary python integers.

Author: ComboProblem

pplite/constraint.pyx

@@ -2,7 +2,7 @@
 # distutils: libraries = gmp gmpxx pplite m flint
 
 
-from gmpy2 cimport GMPy_MPZ_From_mpz, import_gmpy2, mpz, mpz_t, GMPy_MPZ_From_mpz, MPZ_Check
+from gmpy2 cimport GMPy_MPZ_From_mpz, import_gmpy2, mpz, mpz_t, GMPy_MPZ_From_mpz, MPZ_Check, MPZ
 from cython.operator cimport dereference as deref
 from cpython.object cimport Py_LT, Py_LE, Py_EQ, Py_NE, Py_GT, Py_GE
 from .linear_algebra import Variable, Affine_Expression, Linear_Expression
@@ -616,16 +616,10 @@ cdef FLINT_Integer_to_Python(FLINT_Integer& integer):
 
 
 cdef FLINT_Integer Python_int_to_FLINT_Integer(integer):
-    cdef fmpz_t x
-    cdef fmpz y
-    if isinstance(integer, (int, str)):
-        fmpz_init(x)
-        fmpz_set_si(x, integer)
-        return FLINT_Integer(x)
-    if MPZ_Check(integer): # is this okay?
-        y = <fmpz> integer
-        return FLINT_Integer(y)
-    raise ValueError("Integer Conversion Failed")
+    cdef mpz x = mpz(integer)
+    cdef mpz_t w = MPZ(x)
+    cdef fmpz y = PTR_TO_COEFF(w)
+    return FLINT_Integer(y)
 
 
 def FLINT_Integer_Conversion_Check(possible_integer):
@@ -640,4 +634,4 @@ def FLINT_Integer_Conversion_Check(possible_integer):
         return True
     if MPZ_Check(possible_integer):
         return True
-    return False
+    return False

pplite/integer_conversions.pyx

@@ -3,7 +3,7 @@
 
 cimport cython
 
-from gmpy2 cimport import_gmpy2, mpz, mpz_t, GMPy_MPZ_From_mpz, MPZ_Check, mpq, MPQ_Check, GMPy_MPQ_From_mpz
+from gmpy2 cimport import_gmpy2, mpz, mpz_t, GMPy_MPZ_From_mpz, MPZ_Check, mpq, MPQ_Check, GMPy_MPQ_From_mpz, MPZ
 from libcpp.vector cimport vector as cppvector
 
 # It is assumed that the pplite environment is set up to use FLINT_integers.
@@ -12,11 +12,7 @@ from libcpp.vector cimport vector as cppvector
 import_gmpy2()
 
 cdef FLINT_Integer_to_Python(FLINT_Integer& integer):
-    """ Converts FLINT_Integer to python object.
-
-    INPUT: :class:`FLINT_Interger` (c++)
-
-    OUTPUT: Python object
+    """ Converts PPlite::FLINT_Integer to python int.
     """
     cdef mpz_t new_int
     mpz_init(new_int)
@@ -26,26 +22,12 @@ cdef FLINT_Integer_to_Python(FLINT_Integer& integer):
     return y
 
 cdef FLINT_Integer Python_int_to_FLINT_Integer(integer):
-    """ Converts a python object to a c++ FLINT_Integer
-
-    INPUT: 
-
-    - integer: string or int
+    r"""Converts python int to a PPLite::FLINT_Integer."""
+    cdef mpz x = mpz(integer)
+    cdef mpz_t w = MPZ(x)
+    cdef fmpz y = PTR_TO_COEFF(w)
+    return FLINT_Integer(y)
 
-    OUTPUT:
-
-    :class:`FLINT_Integer` (c++)
-    """
-    cdef fmpz_t x
-    cdef fmpz y
-    if isinstance(integer, (int, str)):
-        fmpz_init(x)
-        fmpz_set_si(x, integer)
-    return FLINT_Integer(x)
-    if MPZ_Check(integer): # is this okay?
-        y = <fmpz> integer
-        return FLINT_Integer(y)
-    raise ValueError("Integer Conversion Failed")
 
 cdef FLINT_Rational_to_Python(FLINT_Rational& rational):
     """Converts the Flint_Rational c++ class to a python object.
@@ -102,4 +84,4 @@ def FLINT_Integer_Conversion_Check(possible_integer):
         return True
     if MPZ_Check(possible_integer):
         return True
-    return False
+    return False

pplite/linear_algebra.pyx

@@ -3,13 +3,16 @@
 
 cimport cython
 
-from gmpy2 cimport import_gmpy2, mpz, mpz_t, GMPy_MPZ_From_mpz, MPZ_Check
+from flint import fmpz as py_fmpz
+#from flint.flintlib.functions.fmpz cimport fmpz_t
+#from flint cimport f
+from gmpy2 cimport import_gmpy2, mpz, mpz_t, GMPy_MPZ_From_mpz, GMPy_MPZ_New, MPZ_Check, MPZ
 from libcpp.vector cimport vector as cppvector
 from .constraint cimport _make_Constraint_from_richcmp
 # from .integer_conversions cimport FLINT_Integer_to_Python, Python_int_to_FLINT_Integer
 
 # TODO: Investigate why everything breaks when importing integer conversion as opposed to local definitions. 
-
+# TODO: Once C API is avilable from python-flint; use this to work with flint integers rather than going though gmpy2
 import_gmpy2()
 
 cdef FLINT_Integer_to_Python(FLINT_Integer& integer):
@@ -23,16 +26,10 @@ cdef FLINT_Integer_to_Python(FLINT_Integer& integer):
 
 cdef FLINT_Integer Python_int_to_FLINT_Integer(integer):
     r"""Converts python sting or int to a PPLite::FLINT_Integer."""
-    cdef fmpz_t x
-    cdef fmpz y
-    if isinstance(integer, (int, str)):
-        fmpz_init(x)
-        fmpz_set_si(x, integer)
-        return FLINT_Integer(x)
-    if MPZ_Check(integer): # This is a little hacky...
-        y = <fmpz> integer
-        return FLINT_Integer(y)
-    raise ValueError("Integer Conversion Failed")
+    cdef mpz x = mpz(integer)
+    cdef mpz_t w = MPZ(x)
+    cdef fmpz y = PTR_TO_COEFF(w)
+    return FLINT_Integer(y)
 
 ################
 ### Variable ###
@@ -1512,4 +1509,4 @@ cdef class Affine_Expression(object):
 
         >>> from pplite import Variable
         """
-        return _make_Constraint_from_richcmp(self, other, op)
+        return _make_Constraint_from_richcmp(self, other, op)

pplite/pplite_decl.pxd

@@ -32,10 +32,12 @@ ctypedef mp_limb_t ulong
 ctypedef mp_limb_signed_t slong
 
 cdef extern from "flint/fmpz.h":
-    ctypedef slong fmpz
+    ctypedef int fmpz
     ctypedef fmpz fmpz_t[1]
+    fmpz PTR_TO_COEFF(mpz_ptr ptr)
     void fmpz_get_mpz(mpz_t x, const fmpz_t f) noexcept
     void fmpz_init(fmpz_t f)
+    void fmpz_set(fmpz_t f, const fmpz_t g)
     void fmpz_set_ui(fmpz_t f, ulong g)
     void fmpz_set_si(fmpz_t f, slong g)
     void fmpz_clear(fmpz_t f)
@@ -740,4 +742,4 @@ cdef extern from "pplite/pplite.hh" namespace "pplite":
 
 # "pplite/mater_iterator.hh"
     # cdef struct[Sys, Impl] Mater_Sys:
-    #     pass
+    #     pass