Changeset 98d6c3 in git for factory/facFqBivar.cc

Timestamp:

May 31, 2012, 3:45:28 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

510dbc222823c06af5c391eca075c45c04553e14

Parents:

06c0b34bdca32ebe70f5b9ed855251d51dbb263e17642b3261157040015bc8ef3c5a395ba70f33cb

Message:

Merge pull request #124 from mmklee/changes_sw

Changes sw

File:

• factory/facFqBivar.cc (modified) (7 diffs)

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);