Changeset a4240a2 in git for factory

Timestamp:

Jan 25, 2021, 3:38:46 PM (3 years ago)

Author:

Daniel Schultz <tthsqe12@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dbb5d4a0121426033fedeabdf73eef215fa552a3

Parents:

2878a046d5555175d71be156a25862c2ab64dc1f

git-author:

Daniel Schultz <tthsqe12@gmail.com>2021-01-25 15:38:46+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-01-26 11:36:58+01:00

Message:

unlock more functions

Location:

factory

Files:

• facFqFactorize.cc (modified) (1 diff)
• facHensel.cc (modified) (10 diffs)

factory/facFqFactorize.cc

@@ -1474 +1474 @@
 }
 
-#ifdef HAVE_NTL // nonMonicHenselLift12
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // nonMonicHenselLift12
 CFList
 precomputeLeadingCoeff (const CanonicalForm& LCF, const CFList& LCFFactors,

factory/facHensel.cc

@@ -1359 +1359 @@
 }
 
-#ifdef HAVE_NTL // diophantine
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // diophantine
 CFList
 biDiophantine (const CanonicalForm& F, const CFList& factors, int d)
@@ -1775 +1775 @@
 }
 
-#ifdef HAVE_NTL // biDiophantine
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // biDiophantine
 CFList
 henselLift23 (const CFList& eval, const CFList& factors, int* l, CFList&
@@ -1884 +1884 @@
 }
 
-#ifdef HAVE_NTL // henselLift23
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // henselLift23
 CFList
 henselLift (const CFList& eval, const CFList& factors, int* l, int lLength,
@@ -2144 +2144 @@
 }
 
-#ifdef HAVE_NTL // diophantine
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // diophantine
 void
 nonMonicHenselLift12 (const CanonicalForm& F, CFList& factors, int l,
@@ -2303 +2303 @@
 }
 
-#ifdef HAVE_NTL // diophantine
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // diophantine
 void
 nonMonicHenselStep (const CanonicalForm& F, const CFList& factors,
@@ -2558 +2558 @@
 }
 
-#ifdef HAVE_NTL // nonMonicHenselStep
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // nonMonicHenselStep
 CFList
 nonMonicHenselLift232(const CFList& eval, const CFList& factors, int* l, CFList&
@@ -2622 +2622 @@
 #endif
 
-#ifdef HAVE_NTL // nonMonicHenselStep
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // nonMonicHenselStep
 CFList
 nonMonicHenselLift2 (const CFList& F, const CFList& factors, const CFList& MOD,
@@ -2687 +2687 @@
 #endif
 
-#ifdef HAVE_NTL // nonMonicHenselStep
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // nonMonicHenselStep
 CFList
 nonMonicHenselLift2 (const CFList& eval, const CFList& factors, int* l, int
@@ -2741 +2741 @@
 #endif
 
-#ifdef HAVE_NTL // diophantine
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // diophantine
 CFList
 nonMonicHenselLift23 (const CanonicalForm& F, const CFList& factors, const
@@ -2845 +2845 @@
 #endif
 
-#ifdef HAVE_NTL // nonMonicHenselStep
+#if defined(HAVE_NTL) || defined(HAVE_FLINT) // nonMonicHenselStep
 CFList
 nonMonicHenselLift (const CFList& F, const CFList& factors, const CFList& LCs,