Changeset 1130ffc in git for factory/facBivar.h

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

139f6f800b915490dfaa914ef7676d29a3236b92186df6b3fe891f605e0e3e7324333e7713165436

Parents:

becbea965e6c5de8e8ab195c7f480cabc295ac0cd91423947d67c2ab2eaf1aae4a61f9f2988e9510

Message:

Merge pull request #198 from mmklee/factory_clean_sw

Factory clean sw

File:

• factory/facBivar.h (modified) (3 diffs)

factory/facBivar.h

@@ -14 +14 @@
 #define FAC_BIVAR_H
 
-#include <config.h>
-
-#include "assert.h"
+#include "config.h"
+
+#include "cf_assert.h"
+#include "timing.h"
 
 #include "facFqBivarUtil.h"
@@ -26 +27 @@
 #include "algext.h"
 #include "fac_util.h"
+
+TIMING_DEFINE_PRINT(fac_bi_sqrf)
+TIMING_DEFINE_PRINT(fac_bi_factor_sqrf)
 
 /// @return @a biFactorize returns a list of factors of F. If F is not monic
@@ -196 +200 @@
   vec_ZZ S;
   F= compress (F, M, S);
+  TIMING_START (fac_bi_sqrf);
   CFFList sqrfFactors= sqrFree (F);
+  TIMING_END_AND_PRINT (fac_bi_sqrf,
+                       "time for bivariate sqrf factors over Q: ");
   for (CFFListIterator i= sqrfFactors; i.hasItem(); i++)
   {
+    TIMING_START (fac_bi_factor_sqrf);
     CFList tmp= ratBiSqrfFactorize (i.getItem().factor(), v);
+    TIMING_END_AND_PRINT (fac_bi_factor_sqrf,
+                          "time to factor bivariate sqrf factors over Q: ");
     for (CFListIterator j= tmp; j.hasItem(); j++)
     {