Changeset 87942fd in git

Timestamp:

Jan 8, 2014, 12:15:09 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

6f126899ec2cba1463bff65859c057e63af5986d

Parents:

6163afd0618605c226ab4d88b9c081aa8a4d9b54

git-author:

Martin Lee <martinlee84@web.de>2014-01-08 12:15:09+01:00

git-committer:

Martin Lee <martinlee84@web.de>2014-01-20 16:45:04+01:00

Message:

chg: disable code if FLINT is around

File:

• factory/facFqBivar.cc (modified) (18 diffs)

factory/facFqBivar.cc

@@ -1425 +1425 @@
 }
 
+#ifndef HAVE_FLINT
 long isReduced (const mat_zz_p& M)
 {
@@ -1441 +1442 @@
   return 1;
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -1478 +1480 @@
 }
 
+#ifndef HAVE_FLINT
 int * extractZeroOneVecs (const mat_zz_p& M)
 {
@@ -1501 +1504 @@
   return result;
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -1634 +1638 @@
 }
 
+#ifndef HAVE_FLINT
 void
 reconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const CFList&
@@ -1715 +1720 @@
     F= bufF (y+eval,y);
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -1900 +1906 @@
 }
 
+#ifndef HAVE_FLINT
 CFList
 extReconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs, int
@@ -1978 +1985 @@
   return result;
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -2060 +2068 @@
 #endif
 
+#ifndef HAVE_FLINT
 CFList
 reconstruction (CanonicalForm& G, CFList& factors, int* zeroOneVecs,
@@ -2108 +2117 @@
   return result;
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -2160 +2170 @@
 #endif
 
+#ifndef HAVE_FLINT
 void
 extReconstructionTry (CFList& reconstructedFactors, CanonicalForm& F, const
@@ -2287 +2298 @@
   }
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -2418 +2430 @@
 #endif
 
+#ifndef HAVE_FLINT
 //over Fp
 int
@@ -2540 +2553 @@
   return l;
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -2678 +2692 @@
 #endif
 
+#ifndef HAVE_FLINT
 //over field extension
 int
@@ -2873 +2888 @@
   return l;
 }
+#endif
 
 #ifdef HAVE_FLINT
@@ -5976 +5992 @@
 }
 
+#ifndef HAVE_FLINT
 void
 refineAndRestartLift (const CanonicalForm& F, const mat_zz_p& NTLN, int
@@ -6005 +6022 @@
   henselLift12 (F, factors, l, Pi, diophant, M);
 }
+#endif
 
 #ifdef HAVE_FLINT