Changeset 4ec288 in git for factory/cf_gcd.cc

Timestamp:

Apr 11, 2012, 3:11:20 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

98adcdd62df51a4c6090574f59ad2b9a5d432d39

Parents:

4bafa67969ab030397c6410e512aadf5574be0dc0a7d0ca68a61f160eb5b83774592a019ed99f025

Message:

Merge pull request #94 from mmklee/swSingularFlint

first support of flint in singular:SW

TODO: improve the configure tests 
TODO: should flint be prefered over NTL by default?
TODO: suppress linking to different versions of libgmp.so in the same time due to flint

File:

• factory/cf_gcd.cc (modified) (5 diffs)

factory/cf_gcd.cc

@@ -29 +29 @@
 static CanonicalForm gcd_univar_ntl0( const CanonicalForm &, const CanonicalForm & );
 static CanonicalForm gcd_univar_ntlp( const CanonicalForm &, const CanonicalForm & );
+#endif
+
+#ifdef HAVE_FLINT
+#include "FLINTconvert.h"
+static CanonicalForm gcd_univar_flint0 (const CanonicalForm &, const CanonicalForm &);
+static CanonicalForm gcd_univar_flintp (const CanonicalForm &, const CanonicalForm &);
 #endif
 
@@ -290 +296 @@
 extgcd ( const CanonicalForm & f, const CanonicalForm & g, CanonicalForm & a, CanonicalForm & b )
 {
+  if (f.isZero())
+  {
+    a= 0;
+    b= 1;
+    return g;
+  }
+  else if (g.isZero())
+  {
+    a= 1;
+    b= 0;
+    return f;
+  }
 #ifdef HAVE_NTL
   if (isOn(SW_USE_NTL_GCD_P) && ( getCharacteristic() > 0 ) && (CFFactory::gettype() != GaloisFieldDomain)
@@ -545 +563 @@
     {
         bpure = isPurePoly(pi) && isPurePoly(pi1);
+#ifdef HAVE_FLINT
+        if (bpure && (CFFactory::gettype() != GaloisFieldDomain))
+          return gcd_univar_flintp(pi,pi1)*C;
+#else
 #ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_P) && bpure && (CFFactory::gettype() != GaloisFieldDomain))
             return gcd_univar_ntlp(pi, pi1 ) * C;
+#endif
 #endif
     }
@@ -618 +641 @@
     if ( pi.isUnivariate() && pi1.isUnivariate() )
     {
+/*#ifdef HAVE_FLINT
+        if (isPurePoly(pi) && isPurePoly(pi1) )
+            return gcd_univar_flint0(pi, pi1 ) * C;
+#else*/
 #ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_0) && isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_ntl0(pi, pi1 ) * C;
 #endif
+//#endif
         return gcd_poly_univar0( pi, pi1, true ) * C;
     }
@@ -1044 +1072 @@
 #endif
 
+#ifdef HAVE_FLINT
+static CanonicalForm
+gcd_univar_flintp (const CanonicalForm& F, const CanonicalForm& G)
+{
+  nmod_poly_t F1, G1;
+  convertFacCF2nmod_poly_t (F1, F);
+  convertFacCF2nmod_poly_t (G1, G);
+  nmod_poly_gcd (F1, F1, G1);
+  CanonicalForm result= convertnmod_poly_t2FacCF (F1, F.mvar());
+  nmod_poly_clear (F1);
+  nmod_poly_clear (G1);
+  return result;
+}
+
+static CanonicalForm
+gcd_univar_flint0( const CanonicalForm & F, const CanonicalForm & G )
+{
+  fmpz_poly_t F1, G1;
+  convertFacCF2Fmpz_poly_t(F1, F);
+  convertFacCF2Fmpz_poly_t(G1, G);
+  fmpz_poly_gcd (F1, F1, G1);
+  CanonicalForm result= convertFmpz_poly_t2FacCF (F1, F.mvar());
+  fmpz_poly_clear (F1);
+  fmpz_poly_clear (G1);
+  return result;
+}
+#endif
+
+
 /*
 *  compute positions p1 and pe of optimal variables: