Changeset 978ce3 in git for factory

Timestamp:

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

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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

Location:

factory

Files:

• facBivar.cc (modified) (2 diffs)
• facFqBivar.cc (modified) (7 diffs)
• facFqFactorize.cc (modified) (4 diffs)

factory/facBivar.cc

@@ -27 +27 @@
 
 #ifdef HAVE_NTL
-TIMING_DEFINE_PRINT(uni_factorize)
-TIMING_DEFINE_PRINT(hensel_lift12)
+TIMING_DEFINE_PRINT(fac_uni_factorizer)
+TIMING_DEFINE_PRINT(fac_bi_hensel_lift)
+TIMING_DEFINE_PRINT(fac_bi_factor_recombination)
 
 // bound on coeffs of f (cf. Musser: Multivariate Polynomial Factorization,
@@ -705 +706 @@
   bool earlySuccess= false;
   CFList earlyFactors;
-  TIMING_START (fac_hensel_lift);
+  TIMING_START (fac_bi_hensel_lift);
   uniFactors= henselLiftAndEarly
               (A, earlySuccess, earlyFactors, degs, liftBound,
                uniFactors, dummy, evaluation, b);
-  TIMING_END_AND_PRINT (fac_hensel_lift, "time for hensel lifting: ");
+  TIMING_END_AND_PRINT (fac_bi_hensel_lift, "time for hensel lifting: ");
   DEBOUTLN (cerr, "lifted factors= " << uniFactors);
 

factory/facFqBivar.cc

@@ -45 +45 @@
 #endif
 
-TIMING_DEFINE_PRINT(fac_uni_factorizer)
-TIMING_DEFINE_PRINT(fac_hensel_lift12)
+TIMING_DEFINE_PRINT(fac_fq_uni_factorizer)
+TIMING_DEFINE_PRINT(fac_fq_bi_hensel_lift)
+TIMING_DEFINE_PRINT(fac_fq_bi_factor_recombination)
 
 CanonicalForm prodMod0 (const CFList& L, const CanonicalForm& M, const modpk& b)
@@ -5912 +5913 @@
 
     // univariate factorization
-    TIMING_START (fac_uni_factorizer);
+    TIMING_START (fac_fq_uni_factorizer);
     bufUniFactors= uniFactorizer (bufAeval, alpha, GF);
-    TIMING_END_AND_PRINT (fac_uni_factorizer,
+    TIMING_END_AND_PRINT (fac_fq_uni_factorizer,
                           "time for univariate factorization: ");
     DEBOUTLN (cerr, "Lc (bufAeval)*prod (bufUniFactors)== bufAeval " <<
@@ -5921 +5922 @@
     if (!derivXZero && !fail2)
     {
-      TIMING_START (fac_uni_factorizer);
+      TIMING_START (fac_fq_uni_factorizer);
       bufUniFactors2= uniFactorizer (bufAeval2, alpha, GF);
-      TIMING_END_AND_PRINT (fac_uni_factorizer,
+      TIMING_END_AND_PRINT (fac_fq_uni_factorizer,
                             "time for univariate factorization in y: ");
       DEBOUTLN (cerr, "Lc (bufAeval2)*prod (bufUniFactors2)== bufAeval2 " <<
@@ -6084 +6085 @@
     bool earlySuccess= false;
     CFList earlyFactors;
-    TIMING_START (fac_hensel_lift12);
+    TIMING_START (fac_fq_bi_hensel_lift);
     uniFactors= henselLiftAndEarly
                (A, earlySuccess, earlyFactors, degs, liftBound,
                 uniFactors, info, evaluation);
-    TIMING_END_AND_PRINT (fac_hensel_lift12, "time for hensel lifting: ");
+    TIMING_END_AND_PRINT (fac_fq_bi_hensel_lift, "time for hensel lifting: ");
     DEBOUTLN (cerr, "lifted factors= " << uniFactors);
 
@@ -6107 +6108 @@
   else if (degree (A) > 4 && beta.level() == 1 && (2*minBound)/degMipo < 32)
   {
-    TIMING_START (fac_hensel_lift12);
+    TIMING_START (fac_fq_bi_hensel_lift);
     if (extension)
     {
@@ -6125 +6126 @@
       factors= Union (lll, factors);
     }
-    TIMING_END_AND_PRINT (fac_hensel_lift12, "time for hensel lifting: ");
+    TIMING_END_AND_PRINT (fac_fq_bi_hensel_lift, "time for hensel lifting: ");
     DEBOUTLN (cerr, "lifted factors= " << uniFactors);
   }
@@ -6132 +6133 @@
     bool earlySuccess= false;
     CFList earlyFactors;
-    TIMING_START (fac_hensel_lift12);
+    TIMING_START (fac_fq_bi_hensel_lift);
     uniFactors= henselLiftAndEarly
                (A, earlySuccess, earlyFactors, degs, liftBound,
                 uniFactors, info, evaluation);
-    TIMING_END_AND_PRINT (fac_hensel_lift12, "time for hensel lifting: ");
+    TIMING_END_AND_PRINT (fac_fq_bi_hensel_lift, "time for hensel lifting: ");
     DEBOUTLN (cerr, "lifted factors= " << uniFactors);
 

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: ");
     }