Changeset 978ce3 in git for factory/facFqFactorize.cc

Timestamp:

May 14, 2012, 5:59:42 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

afb6a640a48bf260401660cd1ef52edcee526c38

Parents:

9aac3e40e249db0a2411b4c4f36cdc9a5d791080

git-author:

Martin Lee <martinlee84@web.de>2012-05-14 17:59:42+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-05-30 17:39:25+02:00

Message:

fix: multiple definitions with --enable-timing

File:

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

factory/facFqFactorize.cc

@@ -37 +37 @@
 #include "NTLconvert.h"
 
-TIMING_DEFINE_PRINT(fac_bi_factorizer)
-TIMING_DEFINE_PRINT(fac_hensel_lift)
-TIMING_DEFINE_PRINT(fac_factor_recombination)
+TIMING_DEFINE_PRINT(fac_fq_bi_factorizer)
+TIMING_DEFINE_PRINT(fac_fq_hensel_lift)
+TIMING_DEFINE_PRINT(fac_fq_factor_recombination)
 
 static inline
@@ -2412 +2412 @@
     bufLift= degree (A, y) + 1 + degree (LC(A, x), y);
 
-    TIMING_START (fac_bi_factorizer);
+    TIMING_START (fac_fq_bi_factorizer);
     if (!GF && alpha.level() == 1)
       bufBiFactors= FpBiSqrfFactorize (bufAeval.getFirst());
@@ -2419 +2419 @@
     else
       bufBiFactors= FqBiSqrfFactorize (bufAeval.getFirst(), alpha);
-    TIMING_END_AND_PRINT (fac_bi_factorizer,
+    TIMING_END_AND_PRINT (fac_fq_bi_factorizer,
                           "time for bivariate factorization: ");
     bufBiFactors.removeFirst();
@@ -2716 +2716 @@
     bool earlySuccess;
     CFList earlyFactors, liftedFactors;
-    TIMING_START (fac_hensel_lift);
+    TIMING_START (fac_fq_hensel_lift);
     liftedFactors= henselLiftAndEarly
                    (A, MOD, liftBounds, earlySuccess, earlyFactors,
                     Aeval, biFactors, evaluation, info);
-    TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
+    TIMING_END_AND_PRINT (fac_fq_hensel_lift, "time for hensel lifting: ");
 
     if (!extension)
     {
-      TIMING_START (fac_factor_recombination);
+      TIMING_START (fac_fq_factor_recombination);
       factors= factorRecombination (A, liftedFactors, MOD);
-      TIMING_END_AND_PRINT (fac_factor_recombination,
+      TIMING_END_AND_PRINT (fac_fq_factor_recombination,
                             "time for factor recombination: ");
     }
     else
     {
-      TIMING_START (fac_factor_recombination);
+      TIMING_START (fac_fq_factor_recombination);
       factors= extFactorRecombination (liftedFactors, A, MOD, info, evaluation);
-      TIMING_END_AND_PRINT (fac_factor_recombination,
+      TIMING_END_AND_PRINT (fac_fq_factor_recombination,
                             "time for factor recombination: ");
     }