Changeset aa2bcca in git

Timestamp:

Apr 18, 2012, 1:26:25 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

9127ccb90083f98a048e3f5e25884a44dd454af9

Parents:

bee6ff63b6fc5d2d112e32804d022769bcf39acf

Message:

fix: #414: output of n in Z/2^m (from master)

File:

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

libpolys/coeffs/rmodulo2m.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: numbers modulo 2^m
@@ -220 +219 @@
  * automatically casted to int
  */
-int nr2mInt(number &n, const coeffs r)
+static long nr2mLong(number &n, const coeffs r)
 {
   NATNUMBER nn = (unsigned long)(NATNUMBER)n & r->mod2mMask;
   unsigned long l = r->mod2mMask >> 1; l++; /* now: l = 2^(m-1) */
   if ((NATNUMBER)nn > l)
-    return (int)((NATNUMBER)nn - r->mod2mMask - 1);
-  else
-    return (int)((NATNUMBER)nn);
+    return (long)((NATNUMBER)nn - r->mod2mMask - 1);
+  else
+    return (long)((NATNUMBER)nn);
+}
+int nr2mInt(number &n, const coeffs r)
+{
+  return (int)nr2mLong(n,r);
 }
 
@@ -473 +476 @@
   NATNUMBER g = 1;
   NATNUMBER b_div = (NATNUMBER) b;
-  
+
   /*
    * b_div is unsigned, so that (b_div < 0) evaluates false at compile-time
@@ -674 +677 @@
 void nr2mWrite (number &a, const coeffs r)
 {
-  int i = nr2mInt(a, r);
-  StringAppend("%d", i);
+  long i = nr2mLong(a, r);
+  StringAppend("%ld", i);
 }