Changeset 0851b0 in git for factory/facAlgExt.cc

Timestamp:

Oct 12, 2012, 5:31:21 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

cb4f0c3c5277d6de4d18c968650b4169ff1d1b46

Parents:

2a95b234ef67ebbc98057baefb8dd2ed43af3762

git-author:

Martin Lee <martinlee84@web.de>2012-10-12 17:31:21+02:00

git-committer:

Martin Lee <martinlee84@web.de>2012-10-24 12:26:22+02:00

Message:

chg: added more timing infos to main factorization functions

File:

• factory/facAlgExt.cc (modified) (9 diffs)

factory/facAlgExt.cc

@@ -29 +29 @@
 #include "fac_sqrfree.h"
 
+TIMING_DEFINE_PRINT(fac_alg_resultant)
+TIMING_DEFINE_PRINT(fac_alg_norm)
+TIMING_DEFINE_PRINT(fac_alg_factor_norm)
+TIMING_DEFINE_PRINT(fac_alg_gcd)
+TIMING_DEFINE_PRINT(fac_alg_sqrf)
+TIMING_DEFINE_PRINT(fac_alg_factor_sqrf)
+
 // squarefree part of F
 CanonicalForm
@@ -53 +60 @@
   int degmipo= degree (mipo);
   CanonicalForm norm;
+  TIMING_START (fac_alg_resultant);
   if (degg >= 8 || degmipo >= 8)
     norm= resultantZ (g, mipo, x);
   else
     norm= resultant (g, mipo, x);
+  TIMING_END_AND_PRINT (fac_alg_resultant, "time to compute resultant0: ");
 
   i= 0;
@@ -72 +81 @@
         g= F (y - i*alpha, y);
         g *= bCommonDen (g);
+        TIMING_START (fac_alg_resultant);
         if (degg >= 8 || degmipo >= 8)
           norm= resultantZ (g (x, alpha), mipo, x);
         else
           norm= resultant (g (x, alpha), mipo, x);
+        TIMING_END_AND_PRINT (fac_alg_resultant,"time to compute resultant1: ");
       }
       else
@@ -81 +92 @@
         g= F (y + i*alpha, y);
         g *= bCommonDen (g);
+        TIMING_START (fac_alg_resultant);
         if (degg >= 8 || degmipo >= 8)
           norm= resultantZ (g (x, alpha), mipo, x);
         else
           norm= resultant (g (x, alpha), mipo, x);
+        TIMING_END_AND_PRINT (fac_alg_resultant,"time to compute resultant2: ");
       }
       if (degree (gcd (deriv (norm, y), norm)) <= 0)
@@ -108 +121 @@
   CanonicalForm f= F*bCommonDen (F);
   int shift;
+  TIMING_START (fac_alg_norm);
   CanonicalForm norm= sqrfNorm (f, alpha, shift);
+  TIMING_END_AND_PRINT (fac_alg_norm, "time to compute sqrf norm: ");
   ASSERT (degree (norm, alpha) <= 0, "wrong norm computed");
+  TIMING_START (fac_alg_factor_norm);
   CFFList normFactors= factorize (norm);
+  TIMING_END_AND_PRINT (fac_alg_factor_norm, "time to factor norm: ");
   CFList factors;
   if (normFactors.length() <= 2)
@@ -125 +142 @@
   {
     ASSERT (i.getItem().exp() == 1, "norm not squarefree");
+    TIMING_START (fac_alg_gcd);
     if (shift == 0)
       factor= gcd (buf, i.getItem().factor());
@@ -130 +148 @@
       factor= gcd (buf, i.getItem().factor() (f.mvar() + shift*alpha, f.mvar()));
     buf /= factor;
+    TIMING_END_AND_PRINT (fac_alg_gcd, "time to recover factors: ");
     factors.append (factor);
   }
@@ -149 +168 @@
   bool save_rat=!isOn (SW_RATIONAL);
   On (SW_RATIONAL);
+  TIMING_START (fac_alg_sqrf);
   CFFList sqrf= sqrFreeZ (F);
+  TIMING_END_AND_PRINT (fac_alg_sqrf, "time for sqrf factors in Q(a)[x]: ");
   CFList factorsSqrf;
   CFFList factors;
@@ -158 +179 @@
   {
     if (i.getItem().factor().inCoeffDomain()) continue;
+    TIMING_START (fac_alg_factor_sqrf);
     factorsSqrf= AlgExtSqrfFactorize (i.getItem().factor(), alpha);
+    TIMING_END_AND_PRINT (fac_alg_factor_sqrf,
+                          "time to factor sqrf factors in Q(a)[x]: ");
     for (j= factorsSqrf; j.hasItem(); j++)
     {