Changeset fd2316c in git

Timestamp:

Sep 10, 2012, 2:46:27 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c8f95dcff8b4cb5bddaf189cc7eb14c5d52ebe26

Parents:

139f6f800b915490dfaa914ef7676d29a3236b92

git-author:

Martin Lee <martinlee84@web.de>2012-09-10 14:46:27+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-25 15:10:31+02:00

Message:

chg: use flint in computation of univariate gcd and extgcd over Z/Q

File:

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

factory/cf_gcd.cc

@@ -347 +347 @@
     #endif
   }
+#ifdef HAVE_FLINT
+  if (( getCharacteristic() ==0) && (f.level()==g.level())
+       && isPurePoly(f) && isPurePoly(g))
+  {
+    fmpq_poly_t F1, G1;
+    convertFacCF2Fmpq_poly_t (F1, f);
+    convertFacCF2Fmpq_poly_t (G1, g);
+    fmpq_poly_t R, A, B;
+    fmpq_poly_init (R);
+    fmpq_poly_init (A);
+    fmpq_poly_init (B);
+    fmpq_poly_xgcd (R, A, B, F1, G1);
+    a= convertFmpq_poly_t2FacCF (A, f.mvar());
+    b= convertFmpq_poly_t2FacCF (B, f.mvar());
+    CanonicalForm r= convertFmpq_poly_t2FacCF (R, f.mvar());
+    fmpq_poly_clear (F1);
+    fmpq_poly_clear (G1);
+    fmpq_poly_clear (A);
+    fmpq_poly_clear (B);
+    fmpq_poly_clear (R);
+    return r;
+  }
+#else
   if (isOn(SW_USE_NTL_GCD_0) && ( getCharacteristic() ==0)
   && (f.level()==g.level()) && isPurePoly(f) && isPurePoly(g))
@@ -383 +406 @@
     }
   }
+#endif
 #endif
   // may contain bug in the co-factors, see track 107
@@ -669 +693 @@
     if ( pi.isUnivariate() && pi1.isUnivariate() )
     {
-/*#ifdef HAVE_FLINT
+#ifdef HAVE_FLINT
         if (isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_flint0(pi, pi1 ) * C;
-#else*/
+#else
 #ifdef HAVE_NTL
         if ( isOn(SW_USE_NTL_GCD_0) && isPurePoly(pi) && isPurePoly(pi1) )
             return gcd_univar_ntl0(pi, pi1 ) * C;
 #endif
-//#endif
+#endif
         return gcd_poly_univar0( pi, pi1, true ) * C;
     }