Changeset ec664a2 in git for factory

Timestamp:

Jul 31, 2012, 11:45:53 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

773d281c087d1388ff04cd6c70faccb93fe0fc03

Parents:

3ed675898c2676dd8ccc1bcc862fa6d6b80b234e

Message:

fix: compilation errors with --enable-timing

File:

• factory/facFactorize.cc (modified) (3 diffs)

factory/facFactorize.cc

@@ -29 +29 @@
 #include "facSparseHensel.h"
 
-TIMING_DEFINE_PRINT(bi_factorize)
-TIMING_DEFINE_PRINT(hensel_lift)
-TIMING_DEFINE_PRINT(factor_recombination)
+TIMING_DEFINE_PRINT(fac_bi_factorize)
+TIMING_DEFINE_PRINT(fac_hensel_lift)
+TIMING_DEFINE_PRINT(fac_factor_recombination)
 
 #ifdef HAVE_NTL
@@ -715 +715 @@
     bufLift= degree (A, y) + 1 + degree (LC(A, x), y);
 
-    TIMING_START (bi_factorize);
+    TIMING_START (fac_bi_factorize);
     bufBiFactors= ratBiSqrfFactorize (bufAeval.getFirst(), v);
-    TIMING_END_AND_PRINT (bi_factorize,
+    TIMING_END_AND_PRINT (fac_bi_factorize,
                           "time for bivariate factorization: ");
     bufBiFactors.removeFirst();
@@ -995 +995 @@
     ExtensionInfo info= ExtensionInfo (false);
     CFList liftedFactors;
-    TIMING_START (hensel_lift);
+    TIMING_START (fac_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);
+    TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
+
+    TIMING_START (fac_factor_recombination);
     factors= factorRecombination (A, liftedFactors, MOD);
-    TIMING_END_AND_PRINT (factor_recombination,
+    TIMING_END_AND_PRINT (fac_factor_recombination,
                           "time for factor recombination: ");