Changeset ef1632 in git

Timestamp:

Apr 3, 2018, 3:01:22 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f67afed8d454f54035cff586aa3cf35a06a7280e

Parents:

414cce519189e70ffda5ff4b972038335e5df374

Message:

fix: arith in Z/2^m

File:

• libpolys/coeffs/rmodulo2m.cc (modified) (10 diffs)

libpolys/coeffs/rmodulo2m.cc

@@ -25 +25 @@
 #ifdef HAVE_RINGS
 
+#ifdef LDEBUG
+BOOLEAN nr2mDBTest(number a, const char *f, const int l, const coeffs r)
+{
+  if (((long)a<0L) || ((long)a>(long)r->mod2mMask))
+  {
+    Print("wrong mod 2^n number %ld at %s,%d\n",(long)a,f,l);
+    return FALSE;
+  }
+  return TRUE;
+}
+#endif
+
+
 static inline number nr2mMultM(number a, number b, const coeffs r)
 {
   return (number)
-    ((((unsigned long) a) * ((unsigned long) b)) & ((unsigned long)r->mod2mMask));
+    ((((unsigned long) a) * ((unsigned long) b)) & r->mod2mMask);
 }
 
@@ -34 +47 @@
 {
   return (number)
-    ((((unsigned long) a) + ((unsigned long) b)) & ((unsigned long)r->mod2mMask));
+    ((((unsigned long) a) + ((unsigned long) b)) & r->mod2mMask);
 }
 
@@ -40 +53 @@
 {
   return (number)((unsigned long)a < (unsigned long)b ?
-                       r->mod2mMask - (unsigned long)b + (unsigned long)a + 1:
+                       r->mod2mMask+1 - (unsigned long)b + (unsigned long)a:
                        (unsigned long)a - (unsigned long)b);
 }
 
-#define nr2mNegM(A,r) (number)((r->mod2mMask - (unsigned long)(A) + 1) & r->mod2mMask)
+#define nr2mNegM(A,r) (number)((r->mod2mMask+1 - (unsigned long)(A)) & r->mod2mMask)
 #define nr2mEqualM(A,B)  ((A)==(B))
 
@@ -82 +95 @@
 static coeffs nr2mQuot1(number c, const coeffs r)
 {
-    coeffs rr;
-    long ch = r->cfInt(c, r);
-    mpz_t a,b;
-    mpz_init_set(a, r->modNumber);
-    mpz_init_set_ui(b, ch);
-    mpz_ptr gcd;
-    gcd = (mpz_ptr) omAlloc(sizeof(mpz_t));
-    mpz_init(gcd);
-    mpz_gcd(gcd, a,b);
-    if(mpz_cmp_ui(gcd, 1) == 0)
-        {
-            WerrorS("constant in q-ideal is coprime to modulus in ground ring");
-            WerrorS("Unable to create qring!");
-            return NULL;
-        }
-    if(mpz_cmp_ui(gcd, 2) == 0)
+  coeffs rr;
+  long ch = r->cfInt(c, r);
+  mpz_t a,b;
+  mpz_init_set(a, r->modNumber);
+  mpz_init_set_ui(b, ch);
+  mpz_ptr gcd;
+  gcd = (mpz_ptr) omAlloc(sizeof(mpz_t));
+  mpz_init(gcd);
+  mpz_gcd(gcd, a,b);
+  if(mpz_cmp_ui(gcd, 1) == 0)
+  {
+    WerrorS("constant in q-ideal is coprime to modulus in ground ring");
+    WerrorS("Unable to create qring!");
+    return NULL;
+  }
+  if(mpz_cmp_ui(gcd, 2) == 0)
+  {
+    rr = nInitChar(n_Zp, (void*)2);
+  }
+  else
+  {
+    int kNew = 1;
+    mpz_t baseTokNew;
+    mpz_init(baseTokNew);
+    mpz_set(baseTokNew, r->modBase);
+    while(mpz_cmp(gcd, baseTokNew) > 0)
     {
-        rr = nInitChar(n_Zp, (void*)2);
+      kNew++;
+      mpz_mul(baseTokNew, baseTokNew, r->modBase);
     }
-    else
-    {
-        int kNew = 1;
-        mpz_t baseTokNew;
-        mpz_init(baseTokNew);
-        mpz_set(baseTokNew, r->modBase);
-        while(mpz_cmp(gcd, baseTokNew) > 0)
-        {
-          kNew++;
-          mpz_mul(baseTokNew, baseTokNew, r->modBase);
-        }
-        mpz_clear(baseTokNew);
-        rr = nInitChar(n_Z2m, (void*)(long)kNew);
-    }
-    return(rr);
+    mpz_clear(baseTokNew);
+    rr = nInitChar(n_Z2m, (void*)(long)kNew);
+  }
+  return(rr);
 }
 
@@ -131 +144 @@
 static number nr2mMult(number a, number b, const coeffs r)
 {
+  number n;
   if (((unsigned long)a == 0) || ((unsigned long)b == 0))
     return (number)0;
   else
-    return nr2mMultM(a, b, r);
+    n=nr2mMultM(a, b, r);
+  n_Test(n,r);
+  return n;
 }
 
@@ -340 +356 @@
 static long nr2mInt(number &n, const coeffs r)
 {
-  unsigned long nn = (unsigned long)(unsigned long)n & r->mod2mMask;
+  unsigned long nn = (unsigned long)n;
   unsigned long l = r->mod2mMask >> 1; l++; /* now: l = 2^(m-1) */
   if ((unsigned long)nn > l)
@@ -350 +366 @@
 static number nr2mAdd(number a, number b, const coeffs r)
 {
-  return nr2mAddM(a, b, r);
+  number n=nr2mAddM(a, b, r);
+  n_Test(n,r);
+  return n;
 }
 
 static number nr2mSub(number a, number b, const coeffs r)
 {
-  return nr2mSubM(a, b, r);
+  number n=nr2mSubM(a, b, r);
+  n_Test(n,r);
+  return n;
 }
 
@@ -411 +431 @@
     }
   }
-  return (number)nr2mMult(a, nr2mInversM(b,r),r);
+  number n=(number)nr2mMult(a, nr2mInversM(b,r),r);
+  n_Test(n,r);
+  return n;
 }
 
@@ -578 +600 @@
 {
   if ((unsigned long)c == 0) return c;
-  return nr2mNegM(c, r);
+  number n=nr2mNegM(c, r);
+  n_Test(n,r);
+  return n;
 }
 
 static number nr2mMapMachineInt(number from, const coeffs /*src*/, const coeffs dst)
 {
-  unsigned long i = ((unsigned long)from) % dst->mod2mMask ;
+  unsigned long i = ((unsigned long)from) % (dst->mod2mMask + 1) ;
   return (number)i;
 }
@@ -711 +735 @@
     WarnS("nr2mInitExp unexpectedly called with m = 1 (we continue with Z/2^2");
 }
-
-#ifdef LDEBUG
-static BOOLEAN nr2mDBTest (number a, const char *, const int, const coeffs r)
-{
-  //if ((unsigned long)a < 0) return FALSE; // is unsigned!
-  if (((unsigned long)a & r->mod2mMask) != (unsigned long)a) return FALSE;
-  return TRUE;
-}
-#endif
 
 static void nr2mWrite (number a, const coeffs r)