Changeset 97c4ad in git

Timestamp:

Feb 7, 2008, 2:43:55 PM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8a0aa21c22b9105b255d6aac7f0e8cb65969aa8a

Parents:

821a22ae8ecc6a0b779b6b960ba9b7a10b4225aa

Message:

kutil: gcd shortcut


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

Location:

kernel

Files:

• kutil.cc (modified) (2 diffs)
• rintegers.cc (modified) (3 diffs)
• rmodulon.cc (modified) (3 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.80 2008-02-07 08:40:59 wienand Exp $ */
+/* $Id: kutil.cc,v 1.81 2008-02-07 13:43:54 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2641 +2641 @@
 void enterExtendedSpoly(poly h,kStrategy strat)
 {
-  number gcd = nGcd((number) 0, pGetCoeff(h), strat->tailRing);
+  number gcd;
+  if (nDivBy((number) 0, pGetCoeff(h)))
+    gcd = nIntDiv((number) 0, pGetCoeff(h));
+  else
+    gcd = nGcd((number) 0, pGetCoeff(h), strat->tailRing);
   if (!nIsOne(gcd))
   {

kernel/rintegers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rintegers.cc,v 1.9 2008-02-06 09:12:47 wienand Exp $ */
+/* $Id: rintegers.cc,v 1.10 2008-02-07 13:43:55 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -24 +24 @@
 typedef MP_INT *int_number;
 omBin gmp_nrz_bin = omGetSpecBin(sizeof(MP_INT));
-number nrzOne = nrzInit(1);
 
 /*
@@ -148 +147 @@
 number  nrzGetUnit (number a)
 {
-  return nrzOne;
+  return nrzInit(1);
 }
 

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.19 2008-02-07 13:30:38 wienand Exp $ */
+/* $Id: rmodulon.cc,v 1.20 2008-02-07 13:43:55 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -232 +232 @@
 number  nrnGetUnit (number k)
 {
+  if (mpz_divisible_p(nrnModul, (int_number) k)) return nrnInt(1);
+
   int_number unit = (int_number) nrnGcd(k, 0, currRing);
   mpz_tdiv_q(unit, (int_number) k, unit);
@@ -267 +269 @@
 BOOLEAN nrnDivBy (number a,number b)
 {
-  return mpz_divisible_p((int_number) a, (int_number) b);
+  if (a == NULL)
+    return mpz_divisible_p(nrnModul, (int_number) b);
+  else
+    return mpz_divisible_p((int_number) a, (int_number) b);
   /*
   number bs = nrnGcd(a, b, NULL);