fix: issues with building factory without NTL

Author: mmklee

factory/algext.cc

@@ -590,10 +590,10 @@ void tryBrownGCD( const CanonicalForm & F, const CanonicalForm & G, const Canoni
   fail = true;
 }
 
-#ifdef HAVE_NTL
 static CanonicalForm
 myicontent ( const CanonicalForm & f, const CanonicalForm & c )
 {
+#ifdef HAVE_NTL
     if (f.isOne() || c.isOne())
       return 1;
     if ( f.inBaseDomain() && c.inBaseDomain())
@@ -621,8 +621,10 @@ myicontent ( const CanonicalForm & f, const CanonicalForm & c )
             g = myicontent( i.coeff(), g );
         return g;
     }
-}
+#else
+    return 1;
 #endif
+}
 
 CanonicalForm
 myicontent ( const CanonicalForm & f )

factory/cf_factor.cc

@@ -638,6 +638,7 @@ CFFList factorize ( const CanonicalForm & f, bool issqrfree )
     }
     else
     {
+      #ifdef HAVE_NTL
       On (SW_RATIONAL);
       if (issqrfree)
       {
@@ -649,6 +650,9 @@ CFFList factorize ( const CanonicalForm & f, bool issqrfree )
       else
         F = ratFactorize (fz);
       Off (SW_RATIONAL);
+      #else
+      ASSERT( 0, "multivariate factorization without NTL not implemented" );
+      #endif
     }
 
     if ( on_rational )

factory/cf_gcd.cc

@@ -1276,7 +1276,13 @@ CanonicalForm chinrem_gcd ( const CanonicalForm & FF, const CanonicalForm & GG )
     }
     //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);
     cogp /= lc (cogp);

factory/cf_gcd_smallp.cc

@@ -30,6 +30,7 @@
 #include "cf_reval.h"
 #include "facHensel.h"
 #include "cfNewtonPolygon.h"
+#include "cf_algorithm.h"
 
 // iinline helper functions:
 #include "cf_map_ext.h"
@@ -41,10 +42,8 @@
 
 #include "cf_gcd_smallp.h"
 
-#ifdef HAVE_NTL
-
-TIMING_DEFINE_PRINT(gcd_recursion);
-TIMING_DEFINE_PRINT(newton_interpolation);
+TIMING_DEFINE_PRINT(gcd_recursion)
+TIMING_DEFINE_PRINT(newton_interpolation)
 
 bool
 terminationTest (const CanonicalForm& F, const CanonicalForm& G,
@@ -68,6 +67,8 @@ terminationTest (const CanonicalForm& F, const CanonicalForm& G,
   return false;
 }
 
+#ifdef HAVE_NTL
+
 static const double log2exp= 1.442695041;
 
 /// compressing two polynomials F and G, M is used for compressing,

factory/facFqBivar.h

@@ -25,6 +25,7 @@
 #include "facFqSquarefree.h"
 #include "cf_map.h"
 #include "cfNewtonPolygon.h"
+#include "fac_util.h"
 
 static const double log2exp= 1.442695041;
 

factory/fac_ezgcd.cc

@@ -29,6 +29,7 @@
 #include "cf_map.h"
 #include "facHensel.h"
 
+#ifdef HAVE_NTL
 static
 int compress4EZGCD (const CanonicalForm& F, const CanonicalForm& G, CFMap & M,
                     CFMap & N, int& both_non_zero)
@@ -672,11 +673,18 @@ ezgcd ( const CanonicalForm & FF, const CanonicalForm & GG, REvaluation & b,
   cand /= icontent (cand);
   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
 }