Changeset 0aeeee in git for factory/cfModGcd.cc

Timestamp:

Oct 14, 2020, 11:25:44 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b9f50b373314e74e83c7c060a651dd2913e1f033')

Children:

5d10210628a056489efca136691a4ed49a4b26d2

Parents:

b7566c040bb4dee9a542a5848fa7e26d4c5b2d76

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-10-14 23:25:44+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-10-14 23:26:45+02:00

Message:

use: chineseRemainderCached

File:

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

factory/cfModGcd.cc

@@ -476 +476 @@
 /// based on Alg. 7.2. as described in "Algorithms for
 /// Computer Algebra" by Geddes, Czapor, Labahn
-#ifdef HAVE_NTL // mapPrimElem
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 CanonicalForm
 modGCDFq (const CanonicalForm& F, const CanonicalForm& G,
@@ -1203 +1203 @@
 }
 
-#ifdef HAVE_NTL
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 CanonicalForm
 modGCDFp (const CanonicalForm& F, const CanonicalForm&  G,
@@ -1210 +1210 @@
 #endif
 
-#ifdef HAVE_NTL
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 CanonicalForm
 modGCDFp (const CanonicalForm& F, const CanonicalForm& G,
@@ -1221 +1221 @@
 #endif
 
-#ifdef HAVE_NTL // mapPrimElem
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
 CanonicalForm
 modGCDFp (const CanonicalForm& F, const CanonicalForm&  G,
@@ -4146 +4146 @@
     gp= mapinto (g);
     TIMING_START (modZ_recursion)
-#ifdef HAVE_NTL
+#if defined(HAVE_NTL) || defined(HAVE_FLINT)
     if (size (fp)/maxNumVars > 500 && size (gp)/maxNumVars > 500)
       Dp = modGCDFp (fp, gp, cofp, cogp);
@@ -4190 +4190 @@
       if ( dp_deg == d_deg )
       {
-        chineseRemainder( D, q, mapinto( Dp ), p, newD, newq );
-        chineseRemainder( cof, q, mapinto (cofp), p, newCof, newq);
-        chineseRemainder( cog, q, mapinto (cogp), p, newCog, newq);
+        CFArray inv(2);
+        chineseRemainderCached( D, q, mapinto( Dp ), p, newD, newq, inv );
+        chineseRemainderCached( cof, q, mapinto (cofp), p, newCof, newq, inv);
+        chineseRemainderCached( cog, q, mapinto (cogp), p, newCog, newq, inv);
         cof= newCof;
         cog= newCog;