Changeset aa2bcca in git


Ignore:
Timestamp:
Apr 18, 2012, 1:26:25 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
9127ccb90083f98a048e3f5e25884a44dd454af9
Parents:
bee6ff63b6fc5d2d112e32804d022769bcf39acf
Message:
fix: #414: output of n in Z/2^m (from master)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/coeffs/rmodulo2m.cc

    rbee6ff raa2bcca  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id$ */
    54/*
    65* ABSTRACT: numbers modulo 2^m
     
    220219 * automatically casted to int
    221220 */
    222 int nr2mInt(number &n, const coeffs r)
     221static long nr2mLong(number &n, const coeffs r)
    223222{
    224223  NATNUMBER nn = (unsigned long)(NATNUMBER)n & r->mod2mMask;
    225224  unsigned long l = r->mod2mMask >> 1; l++; /* now: l = 2^(m-1) */
    226225  if ((NATNUMBER)nn > l)
    227     return (int)((NATNUMBER)nn - r->mod2mMask - 1);
    228   else
    229     return (int)((NATNUMBER)nn);
     226    return (long)((NATNUMBER)nn - r->mod2mMask - 1);
     227  else
     228    return (long)((NATNUMBER)nn);
     229}
     230int nr2mInt(number &n, const coeffs r)
     231{
     232  return (int)nr2mLong(n,r);
    230233}
    231234
     
    473476  NATNUMBER g = 1;
    474477  NATNUMBER b_div = (NATNUMBER) b;
    475  
     478
    476479  /*
    477480   * b_div is unsigned, so that (b_div < 0) evaluates false at compile-time
     
    674677void nr2mWrite (number &a, const coeffs r)
    675678{
    676   int i = nr2mInt(a, r);
    677   StringAppend("%d", i);
     679  long i = nr2mLong(a, r);
     680  StringAppend("%ld", i);
    678681}
    679682
Note: See TracChangeset for help on using the changeset viewer.