Changeset 39ed94 in git for factory

Timestamp:

Jul 22, 2014, 6:10:15 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

9b12fce7c95d67f341f77b707e33138c8df5ba74

Parents:

cc16f03d558b50b0724f4d7bbac2f7df23d805921936fb556581f3c446e8ec8cb14b9081d4aa5d27

Message:

Merge pull request #621 from mmklee/nontl

fix: compilation without NTL

Location:

factory

Files:

• cfModResultant.cc (modified) (2 diffs)
• facAlgExt.cc (modified) (4 diffs)
• facAlgFunc.cc (modified) (1 diff)

factory/cfModResultant.cc

@@ -38 +38 @@
 #endif
 
+#ifdef HAVE_NTL
 TIMING_DEFINE_PRINT(fac_resultant_p)
 
@@ -680 +681 @@
   return swapvar (result, X, x);
 }
-
+#endif
+

factory/facAlgExt.cc

@@ -61 +61 @@
   CanonicalForm norm;
   TIMING_START (fac_alg_resultant);
+#ifdef HAVE_NTL
   if (degg >= 8 || degmipo >= 8)
     norm= resultantZ (g, mipo, x);
   else
+#endif
     norm= resultant (g, mipo, x);
   TIMING_END_AND_PRINT (fac_alg_resultant, "time to compute resultant0: ");
@@ -83 +85 @@
   CanonicalForm norm;
   TIMING_START (fac_alg_resultant);
+#ifdef HAVE_NTL
   if (degg >= 8 || degmipo >= 8)
     norm= resultantZ (g, mipo, x);
   else
+#endif
     norm= resultant (g, mipo, x);
   TIMING_END_AND_PRINT (fac_alg_resultant, "time to compute resultant0: ");
@@ -104 +108 @@
         g *= bCommonDen (g);
         TIMING_START (fac_alg_resultant);
+#ifdef HAVE_NTL
         if (degg >= 8 || degmipo >= 8)
           norm= resultantZ (g (x, alpha), mipo, x);
         else
+#endif
           norm= resultant (g (x, alpha), mipo, x);
         TIMING_END_AND_PRINT (fac_alg_resultant,"time to compute resultant1: ");
@@ -115 +121 @@
         g *= bCommonDen (g);
         TIMING_START (fac_alg_resultant);
+#ifdef HAVE_NTL
         if (degg >= 8 || degmipo >= 8)
           norm= resultantZ (g (x, alpha), mipo, x);
         else
+#endif
           norm= resultant (g (x, alpha), mipo, x);
         TIMING_END_AND_PRINT (fac_alg_resultant,"time to compute resultant2: ");

factory/facAlgFunc.cc

@@ -188 +188 @@
     Off(SW_RATIONAL);
   CanonicalForm result;
+#ifdef HAVE_NTL
   if (getCharacteristic() == 0)
     result= resultantZ (fz, gz,v);
   else
+#endif
     result= resultant (fz,gz,v);