Changeset 994445 in git for kernel/rmodulo2m.h

Timestamp:

May 3, 2007, 3:50:10 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bf64c41bd9346d70ecaaab3ee59f58f5d9d766e8

Parents:

68f702755adfca2ca864e4c2c157ecd0db64cea8

Message:

Neuer Koeffizientenbereich Z/n
Neuer Makrodatentyp NATNUMBER = unsigned long
Bisschen aufgeraeumt


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

File:

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

kernel/rmodulo2m.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulo2m.h,v 1.3 2006-12-06 17:43:32 Singular Exp $ */
+/* $Id: rmodulo2m.h,v 1.4 2007-05-03 13:50:10 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo 2^m
@@ -12 +12 @@
 
 extern int nr2mExp;
-extern long nr2mModul;
+extern NATNUMBER nr2mModul;
 
 BOOLEAN nr2mGreaterZero (number k);
@@ -46 +46 @@
 {
   return (number) 
-    ((((unsigned long) a)*((unsigned long) b)) % ((unsigned long) nr2mModul));
+    ((((NATNUMBER) a)*((NATNUMBER) b)) % ((NATNUMBER) nr2mModul));
 }
 
 static inline number nr2mAddM(number a, number b)
 {
-  long r = (long)a + (long)b;
+  NATNUMBER r = (NATNUMBER)a + (NATNUMBER)b;
   return (number) (r >= nr2mModul ? r - nr2mModul : r);
 }
@@ -57 +57 @@
 static inline number nr2mSubM(number a, number b)
 {
-  return (number)((long)a<(long)b ?
-                       nr2mModul-(long)b+(long)a : (long)a-(long)b);
+  return (number)((NATNUMBER)a<(NATNUMBER)b ?
+                       nr2mModul-(NATNUMBER)b+(NATNUMBER)a : (NATNUMBER)a-(NATNUMBER)b);
 }
 
-#define nr2mNegM(A) (number)(nr2mModul-(long)(A))
+#define nr2mNegM(A) (number)(nr2mModul-(NATNUMBER)(A))
 #define nr2mEqualM(A,B)  ((A)==(B))