Changeset e77676 in git

Timestamp:

Jan 6, 2012, 9:43:08 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4b38e3cc9992129dd4ef044c1d2cc7e55f93b134

Parents:

40e88db63c509564c2b00b7142b39ef6b846f72e

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:43:08+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:59:37+01:00

Message:

Zp cleanup (no more coeffs::npPrimeM)

CHG: removed coeffs::npPrimeM in favour of coeffs::ch

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (3 diffs)
• modulop.cc (modified) (24 diffs)
• modulop.h (modified) (5 diffs)

libpolys/coeffs/coeffs.h

@@ -102 +102 @@
    void (*cfCoeffWrite)(const coeffs r, BOOLEAN details);
 
-   // the union stuff
-
-   // Zp:
-   int npPrimeM;
-   int npPminus1M;
-   #ifdef HAVE_DIV_MOD
-   unsigned short *npInvTable;
-   #endif
-   #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-   unsigned short *npExpTable;
-   unsigned short *npLogTable;
-   #endif
-
    // ?
    // initialisation:
@@ -209 +196 @@
    int     factoryVarOffset;
    n_coeffType type;
-//-------------------------------------------
+
+   /////////////////////////////////////////////
+   // the union stuff
+
+   //-------------------------------------------
 
   /* for extension fields we need to be able to represent polynomials,
@@ -276 +267 @@
   int *m_nfMinPoly;
   char * m_nfParameter;
+
+// ---------------------------------------------------
+// for Zp:
+#ifdef HAVE_DIV_MOD
+  unsigned short *npInvTable;
+#endif
+#if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
+  unsigned short *npExpTable;
+  unsigned short *npLogTable;
+#endif
+   //   int npPrimeM; // NOTE: npPrimeM is deprecated, please use ch instead!
+  int npPminus1M; ///< characteristic - 1
 };
 //

libpolys/coeffs/modulop.cc

@@ -57 +57 @@
   
   int h = (int)((long) k);
-  return ((int)h !=0) && (h <= (r->npPrimeM>>1));
-}
-
-//unsigned long npMultMod(unsigned long a, unsigned long b)
+  return ((int)h !=0) && (h <= (r->ch>>1));
+}
+
+//unsigned long npMultMod(unsigned long a, unsigned long b, int npPrimeM)
 //{
 //  unsigned long c = a*b;
 //  c = c % npPrimeM;
-//  assume(c == (unsigned long) npMultM((number) a, (number) b));
+//  assume(c == (unsigned long) npMultM((number) a, (number) b, npPrimeM));
 //  return c;
 //}
@@ -167 +167 @@
 
 #ifdef USE_NTL_XGCD
-   XGCD(d, s, t, a, R->npPrimeM);
+   XGCD(d, s, t, a, R->ch);
    assume (d == 1);
 #else
@@ -174 +174 @@
    assume(a>0);
    u1=1; u2=0;
-   u = a; v = R->npPrimeM;
+   u = a; v = R->ch;
 
    while (v != 0)
@@ -191 +191 @@
 #endif
    if (s < 0)
-      return s + R->npPrimeM;
+      return s + R->ch;
    else
       return s;
@@ -222 +222 @@
 
 //#ifdef NV_OPS
-//  if (npPrimeM>NV_MAX_PRIME)
+//  if (r->ch>NV_MAX_PRIME)
 //    return nvDiv(a,b);
 //#endif
@@ -339 +339 @@
       ii *= 10;
       ii += *s++ - '0';
-      if (ii >= (MAX_INT_VAL / 10)) ii = ii % r->npPrimeM;
+      if (ii >= (MAX_INT_VAL / 10)) ii = ii % r->ch;
     }
     while (((*s) >= '0') && ((*s) <= '9'));
-    if (ii >= r->npPrimeM) ii = ii % r->npPrimeM;
+    if (ii >= r->ch) ii = ii % r->ch;
     *i=(int)ii;
   }
@@ -368 +368 @@
     {
 #ifdef NV_OPS
-      if (r->npPrimeM>NV_MAX_PRIME)
+      if (r->ch>NV_MAX_PRIME)
         *a = nvDiv((number)z,(number)n,r);
       else
@@ -387 +387 @@
   #ifdef HAVE_DIV_MOD
   if (r->npInvTable!=NULL)
-  omFreeSize( (void *)r->npInvTable, r->npPrimeM*sizeof(unsigned short) );
+  omFreeSize( (void *)r->npInvTable, r->ch*sizeof(unsigned short) );
   r->npInvTable=NULL;
   #else
   if (r->npExpTable!=NULL)
   {
-    omFreeSize( (void *)r->npExpTable, r->npPrimeM*sizeof(unsigned short) );
-    omFreeSize( (void *)r->npLogTable, r->npPrimeM*sizeof(unsigned short) );
+    omFreeSize( (void *)r->npExpTable, r->ch*sizeof(unsigned short) );
+    omFreeSize( (void *)r->npLogTable, r->ch*sizeof(unsigned short) );
     r->npExpTable=NULL; r->npLogTable=NULL;
   }
@@ -407 +407 @@
 CanonicalForm npConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs r )
 {
-  if (setChar) setCharacteristic( r->npPrimeM );
+  if (setChar) setCharacteristic( r->ch );
   CanonicalForm term(npInt( n,r ));
   return term;
@@ -436 +436 @@
   int i, w;
 
-  r->npPrimeM = c;
-  r->npPminus1M = c /*r->npPrimeM*/ - 1;
+  r->ch = c;
+  r->npPminus1M = c /*r->ch*/ - 1;
 
   //r->cfInitChar=npInitChar;
@@ -514 +514 @@
   // the tables
 #ifdef NV_OPS
-  if (r->npPrimeM <=NV_MAX_PRIME)
+  if (r->ch <=NV_MAX_PRIME)
 #endif
   {
 #if !defined(HAVE_DIV_MOD) || !defined(HAVE_MULT_MOD)
-    r->npExpTable=(unsigned short *)omAlloc( r->npPrimeM*sizeof(unsigned short) );
-    r->npLogTable=(unsigned short *)omAlloc( r->npPrimeM*sizeof(unsigned short) );
+    r->npExpTable=(unsigned short *)omAlloc( r->ch*sizeof(unsigned short) );
+    r->npLogTable=(unsigned short *)omAlloc( r->ch*sizeof(unsigned short) );
     r->npExpTable[0] = 1;
     r->npLogTable[0] = 0;
-    if (r->npPrimeM > 2)
+    if (r->ch > 2)
     {
       w = 1;
@@ -534 +534 @@
           i++;
           r->npExpTable[i] =(int)(((long)w * (long)r->npExpTable[i-1])
-                               % r->npPrimeM);
+                               % r->ch);
           r->npLogTable[r->npExpTable[i]] = i;
-          if (/*(i == npPrimeM - 1 ) ||*/ (r->npExpTable[i] == 1))
+          if (/*(i == r->ch - 1 ) ||*/ (r->npExpTable[i] == 1))
             break;
         }
-        if (i == r->npPrimeM - 1)
+        if (i == r->ch - 1)
           break;
       }
@@ -550 +550 @@
 #endif
 #ifdef HAVE_DIV_MOD
-    r->npInvTable=(unsigned short*)omAlloc0( r->npPrimeM*sizeof(unsigned short) );
+    r->npInvTable=(unsigned short*)omAlloc0( r->ch*sizeof(unsigned short) );
 #endif
   }
@@ -559 +559 @@
 BOOLEAN npDBTest (number a, const char *f, const int l, const coeffs r)
 {
-  if (((long)a<0) || ((long)a>r->npPrimeM))
+  if (((long)a<0) || ((long)a>r->ch))
   {
     Print("wrong mod p number %ld at %s,%d\n",(long)a,f,l);
@@ -571 +571 @@
 {
   long i = (long)from;
-  if (i>src->npPrimeM/2)
-  {
-    i-=src->npPrimeM;
-    while (i < 0) i+=dst_r->npPrimeM;
-  }
-  i%=dst_r->npPrimeM;
+  if (i>src->ch/2)
+  {
+    i-=src->ch;
+    while (i < 0) i+=dst_r->ch;
+  }
+  i%=dst_r->ch;
   return (number)i;
 }
@@ -604 +604 @@
   }
 
-  if(dst_r->npPrimeM>2)
+  if(dst_r->ch>2)
     e=(*f)[0]._mp_exp-size;
   else
@@ -629 +629 @@
     ndest->_mp_alloc = ndest->_mp_size = bl;
     res->s = 0;
-    in=mpz_fdiv_ui(ndest,dst_r->npPrimeM);
+    in=mpz_fdiv_ui(ndest,dst_r->ch);
     mpz_clear(ndest);
   }
@@ -644 +644 @@
   dest->_mp_d = dd;
   dest->_mp_alloc = al;
-  iz=mpz_fdiv_ui(dest,dst_r->npPrimeM);
+  iz=mpz_fdiv_ui(dest,dst_r->ch);
   mpz_clear(dest);
   if(res->s==0)
@@ -661 +661 @@
   mpz_init(erg);
 
-  mpz_mod_ui(erg, (int_number) from, dst->npPrimeM);
+  mpz_mod_ui(erg, (int_number) from, dst->ch);
   number r = (number) mpz_get_si(erg);
 
@@ -674 +674 @@
 number npMapMachineInt(number from, const coeffs /*src*/,const coeffs dst)
 {
-  long i = (long) (((unsigned long) from) % dst->npPrimeM);
+  long i = (long) (((unsigned long) from) % dst->ch);
   return (number) i;
 }
@@ -682 +682 @@
 number npMapCanonicalForm (number a, const coeffs /*src*/, const coeffs dst)
 {
-  setCharacteristic (dst ->npPrimeM);
+  setCharacteristic (dst ->ch);
   CanonicalForm f= CanonicalForm ((InternalCF*)(a));
   return (number) (f.intval());
@@ -756 +756 @@
    u1=1; v1=0;
    u2=0; v2=1;
-   u = a; v = R->npPrimeM;
+   u = a; v = R->ch;
 
    while (v != 0)
@@ -775 +775 @@
    //t = v1;
    if (s < 0)
-      return s + R->npPrimeM;
+      return s + R->ch;
    else
       return s;
@@ -831 +831 @@
 void    npCoeffWrite  (const coeffs r, BOOLEAN /*details*/)
 {
-  Print("//   characteristic : %d\n",r->npPrimeM);
-}
-
+  Print("//   characteristic : %d\n",r->ch);
+}
+

libpolys/coeffs/modulop.h

@@ -67 +67 @@
 #endif
 
-#if 0
-inline number npMultM(number a, number b)
-// return (a*b)%n
-{
-   double ab;
-   long q, res;
-
-   ab = ((double) ((int)a)) * ((double) ((int)b));
-   q  = (long) (ab/((double) npPrimeM));  // q could be off by (+/-) 1
-   res = (long) (ab - ((double) q)*((double) npPrimeM));
-   res += (res >> 31) & npPrimeM;
-   res -= npPrimeM;
-   res += (res >> 31) & npPrimeM;
-   return (number)res;
-}
-#endif
+// inline number npMultM(number a, number b, int npPrimeM)
+// // return (a*b)%n
+// {
+//    double ab;
+//    long q, res;
+// 
+//    ab = ((double) ((int)a)) * ((double) ((int)b));
+//    q  = (long) (ab/((double) npPrimeM));  // q could be off by (+/-) 1
+//    res = (long) (ab - ((double) q)*((double) npPrimeM));
+//    res += (res >> 31) & npPrimeM;
+//    res -= npPrimeM;
+//    res += (res >> 31) & npPrimeM;
+//    return (number)res;
+// }
 #ifdef HAVE_MULT_MOD
 static inline number npMultM(number a, number b, const coeffs r)
 {
   return (number) 
-    ((((unsigned long) a)*((unsigned long) b)) % ((unsigned long) r->npPrimeM));
+    ((((unsigned long) a)*((unsigned long) b)) % ((unsigned long) r->ch));
 }
 #else
@@ -121 +119 @@
 {
   long R = (long)a + (long)b;
-  return (number)(R >= r->npPrimeM ? R - r->npPrimeM : R);
+  return (number)(R >= r->ch ? R - r->ch : R);
 }
 static inline number npSubM(number a, number b, const coeffs r)
 {
   return (number)((long)a<(long)b ?
-                       r->npPrimeM-(long)b+(long)a : (long)a-(long)b);
+                       r->ch-(long)b+(long)a : (long)a-(long)b);
 }
 #else
@@ -132 +130 @@
 {
    long res = ((long)a + (long)b);
-   res -= r->npPrimeM;
+   res -= r->ch;
 #if SIZEOF_LONG == 8
-   res += (res >> 63) & r->npPrimeM;
+   res += (res >> 63) & r->ch;
 #else
-   res += (res >> 31) & r->npPrimeM;
+   res += (res >> 31) & r->ch;
 #endif
    return (number)res;
@@ -144 +142 @@
    long res = ((long)a - (long)b);
 #if SIZEOF_LONG == 8
-   res += (res >> 63) & r->npPrimeM;
+   res += (res >> 63) & r->ch;
 #else
-   res += (res >> 31) & r->npPrimeM;
+   res += (res >> 31) & r->ch;
 #endif
    return (number)res;
@@ -157 +155 @@
 }
 
-/*
-*inline number npMultM(number a, number b)
-*{
-*  return (number)(((long)a*(long)b) % npPrimeM);
-*}
-*/
+// inline number npMultM(number a, number b, int npPrimeM)
+// {
+//   return (number)(((long)a*(long)b) % npPrimeM);
+// }
 
-#define npNegM(A,r)      (number)(r->npPrimeM-(long)(A))
+
+#define npNegM(A,r)      (number)(r->ch-(long)(A))
 #define npEqualM(A,B,r)  ((A)==(B))
 
 
-
 #endif