Changeset e1634d in git

Timestamp:

Jul 3, 2009, 4:38:34 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

52696b20f5e20bdcd5f1882fed6a5d8305356070

Parents:

6ea941e4848eccc89aab2b61d4293cb289fe287c

Message:

*hannes: syntax


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

Location:

kernel

Files:

• rmodulo2m.cc (modified) (2 diffs)
• rmodulon.cc (modified) (2 diffs)

kernel/rmodulo2m.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulo2m.cc,v 1.25 2009-07-03 13:14:10 seelisch Exp $ */
+/* $Id: rmodulo2m.cc,v 1.26 2009-07-03 14:38:34 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo 2^m
@@ -370 +370 @@
   */
   NATNUMBER g = 1;
-  NATNUMBER b_div = b;
+  NATNUMBER b_div = (NATNUMBER)b;
   if (b_div < 0) b_div = - b_div; // b_div now represents |b|
   NATNUMBER r = 0;

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.35 2009-07-03 13:14:10 seelisch Exp $ */
+/* $Id: rmodulon.cc,v 1.36 2009-07-03 14:38:34 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -338 +338 @@
           fulfills (1) and (2), i.e. r := t is the correct result. Hence
           in this third case, r is the remainder of division of a by g in Z.
+     Remark: according to mpz_mod: a,b are always non-negative
   */
   int_number g = (int_number) omAllocBin(gmp_nrn_bin);
-  int_number b_abs = (int_number) omAllocBin(gmp_nrn_bin);
   int_number r = (int_number) omAllocBin(gmp_nrn_bin);
   mpz_init(g);
-  mpz_init_set(b_abs,(int_number)b);
   mpz_init_set_si(r,(long)0);
-  if (mpz_isNeg(b_abs)) mpz_neg(b_abs, b_abs); // b_abs now represents |b|
-  mpz_gcd(g, (int_number) nrnModul, b_abs); // g is now as above
+  mpz_gcd(g, (int_number) nrnModul, (int_number)b); // g is now as above
   if (mpz_cmp_si(g, (long)1) != 0) mpz_mod(r, (int_number)a, g); // the case g <> 1
   mpz_clear(g);
-  mpz_clear(b_abs);
   omFreeBin(g, gmp_nrn_bin);
-  omFreeBin(b_abs, gmp_nrn_bin);
   return (number)r;
 }