Changeset 04deab in git

Timestamp:

Dec 8, 2009, 4:26:03 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

208e0c58de5059b78464045b5eb87c2009cbdb1d

Parents:

561aa20d93487cb95c506fc3281c4720f466070c

Message:

ring-indep. stuff for Z/2^n

git-svn-id: file:///usr/local/Singular/svn/trunk@12373 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• ring.cc (modified) (1 diff)
• rmodulo2m.cc (modified) (18 diffs)
• rmodulo2m.h (modified) (3 diffs)
• structs.h (modified) (1 diff)

kernel/ring.cc

@@ -551 +551 @@
     mpz_clear(r->ringflaga);
     omFree((ADDRESS)r->ringflaga);
+  }
+  if (r->nrnModul != NULL)
+  {
+    mpz_clear(r->nrnModul);
+    omFree((ADDRESS)r->nrnModul);
   }
 #endif

kernel/rmodulo2m.cc

@@ -23 +23 @@
 
 int nr2mExp;
-NATNUMBER nr2mModul;
 
 /*
@@ -133 +132 @@
 {
   long ii = i;
-  while (ii < 0) ii += nr2mModul;
-  while ((ii>1) && (ii >= nr2mModul)) ii -= nr2mModul;
+  while (ii < 0) ii += r->nr2mModul ;
+  while ((ii>1) && (ii >= r->nr2mModul )) ii -= r->nr2mModul ;
   return (number) ii;
 }
@@ -143 +142 @@
 int nr2mInt(number &n, const ring r)
 {
-  if ((NATNUMBER)n > (nr2mModul >>1)) return (int)((NATNUMBER)n - nr2mModul);
+  if ((NATNUMBER)n > (r->nr2mModul  >>1)) return (int)((NATNUMBER)n - r->nr2mModul );
   else return (int)((NATNUMBER)n);
 }
@@ -184 +183 @@
 BOOLEAN nr2mIsMOne (number a)
 {
-  return (nr2mModul == (NATNUMBER)a + 1) && (nr2mModul != 2);
+  return (currRing->nr2mModul  == (NATNUMBER)a + 1) 
+        && (currRing->nr2mModul != 2);
 }
 
@@ -200 +200 @@
 {
   if (a == NULL)
-    return (nr2mModul % (NATNUMBER) b) == 0;
+    return (currRing->nr2mModul  % (NATNUMBER) b) == 0;
   else
     return ((NATNUMBER) a % (NATNUMBER) b) == 0;
@@ -244 +244 @@
 BOOLEAN nr2mGreaterZero (number k)
 {
-  return ((NATNUMBER) k !=0) && ((NATNUMBER) k <= (nr2mModul>>1));
+  return ((NATNUMBER) k !=0) && ((NATNUMBER) k <= (currRing->nr2mModul >>1));
 }
 
@@ -304 +304 @@
    long d, s, t;
 
-   XGCD(d, s, t, a, nr2mModul);
+   XGCD(d, s, t, a, currRing->nr2mModul );
    assume (d == 1);
    if (s < 0)
-      return s + nr2mModul;
+      return s + currRing->nr2mModul ;
    else
       return s;
@@ -372 +372 @@
   if (b_div < 0) b_div = - b_div; // b_div now represents |b|
   NATNUMBER r = 0;
-  while ((g < nr2mModul) && (b_div > 0) && (b_div % 2 == 0))
+  while ((g < currRing->nr2mModul ) && (b_div > 0) && (b_div % 2 == 0))
   {
     b_div = b_div >> 1;
@@ -390 +390 @@
     if ((NATNUMBER)b==1)
       return (number) 0;
-    return (number) (nr2mModul / (NATNUMBER) b);
+    return (number) (currRing->nr2mModul  / (NATNUMBER) b);
   }
   else
@@ -418 +418 @@
 number nr2mMapMachineInt(number from)
 {
-  NATNUMBER i = ((NATNUMBER) from) % nr2mModul;
+  NATNUMBER i = ((NATNUMBER) from) % currRing->nr2mModul ;
   return (number) i;
 }
@@ -425 +425 @@
 {
   long ii = (long) from;
-  while (ii < 0) ii += nr2mModul;
-  while ((ii>1) && (ii >= nr2mModul)) ii -= nr2mModul;
+  while (ii < 0) ii += currRing->nr2mModul ;
+  while ((ii>1) && (ii >= currRing->nr2mModul )) ii -= currRing->nr2mModul ;
   return (number) ii;
 }
@@ -436 +436 @@
 
   nlGMP(from, (number) erg);
-  mpz_mod_ui(erg, erg, nr2mModul);
+  mpz_mod_ui(erg, erg, currRing->nr2mModul );
   number r = (number) mpz_get_ui(erg);
 
@@ -449 +449 @@
   mpz_init(erg);
 
-  mpz_mod_ui(erg, (int_number) from, nr2mModul);
+  mpz_mod_ui(erg, (int_number) from, currRing->nr2mModul );
   number r = (number) mpz_get_ui(erg);
 
@@ -506 +506 @@
   {
     nr2mExp = m;
-    nr2mModul = 2;
+    r->nr2mModul  = 2;
     for (int i = 1; i < m; i++)
     {
-      nr2mModul = nr2mModul * 2;
+      r->nr2mModul  = r->nr2mModul  * 2;
     }
   }
@@ -515 +515 @@
   {
     nr2mExp=2;
-    nr2mModul=4;
+    r->nr2mModul =4;
   }
 }
@@ -528 +528 @@
 BOOLEAN nr2mDBTest (number a, const char *f, const int l)
 {
-  if (((NATNUMBER)a<0) || ((NATNUMBER)a>nr2mModul))
+  if (((NATNUMBER)a<0) || ((NATNUMBER)a>currRing->nr2mModul ))
   {
     return FALSE;
@@ -538 +538 @@
 void nr2mWrite (number &a)
 {
-  if ((NATNUMBER)a > (nr2mModul >>1)) StringAppend("-%d",(int)(nr2mModul-((NATNUMBER)a)));
+  ring r=currRing;
+  if ((NATNUMBER)a > (r->nr2mModul  >>1))
+     StringAppend("-%d",(int)(r->nr2mModul -((NATNUMBER)a)));
   else                          StringAppend("%d",(int)((NATNUMBER)a));
 }
@@ -552 +554 @@
       (*i) *= 10;
       (*i) += *s++ - '0';
-      if ((*i) >= (MAX_INT_VAL / 10)) (*i) = (*i) % nr2mModul;
+      if ((*i) >= (MAX_INT_VAL / 10)) (*i) = (*i) % currRing->nr2mModul ;
     }
     while (((*s) >= '0') && ((*s) <= '9'));
-    if ((*i) >= nr2mModul) (*i) = (*i) % nr2mModul;
+    (*i) = (*i) % currRing->nr2mModul ;
   }
   else (*i) = 1;

kernel/rmodulo2m.h

@@ -52 +52 @@
 {
   return (number) 
-    ((((NATNUMBER) a)*((NATNUMBER) b)) % ((NATNUMBER) nr2mModul));
+    ((((NATNUMBER) a)*((NATNUMBER) b)) % ((NATNUMBER) currRing->nr2mModul));
 }
 
@@ -58 +58 @@
 {
   NATNUMBER r = (NATNUMBER)a + (NATNUMBER)b;
-  return (number) (r >= nr2mModul ? r - nr2mModul : r);
+  return (number) (r >= currRing->nr2mModul ? r - currRing->nr2mModul : r);
 }
 
@@ -64 +64 @@
 {
   return (number)((NATNUMBER)a<(NATNUMBER)b ?
-                       nr2mModul-(NATNUMBER)b+(NATNUMBER)a : (NATNUMBER)a-(NATNUMBER)b);
+                       currRing->nr2mModul-(NATNUMBER)b+(NATNUMBER)a : (NATNUMBER)a-(NATNUMBER)b);
 }
 
-#define nr2mNegM(A) (number)(nr2mModul-(NATNUMBER)(A))
+#define nr2mNegM(A) (number)(currRing->nr2mModul-(NATNUMBER)(A))
 #define nr2mEqualM(A,B)  ((A)==(B))
 

kernel/structs.h

@@ -630 +630 @@
 #ifdef HAVE_RINGS
   unsigned int  ringtype;  /* cring = 0 => coefficient field, cring = 1 => coeffs from Z/2^m */
-  int_number    ringflaga; /* Z/(ringfalga^ringflagb)=Z/nrnModul*/
+  int_number    ringflaga; /* Z/(ringflag^ringflagb)=Z/nrnModul*/
   unsigned long ringflagb;
+  unsigned long nr2mModul;  /* Z/nr2mModul */
   int_number    nrnModul;
 #endif