Changeset 1130ffc in git for factory/fac_ezgcd.cc

Timestamp:

Oct 25, 2012, 2:25:59 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

139f6f800b915490dfaa914ef7676d29a3236b92186df6b3fe891f605e0e3e7324333e7713165436

Parents:

becbea965e6c5de8e8ab195c7f480cabc295ac0cd91423947d67c2ab2eaf1aae4a61f9f2988e9510

Message:

Merge pull request #198 from mmklee/factory_clean_sw

Factory clean sw

File:

• factory/fac_ezgcd.cc (modified) (12 diffs)

factory/fac_ezgcd.cc

@@ -15 +15 @@
 #include "config.h"
 
+#include "timing.h"
 #include "cf_assert.h"
 #include "debug.h"
@@ -30 +31 @@
 
 #ifdef HAVE_NTL
+
+TIMING_DEFINE_PRINT(ez_eval)
+TIMING_DEFINE_PRINT(ez_compress)
+TIMING_DEFINE_PRINT(ez_hensel_lift)
+TIMING_DEFINE_PRINT(ez_content)
+TIMING_DEFINE_PRINT(ez_termination)
+
 static
 int compress4EZGCD (const CanonicalForm& F, const CanonicalForm& G, CFMap & M,
@@ -432 +440 @@
     Off (SW_RATIONAL);
 
+  TIMING_START (ez_compress)
   CFMap M,N;
   int smallestDegLev;
@@ -444 +453 @@
   F= M (F);
   G= M (G);
+  TIMING_END_AND_PRINT (ez_compress, "time for compression in EZ: ")
 
   DEBINCLEVEL( cerr, "ezgcd" );
   DEBOUTLN( cerr, "FF = " << FF );
   DEBOUTLN( cerr, "GG = " << GG );
+  TIMING_START (ez_content)
   f = content( F, x ); g = content( G, x ); d = gcd( f, g );
   d /= icontent (d);
@@ -453 +464 @@
   DEBOUTLN( cerr, "g = " << g );
   F /= f; G /= g;
+  TIMING_END_AND_PRINT (ez_content, "time to extract content in EZ: ")
   if ( F.isUnivariate() && G.isUnivariate() )
   {
@@ -500 +512 @@
     DEBOUTLN( cerr, "F = " << F );
     DEBOUTLN( cerr, "G = " << G );
+    TIMING_START (ez_eval)
     if (!findeval( F, G, Fb, Gb, Db, b, delta, degF, degG, maxeval, count,
                    o, 25, l))
@@ -512 +525 @@
       return N (d*result);
     }
+    TIMING_END_AND_PRINT (ez_eval, "time to find eval point in EZ1: ")
     DEBOUTLN( cerr, "found evaluation b = " << b );
     DEBOUTLN( cerr, "F(b) = " << Fb );
@@ -530 +544 @@
     {
       bt = b;
+      TIMING_START (ez_eval)
       if (!findeval( F, G, Fbt, Gbt, Dbt, bt, delta, degF, degG, maxeval, count,
                      o, 25,l ))
@@ -542 +557 @@
         return N (d*result);
       }
+      TIMING_END_AND_PRINT (ez_eval, "time to find eval point in EZ2: ")
       int dd=degree( Dbt );
       if ( dd /*degree( Dbt )*/ == 0 )
@@ -636 +652 @@
       DEBOUTLN( cerr, "(hensel) DD   = " << DD );
       DEBOUTLN( cerr, "(hensel) lcDD = " << lcDD );
+      TIMING_START (ez_hensel_lift)
       gcdfound= Hensel (B*lcD, DD, b, lcDD);
+      TIMING_END_AND_PRINT (ez_hensel_lift, "time to hensel lift in EZ: ")
       DEBOUTLN( cerr, "(hensel finished) DD   = " << DD );
 
@@ -653 +671 @@
       if (gcdfound)
       {
+        TIMING_START (ez_termination)
         contcand= content (DD[2], Variable (1));
         cand = DD[2] / contcand;
@@ -659 +678 @@
         else
           gcdfound = fdivides( cand, F ) && cand*(DD[1]/(lcD/contcand)) == G;
+        TIMING_END_AND_PRINT (ez_termination,
+                              "time for termination test in EZ: ")
       }
       /// ---> A8 (gcdfound)