Changeset b18621 in git

Timestamp:

Jan 30, 2008, 11:21:53 AM (15 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

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

Children:

8e56ad409bb871477d7d51804d679aa766da743b

Parents:

9068b4e77df30887d291a2703d67ea9493994b5d

Message:

r*:
nIsMOne


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

Location:

kernel

Files:

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

kernel/rintegers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rintegers.cc,v 1.3 2007-06-20 13:19:41 wienand Exp $ */
+/* $Id: rintegers.cc,v 1.4 2008-01-30 10:21:53 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -143 +143 @@
 BOOLEAN nrzIsOne (number a)
 {
-  return 0 == mpz_cmp_si((int_number) a, 1);
+  int x = mpz_cmp_si((int_number) a, 1);
+  bool tmp = (0 == x);
+  return tmp;
+}
+
+BOOLEAN nrzIsMOne (number a)
+{
+  return 0 == mpz_cmp_si((int_number) a, -1);
 }
 
@@ -154 +161 @@
 {
   return 0 < mpz_cmp((int_number) a, (int_number) b);
+}
+
+BOOLEAN nrzGreaterZero (number k)
+{
+  return 0 <= mpz_cmp_si((int_number) k, 0);
 }
 
@@ -167 +179 @@
 {
   return mpz_divisible_p((int_number) a, (int_number) b) > 0;//TODO
-}
-
-BOOLEAN nrzGreaterZero (number k)
-{
-  return 0 <= mpz_cmp_si((int_number) k, 0);
-}
-
-BOOLEAN nrzIsMOne (number a)
-{
-  return 0 == mpz_cmp_si((int_number) a, 1);
 }
 

kernel/rmodulo2m.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulo2m.cc,v 1.13 2007-07-04 13:51:02 Singular Exp $ */
+/* $Id: rmodulo2m.cc,v 1.14 2008-01-30 10:21:53 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo 2^m
@@ -184 +184 @@
 BOOLEAN nr2mIsMOne (number a)
 {
-  return nr2mModul == (NATNUMBER)a + 1;
+  return (nr2mModul == (NATNUMBER)a + 1) && (nr2mModul != 2);
 }
 

kernel/rmodulon.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: rmodulon.cc,v 1.7 2007-06-26 18:34:16 wienand Exp $ */
+/* $Id: rmodulon.cc,v 1.8 2008-01-30 10:21:53 wienand Exp $ */
 /*
 * ABSTRACT: numbers modulo n
@@ -176 +176 @@
 BOOLEAN nrnIsMOne (number a)
 {
-  return nrnModul == (NATNUMBER)a + 1;
+  return (nrnModul == (NATNUMBER)a + 1)  && (nrnModul != 2);
 }