Changeset a8d220b in git

Timestamp:

Jul 3, 2020, 9:46:31 AM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b287470827373f8b355e6acb8f830baa5b3e88d1

Parents:

3801735313555d3e7900ceb38636374dc2183a76

Message:

factory: Farey via FLINT

File:

• factory/cf_chinese.cc (modified) (6 diffs)

factory/cf_chinese.cc

@@ -18 +18 @@
 #ifdef HAVE_NTL
 #include "NTLconvert.h"
+#endif
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
 #endif
 
@@ -159 +163 @@
 }
 
-#ifndef HAVE_NTL
+#if 0
 CanonicalForm Farey_n (CanonicalForm N, const CanonicalForm P)
 //"USAGE:  Farey_n (N,P); P, N number;
@@ -203 +207 @@
     CanonicalForm c;
     CFIterator i;
-#ifdef HAVE_NTL
+#ifdef HAVE_FLINT
+   fmpz_t FLINTq;
+   fmpz_init(FLINTq);
+   convertCF2Fmpz(FLINTq,q);
+   fmpz_t FLINTc;
+   fmpz_init(FLINTc);
+   fmpq_t FLINTres;
+   fmpq_init(FLINTres);
+#elif defined(HAVE_NTL)
     ZZ NTLq= convertFacCF2NTLZZ (q);
     ZZ bound;
@@ -213 +225 @@
         if ( c.inCoeffDomain())
         {
-#ifdef HAVE_NTL
+#ifdef HAVE_FLINT
+          if (c.inZ())
+          {
+             convertCF2Fmpz(FLINTc,c);
+             fmpq_reconstruct_fmpz(FLINTres,FLINTc,FLINTq);
+             result += power (x, i.exp())*(convertFmpq2CF(FLINTres));
+          }
+#elif defined(HAVE_NTL)
           if (c.inZ())
           {
@@ -232 +251 @@
             }
           }
+#endif
           else
             result += power( x, i.exp() ) * Farey(c,q);
-#else
-          if (c.inZ())
-            result += power( x, i.exp() ) * Farey_n(c,q);
-          else
-            result += power( x, i.exp() ) * Farey(c,q);
-#endif
         }
         else
@@ -245 +259 @@
     }
     if (is_rat) On(SW_RATIONAL);
+#ifdef HAVE_FLINT
+    fmpq_clear(FLINTres);
+    fmpz_clear(FLINTc);
+    fmpz_clear(FLINTq);
+#endif
     return result;
 }