Changeset f542551 in git

Timestamp:

Jul 1, 2020, 10:31:55 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

c1f4d51f741e0a6c42d18ed86f6d5f207f816516

Parents:

e64ec88de66303fe1a011fc6de0230f0d45acc5a

Message:

factory: more routine does not depend on NTL only

File:

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

factory/facHensel.cc

@@ -41 +41 @@
 #include "FLINTconvert.h"
 #endif
+
+void out_cf(const char *s1,const CanonicalForm &f,const char *s2);
 
 TIMING_DEFINE_PRINT (diotime)
@@ -469 +471 @@
 }
 
-#ifdef HAVE_NTL
 CFList
 diophantine (const CanonicalForm& F, const CFList& factors);
-#endif
-
-#ifdef HAVE_NTL // diophantine
+
 CFList
 diophantineHensel (const CanonicalForm & F, const CFList& factors,
@@ -564 +563 @@
   return result;
 }
-#endif
 
 /// solve \f$ 1=\sum_{i=1}^n{\delta_{i} \prod_{j\neq i}{f_j}} \f$ mod \f$p^k\f$
@@ -880 +878 @@
       buf1= divNTL (F, i.getItem(), b);
     XGCD (NTLbuf3, NTLS, NTLT, NTLbuf3, convertFacCF2NTLZZ_pEX (buf1, NTLmipo));
+    S= convertNTLZZ_pEX2CF (NTLS, x, gamma);
     CFListIterator k= bufFactors;
-    S= convertNTLZZ_pEX2CF (NTLS, x, gamma);
     for (CFListIterator j= result; j.hasItem(); j++, k++)
     {
@@ -2117 +2115 @@
 #endif
 
-#ifdef HAVE_NTL
 /// solve \f$ E=\sum_{i= 1}^r{\sigma_{i}\prod_{j=1, j\neq i}^{r}{f_{j}}} \f$
 /// mod M, @a products contains \f$ \prod_{j=1, j\neq i}^{r}{f_{j}} \f$
@@ -2197 +2194 @@
   return result;
 }
-#endif
 
 #ifdef HAVE_NTL // diophantine