Changeset 0461f0 in git for libpolys/coeffs/modulop.cc

Timestamp:

Jul 21, 2011, 10:00:44 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

bc1fdba5e0c00a808f45922f0d0fe8c4ec086e88

Parents:

a778e6518804aecf7bb83784c8936b0868f52943

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-07-21 22:00:44+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:31+01:00

Message:

ADD: added sainity tests inside modulop
CHG: 'npInt' returns the internal value, now result is in [0,p) and NOT in (-p/2..p/2]!
ADD: Usage of n_Neg: n = n_Neg(n,r) - no copy is returned (TODO: change this?)

File:

• libpolys/coeffs/modulop.cc (modified) (13 diffs)

libpolys/coeffs/modulop.cc

@@ -31 +31 @@
 BOOLEAN npGreaterZero (number k, const coeffs r)
 {
+  assume( n_Test(k, r) );
+  
   int h = (int)((long) k);
   return ((int)h !=0) && (h <= (r->npPrimeM>>1));
@@ -45 +47 @@
 number npMult (number a,number b, const coeffs r)
 {
+  assume( n_Test(a, r) );
+  assume( n_Test(b, r) );
+
   if (((long)a == 0) || ((long)b == 0))
     return (number)0;
-  else
-    return npMultM(a,b, r);
+  number c = npMultM(a,b, r);
+  assume( n_Test(c, r) );
+  return c;  
 }
 
@@ -57 +63 @@
 {
   long ii=i;
-  long p=(long)ABS(r->ch);
-  while (ii <  0L)             ii += p;
-  while ((ii>1L) && (ii >= p)) ii -= p;
-  return (number)ii;
-}
-
+  while (ii <  0L)                         ii += (long)r->ch;
+  while ((ii>1L) && (ii >= ((long)r->ch))) ii -= (long)r->ch;
+  
+  number c = (number)ii;
+  assume( n_Test(c, r) );
+  return c;
+  
+}
+
+
+#if 0
 /*2
-* convert a number to an int in (-p/2 .. p/2]
-*/
+ * convert a number to an int in (-p/2 .. p/2]
+ * BUG: InConsistent: nInit(nInt(a)) != a, for a in (p/2, p)
+ */
 int npInt(number &n, const coeffs r)
 {
+  assume( n_Test(n, r) );
+  
   if ((long)n > (((long)r->ch) >>1)) return (int)((long)n -((long)r->ch));
   else                               return (int)((long)n);
 }
+#else
+/*2
+ * convert a number to an int in [0 .. p)
+ */
+int npInt(number &n, const coeffs r)
+{
+  assume( n_Test(n, r) );
+  
+  return (int)(long)n;
+}
+#endif
 
 number npAdd (number a, number b, const coeffs r)
 {
-  return npAddM(a,b, r);
+  assume( n_Test(a, r) );
+  assume( n_Test(b, r) );
+  
+  number c = npAddM(a,b, r);
+
+  assume( n_Test(c, r) );
+  
+  return c;
 }
 
 number npSub (number a, number b, const coeffs r)
 {
-  return npSubM(a,b,r);
-}
-
-BOOLEAN npIsZero (number  a, const coeffs)
-{
+  assume( n_Test(a, r) );
+  assume( n_Test(b, r) );
+  
+  number c = npSubM(a,b,r);
+
+  assume( n_Test(c, r) );
+
+  return c;
+}
+
+BOOLEAN npIsZero (number  a, const coeffs r)
+{
+  assume( n_Test(a, r) );
+  
   return 0 == (long)a;
 }
 
-BOOLEAN npIsOne (number a, const coeffs)
-{
+BOOLEAN npIsOne (number a, const coeffs r)
+{
+  assume( n_Test(a, r) );
+  
   return 1 == (long)a;
 }
@@ -94 +137 @@
 BOOLEAN npIsMOne (number a, const coeffs r)
 {
+  assume( n_Test(a, r) );
+  
   return ((r->npPminus1M == (long)a)&&((long)1!=(long)a));
 }
@@ -144 +189 @@
 inline number npInversM (number c, const coeffs r)
 {
+  assume( n_Test(c, r) );
 #ifndef HAVE_DIV_MOD
-  return (number)(long)r->npExpTable[r->npPminus1M - r->npLogTable[(long)c]];
+  number d = (number)(long)r->npExpTable[r->npPminus1M - r->npLogTable[(long)c]];
 #else
   long inv=(long)r->npInvTable[(long)c];
@@ -153 +199 @@
     r->npInvTable[(long)c]=inv;
   }
-  return (number)inv;
-#endif
+  number d = (number)inv;
+#endif
+  assume( n_Test(d, r) );
+  return d;
+
 }
 
 number npDiv (number a,number b, const coeffs r)
 {
+  assume( n_Test(a, r) );
+  assume( n_Test(b, r) );
+
 //#ifdef NV_OPS
 //  if (npPrimeM>NV_MAX_PRIME)
@@ -165 +217 @@
   if ((long)a==0)
     return (number)0;
+  number d;
+  
 #ifndef HAVE_DIV_MOD
   if ((long)b==0)
@@ -171 +225 @@
     return (number)0;
   }
-  else
-  {
-    int s = r->npLogTable[(long)a] - r->npLogTable[(long)b];
-    if (s < 0)
-      s += r->npPminus1M;
-    return (number)(long)r->npExpTable[s];
-  }
+  
+  int s = r->npLogTable[(long)a] - r->npLogTable[(long)b];
+  if (s < 0)
+    s += r->npPminus1M;
+  d = (number)(long)r->npExpTable[s];
 #else
   number inv=npInversM(b,r);
-  return npMultM(a,inv,r);
-#endif
+  d = npMultM(a,inv,r);
+#endif
+
+  assume( n_Test(d, r) );
+  return d;
+  
 }
 number  npInvers (number c, const coeffs r)
 {
+  assume( n_Test(c, r) );
+  
   if ((long)c==0)
   {
@@ -190 +248 @@
     return (number)0;
   }
-  return npInversM(c,r);
+  number d = npInversM(c,r);
+  
+  assume( n_Test(d, r) );
+  return d;
+  
 }
 
 number npNeg (number c, const coeffs r)
 {
+  assume( n_Test(c, r) );
+  
   if ((long)c==0) return c;
-  return npNegM(c,r);
-}
-
-BOOLEAN npGreater (number a,number b, const coeffs)
-{
+
+#if 0  
+  number d = npNegM(c,r);  
+  assume( n_Test(d, r) );
+  return d;
+#else
+  c = npNegM(c,r);  
+  assume( n_Test(c, r) );
+  return c;
+#endif  
+}
+
+BOOLEAN npGreater (number a,number b, const coeffs r)
+{
+  assume( n_Test(a, r) );
+  assume( n_Test(b, r) );
+
   //return (long)a != (long)b;
   return (long)a > (long)b;
@@ -207 +283 @@
 BOOLEAN npEqual (number a,number b, const coeffs r)
 {
+  assume( n_Test(a, r) );
+  assume( n_Test(b, r) );
+  
 //  return (long)a == (long)b;
+  
   return npEqualM(a,b,r);
 }
@@ -213 +293 @@
 void npWrite (number &a, const coeffs r)
 {
+  assume( n_Test(a, r) );
+  
   if ((long)a>(((long)r->ch) >>1)) StringAppend("-%d",(int)(((long)r->ch)-((long)a)));
   else                             StringAppend("%d",(int)((long)a));
@@ -219 +301 @@
 void npPower (number a, int i, number * result, const coeffs r)
 {
+  assume( n_Test(a, r) );
+
   if (i==0)
   {
@@ -281 +365 @@
     }
   }
+  assume( n_Test(*a, r) );
   return s;
 }