Changeset 1d03c4e in git

Timestamp:

Jan 17, 2009, 1:35:50 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

9655929209cd775b5b7cd5bc61d5b70c75f911b3

Parents:

32d2a9c9252a1380b1f12522da4f43553091f048

Message:

*hannes: fixed Div error


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

File:

• kernel/rintegers.cc (modified) (17 diffs)

kernel/rintegers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rintegers.cc,v 1.18 2008-12-08 15:00:43 Singular Exp $ */
+/* $Id: rintegers.cc,v 1.19 2009-01-17 12:35:50 Singular Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -29 +29 @@
 number nrzMult (number a, number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_mul(erg, (int_number) a, (int_number) b);
@@ -40 +40 @@
 number nrzLcm (number a,number b,ring r)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_lcm(erg, (int_number) a, (int_number) b);
@@ -52 +52 @@
 number nrzGcd (number a,number b,ring r)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_gcd(erg, (int_number) a, (int_number) b);
@@ -64 +64 @@
 number  nrzExtGcd (number a, number b, number *s, number *t)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
-  int_number bs = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
-  int_number bt = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
+  int_number bs = (int_number) omAllocBin(gmp_nrz_bin);
+  int_number bt = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_init(bs);
@@ -78 +78 @@
 void nrzPower (number a, int i, number * result)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_pow_ui(erg, (int_number) a, i);
@@ -89 +89 @@
 number nrzInit (int i)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init_set_si(erg, i);
   return (number) erg;
@@ -104 +104 @@
 number nrzCopy(number a)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init_set(erg, (int_number) a);
   return (number) erg;
@@ -130 +130 @@
 number nrzAdd (number a, number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_add(erg, (int_number) a, (int_number) b);
@@ -138 +138 @@
 number nrzSub (number a, number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_sub(erg, (int_number) a, (int_number) b);
@@ -199 +199 @@
 number nrzDiv (number a,number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
-  int_number r = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
-  mpz_init(erg);
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
+  mpz_init(erg);
+  int_number r = (int_number) omAllocBin(gmp_nrz_bin);
+  mpz_init(r);
   mpz_tdiv_qr(erg, r, (int_number) a, (int_number) b);
   if (!nrzIsZero((number) r))
@@ -215 +216 @@
 number nrzIntDiv (number a,number b)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   mpz_tdiv_q(erg, (int_number) a, (int_number) b);
@@ -233 +234 @@
 number nrzNeg (number c)
 {
-// nNeg inplace !!! TODO
-//  int_number erg = (int_number) omAllocBin(gmp_nrn_bin); // evtl. spaeter mit bin
-//  mpz_init(erg);
+// nNeg inplace !!!
   mpz_mul_si((int_number) c, (int_number) c, -1);
   return c;
@@ -242 +241 @@
 number nrzMapMachineInt(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init_set_ui(erg, (NATNUMBER) from);
   return (number) erg;
@@ -249 +248 @@
 number nrzMapZp(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init_set_si(erg, (long) from);
   return (number) erg;
@@ -256 +255 @@
 number nrzMapQ(number from)
 {
-  int_number erg = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
   nlGMP(from, (number) erg);
@@ -350 +349 @@
 const char * nrzRead (const char *s, number *a)
 {
-  int_number z = (int_number) omAllocBin(gmp_nrz_bin); // evtl. spaeter mit bin
+  int_number z = (int_number) omAllocBin(gmp_nrz_bin);
   {
     mpz_init(z);