Changeset 52f3e2 in git for libpolys/coeffs

Timestamp:

Oct 30, 2017, 5:22:14 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

79cf8deb6345ba7a1926425bdd8e4a960457dd8e

Parents:

a0d56992e4e80ffc9703185cade05f3a601f3645

Message:

opt: better 0-test for mpz_t

Location:

libpolys/coeffs

Files:

• flintcf_Q.cc (modified) (1 diff)
• longrat.cc (modified) (13 diffs)
• rintegers.cc (modified) (5 diffs)
• rmodulo2m.cc (modified) (2 diffs)
• rmodulon.cc (modified) (2 diffs)
• si_gmp.h (modified) (1 diff)

libpolys/coeffs/flintcf_Q.cc

@@ -264 +264 @@
     mpq_get_num(num,m);
     mpq_get_den(den,m);
-    if (mpz_cmp_ui(num,0)!=0)
+    if (mpz_sgn1(num)!=0)
     {
-      if (need_plus && (mpz_cmp_si(num,0)>0))
+      if (need_plus && (mpz_sgn1(num)>0))
         StringAppendS("+");
       need_plus=TRUE;

libpolys/coeffs/longrat.cc

@@ -116 +116 @@
 {
   assume(x->s==3);
-  if (mpz_cmp_ui(x->z,0L)==0)
+  if (mpz_sgn1(x->z)==0)
   {
     mpz_clear(x->z);
@@ -149 +149 @@
 
 #define MP_SMALL 1
-//#define mpz_isNeg(A) (mpz_cmp_si(A,0L)<0)
+//#define mpz_isNeg(A) (mpz_sgn1(A)<0)
 #define mpz_isNeg(A) ((A)->_mp_size<0)
 #define mpz_limb_size(A) ((A)->_mp_size)
@@ -1325 +1325 @@
 {
   assume(x->s<2);
-  if (mpz_cmp_ui(x->z,0L)==0)
+  if (mpz_sgn1(x->z)==0)
   {
     _nlDelete_NoImm(&x);
@@ -1703 +1703 @@
         mpz_add(u->z,b->z,x);
         mpz_clear(x);
-        if (mpz_cmp_ui(u->z,0L)==0)
+        if (mpz_sgn1(u->z)==0)
         {
           mpz_clear(u->z);
@@ -1752 +1752 @@
             mpz_clear(x);
 
-            if (mpz_cmp_ui(u->z,0L)==0)
+            if (mpz_sgn1(u->z)==0)
             {
               mpz_clear(u->z);
@@ -1775 +1775 @@
             mpz_mul(u->z,b->z,a->n);
             mpz_add(u->z,u->z,a->z);
-            if (mpz_cmp_ui(u->z,0L)==0)
+            if (mpz_sgn1(u->z)==0)
             {
               mpz_clear(u->z);
@@ -1804 +1804 @@
             mpz_mul(u->z,a->z,b->n);
             mpz_add(u->z,u->z,b->z);
-            if (mpz_cmp_ui(u->z,0L)==0)
+            if (mpz_sgn1(u->z)==0)
             {
               mpz_clear(u->z);
@@ -1998 +1998 @@
         mpz_sub(u->z,x,b->z);
         mpz_clear(x);
-        if (mpz_cmp_ui(u->z,0L)==0)
+        if (mpz_sgn1(u->z)==0)
         {
           mpz_clear(u->z);
@@ -2045 +2045 @@
         mpz_sub(u->z,a->z,x);
         mpz_clear(x);
-        if (mpz_cmp_ui(u->z,0L)==0)
+        if (mpz_sgn1(u->z)==0)
         {
           mpz_clear(u->z);
@@ -2099 +2099 @@
             mpz_clear(x);
             mpz_clear(y);
-            if (mpz_cmp_ui(u->z,0L)==0)
+            if (mpz_sgn1(u->z)==0)
             {
               mpz_clear(u->z);
@@ -2125 +2125 @@
             mpz_sub(u->z,a->z,x);
             mpz_clear(x);
-            if (mpz_cmp_ui(u->z,0L)==0)
+            if (mpz_sgn1(u->z)==0)
             {
               mpz_clear(u->z);
@@ -2157 +2157 @@
             mpz_sub(u->z,x,b->z);
             mpz_clear(x);
-            if (mpz_cmp_ui(u->z,0L)==0)
+            if (mpz_sgn1(u->z)==0)
             {
               mpz_clear(u->z);
@@ -2823 +2823 @@
   mpz_init2(tmp,bits);
   number z=INT_TO_SR(0);
-  while(mpz_cmp_si(N,0L)!=0)
+  while(mpz_sgn1(N)!=0)
   {
     mpz_mul(tmp,N,N);

libpolys/coeffs/rintegers.cc

@@ -203 +203 @@
 static BOOLEAN nrzIsOne (number a, const coeffs)
 {
-  return (a!=NULL) && (0 == mpz_cmp_si((mpz_ptr) a, 1));
+  return (a!=NULL) && (0 == mpz_cmp_ui((mpz_ptr) a, 1));
 }
 
@@ -223 +223 @@
 static BOOLEAN nrzGreaterZero (number k, const coeffs)
 {
-  return 0 < mpz_cmp_si((mpz_ptr) k, 0);
+  return 0 < mpz_sgn1((mpz_ptr) k);
 }
 
@@ -653 +653 @@
   nrzWrite(x, NULL);
 #endif
-  if (mpz_cmp_ui((mpz_ptr) x,0L)==0)
+  if (mpz_sgn1((mpz_ptr) x)==0)
   {
     mpz_clear((mpz_ptr)x);
@@ -1423 +1423 @@
 #endif
 
-  if (mpz_cmp_si(r, 0)!=0)
+  if (mpz_sgn1(r)!=0)
   {
     //WerrorS("4:Division by non divisible element.");
@@ -1645 +1645 @@
 {
   if (SR_HDL(x) & SR_INT) return TRUE;
-  if (mpz_cmp_ui((mpz_ptr) x,0L)==0)
+  if (mpz_sgn1((mpz_ptr) x)==0)
   {
     Print("gmp-0 %s:%d\n",f,l);

libpolys/coeffs/rmodulo2m.cc

@@ -212 +212 @@
   mpz_init(rr);
 
-  while (mpz_cmp_ui(v, 0) != 0) /* i.e., while v != 0 */
+  while (mpz_sgn1(v) != 0) /* i.e., while v != 0 */
   {
     mpz_div(q, u, v);
@@ -226 +226 @@
   }
 
-  while (mpz_cmp_ui(u1, 0) < 0) /* i.e., while u1 < 0 */
+  while (mpz_sgn1(u1) < 0) /* i.e., while u1 < 0 */
   {
     /* we add 2^m = (2^m - 1) + 1 to u1: */

libpolys/coeffs/rmodulon.cc

@@ -481 +481 @@
 static BOOLEAN nrnGreaterZero(number k, const coeffs)
 {
-  return 0 < mpz_cmp_si((mpz_ptr)k, 0);
+  return 0 < mpz_sgn1((mpz_ptr)k);
 }
 
@@ -850 +850 @@
 
 #ifdef LDEBUG
-BOOLEAN nrnDBTest (number a, const char *, const int, const coeffs r)
+BOOLEAN nrnDBTest (number a, const char *f, const int l, const coeffs r)
 {
   if (a==NULL) return TRUE;
-  if ( (mpz_cmp_si((mpz_ptr) a, 0) < 0) || (mpz_cmp((mpz_ptr) a, r->modNumber) > 0) )
-  {
+  if ( (mpz_sgn1((mpz_ptr) a) < 0) || (mpz_cmp((mpz_ptr) a, r->modNumber) > 0) )
+  {
+    Warn("mod-n: out of range at %s:%d\n",f,l);
     return FALSE;
   }

libpolys/coeffs/si_gmp.h

@@ -11 +11 @@
 // This is taken from longrat.h: it seems to be generally GMP-related
 #define mpz_size1(A) (ABS((A)->_mp_size))
+#define mpz_sgn1(A) ((A)->_mp_size)
 //#define mpz_size1(A) mpz_size(A)
 #endif // mpz_size1