Changeset 517530 in git

Timestamp:

May 7, 2012, 5:34:51 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

dccd6db99cc44c93669e843ddb6e06d2682769b8

Parents:

e7676af1109530ff2efd9495bfdb0fa2cedc576a

Message:

fix: issues with building factory without NTL

Location:

factory

Files:

• algext.cc (modified) (3 diffs)
• cf_gcd.cc (modified) (1 diff)
• cf_gcd_smallp.cc (modified) (3 diffs)
• fac_ezgcd.cc (modified) (2 diffs)

factory/algext.cc

@@ -13 +13 @@
 #endif
 #endif
+
+#include "cf_assert.h"
 
 #include "templates/ftmpl_functions.h"
@@ -589 +591 @@
 }
 
-#ifdef HAVE_NTL
 static CanonicalForm
 myicontent ( const CanonicalForm & f, const CanonicalForm & c )
 {
+#ifdef HAVE_NTL
     if (f.isOne() || c.isOne())
       return 1;
@@ -620 +622 @@
         return g;
     }
-}
+#else
+    return 1;
 #endif
+}
 
 CanonicalForm

factory/cf_gcd.cc

@@ -1278 +1278 @@
     //printf("try p=%d\n",p);
     setCharacteristic( p );
+#ifdef HAVE_NTL
     Dp = GCD_small_p (mapinto (f), mapinto (g), cofp, cogp);
+#else
+    Dp= gcd_poly (mapinto (f), mapinto (g));
+    cofp= mapinto (f)/Dp;
+    cogp= mapinto (g)/Dp;
+#endif
     Dp /=Dp.lc();
     cofp /= lc (cofp);

factory/cf_gcd_smallp.cc

@@ -35 +35 @@
 #include "cf_iter.h"
 #include "cfNewtonPolygon.h"
+#include "cf_algorithm.h"
 
 // iinline helper functions:
@@ -45 +46 @@
 
 #include "cf_gcd_smallp.h"
-
-#ifdef HAVE_NTL
 
 TIMING_DEFINE_PRINT(gcd_recursion)
@@ -72 +71 @@
   return false;
 }
+
+#ifdef HAVE_NTL
 
 static const double log2exp= 1.442695041;

factory/fac_ezgcd.cc

@@ -30 +30 @@
 #include "facHensel.h"
 
+#ifdef HAVE_NTL
 static
 int compress4EZGCD (const CanonicalForm& F, const CanonicalForm& G, CFMap & M,
@@ -673 +674 @@
   return N (d*cand);
 }
+#endif
 
 CanonicalForm
 ezgcd ( const CanonicalForm & FF, const CanonicalForm & GG )
 {
+#ifdef HAVE_NTL
   REvaluation b;
   return ezgcd( FF, GG, b, false );
-}
-
+#else
+  Off (SW_USE_EZGCD);
+  return gcd (FF, GG);
+  On (SW_USE_EZGCD);
+#endif
+}
+