Changeset 2072126 in git

Timestamp:

May 19, 2011, 5:22:56 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

b5cd25f4f43ce3d4a37ddaab1030082d1f09c0b1

Parents:

55608a78dc5f45276e2138266996767392a31c2c

Message:

add missing HAVE_NTL

git-svn-id: file:///usr/local/Singular/svn/trunk@14233 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• Singular/extra.cc (modified) (2 diffs)
• factory/cfNewtonPolygon.cc (modified) (2 diffs)
• factory/cf_gcd.cc (modified) (4 diffs)
• kernel/clapsing.cc (modified) (2 diffs)
• kernel/clapsing.h (modified) (1 diff)

Singular/extra.cc

@@ -3509 +3509 @@
   /*==================== HNF =================*/
   #ifdef HAVE_FACTORY
+  #ifdef HAVE_NTL
       if (strcmp(sys_cmd, "HNF") == 0)
       {
@@ -3549 +3550 @@
       }
       else
+      #endif
   /*================= factoras =========================*/
       if (strcmp (sys_cmd, "factoras") == 0)

factory/cfNewtonPolygon.cc

@@ -375 +375 @@
 }
 
+#ifdef HAVE_NTL
 void convexDense(int** points, int sizePoints, mat_ZZ& M, vec_ZZ& A)
 {
@@ -675 +676 @@
   return result/Lc (result); //normalize
 }
-
+#endif

factory/cf_gcd.cc

@@ -13 +13 @@
 #include "cf_primes.h"
 #include "cf_algorithm.h"
+#include "cf_factory.h"
 #include "fac_util.h"
 #include "templates/ftmpl_functions.h"
@@ -560 +561 @@
       return fieldGCD(f,g);
     }
+    #ifdef HAVE_NTL
     else if ((!fc_and_gc_Univariate) && (isOn( SW_USE_EZGCD_P )))
     {
@@ -579 +581 @@
       fc= EZGCD_P (fc, gc);
     }
+    #endif
     else if (isOn(SW_USE_GCD_P))
     {
       fc=newGCD(fc,gc);
     }
+    #ifdef HAVE_NTL
     else if (isOn(SW_USE_FF_MOD_GCD) && !fc_and_gc_Univariate)
     {
@@ -596 +600 @@
       fc=GCD_small_p (fc, gc);
     }
+    #endif
     else if ( p1 == fc.level() )
       fc = gcd_poly_p( fc, gc );

kernel/clapsing.cc

@@ -1561 +1561 @@
   return res;
 }
+#ifdef HAVE_NTL
 matrix singntl_HNF(matrix  m )
 {
@@ -1678 +1679 @@
   return mm;
 }
+#endif
 
 napoly singclap_alglcm ( napoly f, napoly g )

kernel/clapsing.h

@@ -40 +40 @@
 matrix singclap_irrCharSeries ( ideal I);
 
+#ifdef HAVE_NTL
 matrix singntl_HNF(matrix A);
 intvec* singntl_HNF(intvec* A);
 matrix singntl_LLL(matrix A);
 intvec* singntl_LLL(intvec* A);
+#endif
 
 BOOLEAN singclap_isSqrFree(poly f);