Changeset cc16f0 in git

Timestamp:

Jul 22, 2014, 11:14:12 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1936fb556581f3c446e8ec8cb14b9081d4aa5d2739ed94e4ba176b9cdda63c31fb26f14e2627ad3c

Parents:

0c42a847c2651462997b32adb623b79f38d133f5

Message:

chg: n_Power slightly optimized for some cf

Location:

libpolys/coeffs

Files:

• ffields.cc (modified) (3 diffs)
• modulop.cc (modified) (7 diffs)
• shortfl.cc (modified) (3 diffs)

libpolys/coeffs/ffields.cc

@@ -502 +502 @@
   if (i==0)
   {
-    //*result=nfInit(1);
     *result = (number)0L;
   }
@@ -511 +510 @@
   else
   {
-    nfPower(a,i-1,result, r);
-    *result = nfMult(a,*result, r);
+    long rl;
+    if ((long)a == (long)r->m_nfCharQ) rl=(long)r->m_nfCharQ;
+    else rl=((long)a*(long)i) % (long)r->m_nfCharQ1;
+    *result = (number)rl;
   }
 #ifdef LDEBUG
@@ -687 +688 @@
     while ( i < r->m_nfCharQ )
     {
-      fgets( buf, sizeof(buf), fp);
+      (void)fgets( buf, sizeof(buf), fp);
       //( strlen( buffer ) == (size_t)digs * 30, "illegal table" );
       bufptr = buf;

libpolys/coeffs/modulop.cc

@@ -46 +46 @@
 number  nvDiv         (number a, number b, const coeffs r);
 number  nvInvers      (number c, const coeffs r);
-void    nvPower       (number a, int i, number * result, const coeffs r);
+//void    nvPower       (number a, int i, number * result, const coeffs r);
 #endif
 
@@ -311 +311 @@
 }
 
+#if 0
 void npPower (number a, int i, number * result, const coeffs r)
 {
@@ -330 +331 @@
   }
 }
+#endif
 
 static const char* npEati(const char *s, int *i, const coeffs r)
@@ -495 +497 @@
   r->cfIsMOne = npIsMOne;
   r->cfGreaterZero = npGreaterZero;
-  r->cfPower = npPower;
+  //r->cfPower = npPower;
   r->cfGetDenom = ndGetDenom;
   r->cfGetNumerator = ndGetNumerator;
@@ -511 +513 @@
     r->cfExactDiv= nvDiv;
     r->cfInvers= nvInvers;
-    r->cfPower= nvPower;
+    //r->cfPower= nvPower;
   }
 #endif
@@ -849 +851 @@
   return nvInversM(c,r);
 }
+#if 0
 void nvPower (number a, int i, number * result, const coeffs r)
 {
@@ -867 +870 @@
 }
 #endif
+#endif
 
 void    npCoeffWrite  (const coeffs r, BOOLEAN /*details*/)

libpolys/coeffs/shortfl.cc

@@ -269 +269 @@
 }
 
+#if 0
 void nrPower (number a, int i, number * result, const coeffs r)
 {
@@ -286 +287 @@
   *result = nf(nf(a).F() * nf(*result).F()).N();
 }
+#endif
 
 namespace {
@@ -729 +731 @@
   n->cfWriteLong = nrWrite;
   n->cfRead = nrRead;
-  n->cfPower = nrPower;
+  //n->cfPower = nrPower;
   n->cfSetMap = nrSetMap;
   n->cfCoeffWrite  = nrCoeffWrite;