Changeset 78eaa8 in git for factory/cf_gcd.cc

Timestamp:

Jul 24, 2019, 1:39:31 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

20e7303a3d50b30117c53a232ad724297637ac0e

Parents:

fa1cd304b94fb2782b47874564b731a57670c34ccbb89a79113ccf8c4cf31dd700cba8927fe3623a

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-07-24 13:39:31+02:00

git-committer:

GitHub <noreply@github.com>2019-07-24 13:39:31+02:00

Message:

Merge pull request #943 from steenpass/execute

remove more occurrences of execute() (3)

File:

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

factory/cf_gcd.cc

@@ -26 +26 @@
 #include "cfSubResGcd.h"
 #include "cfModGcd.h"
+#include "FLINTconvert.h"
 #include "facAlgFuncUtil.h"
 
@@ -100 +101 @@
   if ( getCharacteristic() != 0 )
   {
+    #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503)
+    if ( isOn( SW_USE_FL_GCD_P)
+    && (CFFactory::gettype() != GaloisFieldDomain)
+    && (getCharacteristic()>500)
+    &&(!hasAlgVar(fc)) && (!hasAlgVar(gc)))
+    {
+      return gcdFlintMP_Zp(fc,gc);
+    }
+    #endif
     #ifdef HAVE_NTL
     if ((!fc_and_gc_Univariate) && (isOn( SW_USE_EZGCD_P )))
@@ -119 +129 @@
     fc = subResGCD_p( fc, gc );
   }
-  else if (!fc_and_gc_Univariate)
+  else if (!fc_and_gc_Univariate) /* && char==0*/
   {
+    #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503)
+    if (( isOn( SW_USE_FL_GCD_0) )
+    &&(!hasAlgVar(fc)) && (!hasAlgVar(gc)))
+    {
+      return gcdFlintMP_QQ(fc,gc);
+    }
+    else
+    #endif
     if ( isOn( SW_USE_EZGCD ) )
       fc= ezgcd (fc, gc);
-#ifdef HAVE_NTL
+    #ifdef HAVE_NTL
     else if (isOn(SW_USE_CHINREM_GCD))
       fc = modGCDZ( fc, gc);
-#endif
+    #endif
     else
     {