Merge pull request #39 from oscarbenjamin/pr_coverage

Add tests for modules wrapping flint

Author: oscarbenjamin

.gitignore

@@ -1,6 +1,7 @@
 build/*
 dist/*
 src/flint/*.c
+src/flint/*.html
 doc/build/*
 fmake*
 *.whl
@@ -13,3 +14,4 @@ MANIFEST
 .local
 *.egg-info
 .coverage
+*.swp

bin/activate

@@ -2,3 +2,4 @@ export C_INCLUDE_PATH=$(pwd)/.local/include
 export LIBRARY_PATH=$(pwd)/.local/lib
 export LD_LIBRARY_PATH=$(pwd)/.local/lib
 export PYTHONPATH=$(pwd)/src
+source .local/venv/bin/activate

bin/coverage.sh

@@ -33,8 +33,8 @@ export PYTHON_FLINT_COVERAGE=true
 
 python setup.py build_ext --inplace
 
-coverage run test/test.py
+pytest --cov flint test/test.py
 coverage run --append test/dtest.py
 
-coverage report -m
+#coverage report -m
 coverage html

setup.py

@@ -71,6 +71,7 @@
     name='python-flint',
     cmdclass={'build_ext': build_ext},
     ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives),
+    #ext_modules=cythonize(ext_modules, compiler_directives=compiler_directives, annotate=True),
     packages=['flint'],
     package_dir={'': 'src'},
     description='Bindings for FLINT and Arb',

src/flint/fmpq_series.pyx

@@ -41,7 +41,7 @@ cdef class fmpq_series(flint_series):
         if val is not None:
             if typecheck(val, fmpq_series):
                 fmpq_poly_set(self.val, (<fmpq_series>val).val)
-                self.prec = min((<fmpz_series>val).prec, getcap())
+                self.prec = min((<fmpq_series>val).prec, getcap())
             elif typecheck(val, fmpz_series):
                 fmpq_poly_set_fmpz_poly(self.val, (<fmpz_series>val).val)
                 self.prec = min((<fmpz_series>val).prec, getcap())
@@ -62,6 +62,15 @@ cdef class fmpq_series(flint_series):
                 raise ZeroDivisionError("cannot create fmpq_series with zero denominator")
             fmpq_poly_scalar_div_fmpz(self.val, self.val, (<fmpz>den).val)
 
+    def _equal_repr(s, t):
+        cdef bint r
+        if not typecheck(t, fmpq_series):
+            return False
+        r = fmpq_poly_equal((<fmpq_series>s).val, (<fmpq_series>t).val)
+        if r:
+            r = (<fmpq_series>s).prec == (<fmpq_series>t).prec
+        return r
+
     def __len__(self):
         return fmpq_poly_length(self.val)
 
@@ -197,7 +206,7 @@ cdef class fmpq_series(flint_series):
             u = fmpq_series.__new__(fmpq_series)
 
             if fmpq_poly_is_zero((<fmpq_series>s).val):
-                u.cap = cap
+                (<fmpq_series>u).prec = cap
                 return u
 
             sval = (<fmpq_series>s).valuation()
@@ -236,6 +245,7 @@ cdef class fmpq_series(flint_series):
         return fmpq_series._div_(s, t)
 
     # generic exponentiation (fallback code)
+    # XXX: use fmpq_poly_pow_trunc instead?
     def __pow__(s, ulong exp, mod):
         if mod is not None:
             raise NotImplementedError("modular exponentiation")
@@ -308,7 +318,7 @@ cdef class fmpq_series(flint_series):
     cdef bint one_constant_term(s):
         if fmpq_poly_is_zero((<fmpq_series>s).val):
             return False
-        if fmpz_is_one(&((<fmpq_series>s).val.coeffs[0])):
+        if fmpz_equal(&((<fmpq_series>s).val.coeffs[0]), (<fmpq_series>s).val.den):
             return True
         return False
 

src/flint/fmpz_series.pyx

@@ -68,6 +68,15 @@ cdef class fmpz_series(flint_series):
                 fmpz_poly_set_list(self.val, [val])
         fmpz_poly_truncate(self.val, max(0, self.prec))
 
+    def _equal_repr(self, other):
+        cdef bint r
+        if not typecheck(other, fmpz_series):
+            return False
+        r = fmpz_poly_equal((<fmpz_series>self).val, (<fmpz_series>other).val)
+        if r:
+            r = (<fmpz_series>self).prec == (<fmpz_series>other).prec
+        return r
+
     def __len__(self):
         return fmpz_poly_length(self.val)