Changeset e7a487 in git for factory/facBivar.cc

Timestamp:

Feb 22, 2012, 6:41:12 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

a3aa3f3540f7d9604a809fe2b268a4115e7aef9a

Parents:

9b8b090bca59f6bb48b468a6a1b63a90e53e6299ff3a4f4a8e655885eb376e551f47339a6de25bf0

Message:

Merge pull request #70 from mmklee/factory_configure_options_sw

repair factory configure options: enable-timing, enable-debugoutput, enable-assertions (version for SW + improvements: enable-assertions ->  disable-assertions)

File:

• factory/facBivar.cc (modified) (4 diffs)

factory/facBivar.cc

@@ -24 +24 @@
 
 #ifdef HAVE_NTL
-TIMING_DEFINE_PRINT(fac_uni_factorizer)
-TIMING_DEFINE_PRINT(fac_hensel_lift)
-TIMING_DEFINE_PRINT(fac_factor_recombination)
+TIMING_DEFINE_PRINT(uni_factorize)
+TIMING_DEFINE_PRINT(hensel_lift12)
 
 CFList conv (const CFFList& L)
@@ -224 +223 @@
 
     // univariate factorization
-    TIMING_START (fac_uni_factorizer);
+    TIMING_START (uni_factorize);
 
     if (extension)
@@ -230 +229 @@
     else
       bufUniFactors= conv (factorize (bufAeval, true));
-    TIMING_END_AND_PRINT (fac_uni_factorizer,
+    TIMING_END_AND_PRINT (uni_factorize,
                           "time for univariate factorization: ");
     DEBOUTLN (cerr, "Lc (bufAeval)*prod (bufUniFactors)== bufAeval " <<
-              prod (bufUniFactors)*Lc (bufAeval) == bufAeval);
-
-    TIMING_START (fac_uni_factorizer);
+              (prod (bufUniFactors)*Lc (bufAeval) == bufAeval));
+
+    TIMING_START (uni_factorize);
     if (extension)
       bufUniFactors2= conv (factorize (bufAeval2, v));
     else
       bufUniFactors2= conv (factorize (bufAeval2, true));
-    TIMING_END_AND_PRINT (fac_uni_factorizer,
+    TIMING_END_AND_PRINT (uni_factorize,
                           "time for univariate factorization in y: ");
     DEBOUTLN (cerr, "Lc (Aeval2)*prod (uniFactors2)== Aeval2 " <<
-              prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2);
+              (prod (bufUniFactors2)*Lc (bufAeval2) == bufAeval2));
 
     if (bufUniFactors.getFirst().inCoeffDomain())
@@ -369 +368 @@
   bool earlySuccess= false;
   CFList earlyFactors;
-  TIMING_START (fac_hensel_lift);
+  TIMING_START (hensel_lift12);
   uniFactors= henselLiftAndEarly 
              (A, earlySuccess, earlyFactors, degs, liftBound,
               uniFactors, dummy, evaluation);
-  TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
+  TIMING_END_AND_PRINT (hensel_lift12, "time for hensel lifting: ");
   DEBOUTLN (cerr, "lifted factors= " << uniFactors);