Changeset dc89d7 in git

Timestamp:

Mar 27, 2019, 1:36:45 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

3f34dc89054e843e5e05cc00a73dba2270ad5886

Parents:

a0351f4ddb55f888234786beb265c2d73504e810

Message:

fix: FLINT >2.5.2

Location:

libpolys/polys

Files:

• flintconv.cc (modified) (4 diffs)
• flintconv.h (modified) (1 diff)

libpolys/polys/flintconv.cc

@@ -55 +55 @@
 number convFlintNSingN (fmpq_t f, const coeffs cf)
 {
+#if __FLINT_RELEASE > 20502
   number z;
   if (nCoeff_is_Q(cf))
@@ -77 +78 @@
     n_Delete(&na,cf);
     n_Delete(&nb,cf);
+    mpz_clear(a);
+    mpz_clear(b);
   }
   n_Normalize(z,cf);
   return z;
+#else
+  WerrorS("not implemented");
+  return NULL;
+#endif
 }
 
@@ -128 +135 @@
 }
 
+void convSingNFlintNN(fmpq_t re, fmpq_t im, number n, const coeffs cf)
+{
+  number n_2=n_RePart(n,cf);
+  convSingNFlintN(re,n_2,cf);
+  n_Delete(&n_2,cf);
+  n_2=n_ImPart(n,cf);
+  convSingNFlintN(im,n_2,cf);
+  n_Delete(&n_2,cf);
+}
+
 void convSingPFlintP(fmpq_poly_t res, poly p, const ring r)
 {
@@ -140 +157 @@
     fmpq_poly_set_coeff_fmpq(res,p_GetExp(p,1,r),c);
     fmpq_clear(c);
+    pIter(p);
+  }
+}
+
+void convSingImPFlintP(fmpq_poly_t res, poly p, const ring r)
+{
+  int d=p_GetExp(p,1,r);
+  fmpq_poly_init2(res,d+1);
+  _fmpq_poly_set_length (res, d + 1);
+  while(p!=NULL)
+  {
+    number n=n_ImPart(pGetCoeff(p),r->cf);
+    fmpq_t c;
+    convSingNFlintN(c,n,r->cf);
+    fmpq_poly_set_coeff_fmpq(res,p_GetExp(p,1,r),c);
+    fmpq_clear(c);
+    n_Delete(&n,r->cf);
     pIter(p);
   }

libpolys/polys/flintconv.h

@@ -44 +44 @@
 void convSingNFlintN(fmpz_t f, number n);
 void convSingNFlintN(fmpq_t f, number n, const coeffs cf);
+void convSingNFlintNN(fmpq_t re, fmpq_t im, number n, const coeffs cf);
 number convFlintNSingN (fmpz_t f);
 number convFlintNSingN (fmpq_t f, const coeffs cf);
 void convSingPFlintP(fmpq_poly_t res, poly p, const ring r);
+void convSingImPFlintP(fmpq_poly_t res, poly p, const ring r);
 poly convFlintPSingP(fmpq_poly_t f, const ring r);