Changeset 4a7a45 in git for factory/fac_multihensel.cc

Timestamp:

Jul 29, 2020, 5:33:12 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

700b89d0131c4b3d214f49af1eeb67501875ec89

Parents:

4772b1b4621f2ab68acc9d2b5a568604d4d5e790

Message:

fix: factorize in Z[x,..] w/o NTL

File:

• factory/fac_multihensel.cc (modified) (7 diffs)

factory/fac_multihensel.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-
-
-#include "config.h"
-
-
-#include "cf_assert.h"
+/* $Id: fac_multihensel.cc 12231 2009-11-02 10:12:22Z hannes $ */
+
+#include <config.h>
+
+#include "assert.h"
 #include "debug.h"
 #include "timing.h"
@@ -14 +13 @@
 #include "fac_util.h"
 #include "fac_iterfor.h"
-#include "fac_multihensel.h"
 #include "cf_iter.h"
 
 #ifndef HAVE_NTL
 
-TIMING_DEFINE_PRINT(fac_solve)
-TIMING_DEFINE_PRINT(fac_modpk)
-TIMING_DEFINE_PRINT(fac_corrcoeff)
-TIMING_DEFINE_PRINT(fac_extgcd)
+TIMING_DEFINE_PRINT(fac_solve);
+TIMING_DEFINE_PRINT(fac_modpk);
+TIMING_DEFINE_PRINT(fac_corrcoeff);
+TIMING_DEFINE_PRINT(fac_extgcd);
 
 static void
-extgcdrest ( const CanonicalForm & a, const CanonicalForm & b, const CanonicalForm & s, const CanonicalForm & t, const CanonicalForm & c, CanonicalForm & S, CanonicalForm & T, const modpk & /*pk*/ )
+extgcdrest ( const CanonicalForm & a, const CanonicalForm & b, const CanonicalForm & s, const CanonicalForm & t, const CanonicalForm & c, CanonicalForm & S, CanonicalForm & T, const modpk & pk )
 {
     CanonicalForm sigma = s * c, tau = t * c;
@@ -169 +167 @@
         A[i] = remainder( pk( a[i] * C0 ), P0[i], pk );
     DEBOUTLN( cerr, "the first approximation of the correction coefficients is " << A );
-/*#ifdef DEBUGOUTPUT
+#ifdef DEBUGOUTPUT
     if ( check_dummy( A, P, Q ) - C != 0 )
     {
@@ -177 +175 @@
         DEBOUTLN( cerr, "              Q " << Q );
     }
-#endif*/
+#endif
     for ( m = 0; m <= h && ( m == 0 || Dm != 0 ); m++ )
     {
@@ -219 +217 @@
         DEBOUTLN( cerr, "the correction coefficients at step " << m );
         DEBOUTLN( cerr, "are now " << A );
-/*#ifdef DEBUGOUTPUT
+#ifdef DEBUGOUTPUT
     if ( check_dummy( A, P, Q ) - C != 0 ) {
         DEBOUTLN( cerr, "there is an error detected, the correction coefficients do not" );
@@ -226 +224 @@
         DEBOUTLN( cerr, "              Q " << Q );
     }
-#endif*/
+#endif
     }
     DEBDECLEVEL( cerr, "findCorrCoeffs" );
@@ -326 +324 @@
 
 bool
-Hensel ( const CanonicalForm & U, CFArray & G, const CFArray & lcG, const Evaluation & A, const modpk & bound, const Variable & /*x*/ )
+Hensel ( const CanonicalForm & U, CFArray & G, const CFArray & lcG, const Evaluation & A, const modpk & bound, const Variable & x )
 {
     DEBINCLEVEL( cerr, "Hensel" );