Changeset 04deab in git for kernel/rmodulo2m.h

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '2fa36c576e6a4ddbb1093b43c7f8e9835e17e52a')

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

File:

• kernel/rmodulo2m.h (modified) (3 diffs)

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))