Changeset cd7ce9b in git

Timestamp:

Jul 19, 2013, 5:29:51 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

70073a2b66e97fcaccabe33c14bb671aa245992c

Parents:

3e0c11d34cd0300998b687c191f99d28fea7f47c

git-author:

Martin Lee <martinlee84@web.de>2013-07-19 17:29:51+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-07-22 15:49:54+02:00

Message:

chg: added some timing infos
chg: order of multiplicands

File:

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

factory/facHensel.cc

@@ -35 +35 @@
 #include <NTL/lzz_pEX.h>
 #include "NTLconvert.h"
+
+TIMING_DEFINE_PRINT (diotime)
+TIMING_DEFINE_PRINT (product1)
+TIMING_DEFINE_PRINT (product2)
+TIMING_DEFINE_PRINT (hensel23)
+TIMING_DEFINE_PRINT (hensel)
 
 static
@@ -2062 +2068 @@
   CFListIterator j= products;
   for (CFListIterator i= recDiophantine; i.hasItem(); i++, j++)
-    e -= i.getItem()*j.getItem();
+    e -= j.getItem()*i.getItem();
 
   CFList result= recDiophantine;
@@ -2084 +2090 @@
       {
         k.getItem() += j.getItem()*power (y, i);
-        e -= j.getItem()*power (y, i)*l.getItem();
+        e -= l.getItem()*(j.getItem()*power (y, i));
       }
     }
@@ -2132 +2138 @@
 
   // actual lifting
+  TIMING_START (diotime);
   CFList diophantine2= diophantine (diophant, factors, products, MOD, E,
                                     noOneToOne);
@@ -2144 +2151 @@
     bufFactors[k] += xToJ*i.getItem();
   }
+  TIMING_END_AND_PRINT (diotime, "time for dio: ");
 
   // update Pi [0]
+  TIMING_START (product2);
   int degBuf0= degree (bufFactors[0], x);
   int degBuf1= degree (bufFactors[1], x);
@@ -2330 +2339 @@
     Pi[l] += tmp[l]*xToJ*F.mvar();
   }
+  TIMING_END_AND_PRINT (product2, "time for product in hensel step: ");
   return;
 }
@@ -2540 +2550 @@
   bufF= mod (bufF, Variable (3));
 
+  TIMING_START (diotime);
   diophant= diophantine (bufF, bufFactors2);
+  TIMING_END_AND_PRINT (diotime, "time for dio in 23: ");
 
   CFMatrix M= CFMatrix (liftBound, bufFactors2.length() - 1);
@@ -2604 +2616 @@
   CFList products;
   bufF= mod (F, Variable (3));
+  TIMING_START (product1);
   for (CFListIterator k= factors; k.hasItem(); k++)
     products.append (bufF/k.getItem());
+  TIMING_END_AND_PRINT (product1, "time for product1 in 23: ");
 
   CFList MOD= CFList (power (v, liftBound));
@@ -2668 +2682 @@
   CanonicalForm quot, bufF= F.getFirst();
 
+  TIMING_START (product1);
   for (int i= 0; i < bufFactors.size(); i++)
   {
@@ -2689 +2704 @@
     }
   }
+  TIMING_END_AND_PRINT (product1, "time for product1 in further hensel:" );
 
   for (int d= 1; d < lNew; d++)
@@ -2716 +2732 @@
   int k= 0;
 
+  TIMING_START (hensel23);
   CFList result=
   nonMonicHenselLift23 (eval.getFirst(), factors, LCs [0], diophant, bufPi,
                         liftBound[1], liftBound[0], noOneToOne);
+  TIMING_END_AND_PRINT (hensel23, "time for 23: ");
 
   if (noOneToOne)
@@ -2740 +2758 @@
     bufEval.append (j.getItem());
     M= CFMatrix (liftBound[i], factors.length() - 1);
+    TIMING_START (hensel);
     result= nonMonicHenselLift (bufEval, result, LCs [i-1], diophant, bufPi, M,
                                 liftBound[i-1], liftBound[i], MOD, noOneToOne);
+    TIMING_END_AND_PRINT (hensel, "time for further hensel: ");
     if (noOneToOne)
       return result;