Changeset e7a487 in git for factory/facFactorize.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/facFactorize.cc (modified) (3 diffs)

factory/facFactorize.cc

@@ -30 +30 @@
 #include "cf_reval.h"
 #include "facSparseHensel.h"
+
+TIMING_DEFINE_PRINT(bi_factorize)
+TIMING_DEFINE_PRINT(hensel_lift)
+TIMING_DEFINE_PRINT(factor_recombination)
 
 #ifdef HAVE_NTL
@@ -691 +695 @@
     bufLift= degree (A, y) + 1 + degree (LC(A, x), y);
 
-    TIMING_START (fac_bi_factorizer);
+    TIMING_START (bi_factorize);
     bufBiFactors= ratBiSqrfFactorize (bufAeval.getFirst(), v);
-    TIMING_END_AND_PRINT (fac_bi_factorizer,
+    TIMING_END_AND_PRINT (bi_factorize,
                           "time for bivariate factorization: ");
     bufBiFactors.removeFirst();
@@ -969 +973 @@
     CFList earlyFactors;
     ExtensionInfo info= ExtensionInfo (false);
-    TIMING_START (fac_hensel_lift);
-    CFList liftedFactors= henselLiftAndEarly
-                          (A, MOD, liftBounds, earlySuccess, earlyFactors,
-                           Aeval, biFactors, evaluation, info);
-    TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
-
-    TIMING_START (fac_factor_recombination);
+    CFList liftedFactors;
+    TIMING_START (hensel_lift);
+    liftedFactors= henselLiftAndEarly
+                   (A, MOD, liftBounds, earlySuccess, earlyFactors,
+                    Aeval, biFactors, evaluation, info);
+    TIMING_END_AND_PRINT (hensel_lift, "time for hensel lifting: ");
+
+    TIMING_START (factor_recombination);
     factors= factorRecombination (A, liftedFactors, MOD);
-    TIMING_END_AND_PRINT (fac_factor_recombination,
+    TIMING_END_AND_PRINT (factor_recombination,
                           "time for factor recombination: ");