Changeset 54bb6b in git

Timestamp:

Jul 3, 2018, 5:23:27 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

acb07ec581d8593b7eb367dd1cbd785808f4ae86

Parents:

417a91a95b5bf03f8ca333971553909c72f2568f

Message:

opt: Z/n, Z: always !=NULL (except in Copy/Delete)

Location:

libpolys/coeffs

Files:

• rintegers.cc (modified) (8 diffs)
• rmodulon.cc (modified) (17 diffs)

libpolys/coeffs/rintegers.cc

@@ -135 +135 @@
 static void nrzDelete(number *a, const coeffs)
 {
-  if (*a == NULL) return;
-  mpz_clear((mpz_ptr) *a);
-  omFreeBin((ADDRESS) *a, gmp_nrz_bin);
-  *a = NULL;
+  if (*a != NULL)
+  {
+    mpz_clear((mpz_ptr) *a);
+    omFreeBin((ADDRESS) *a, gmp_nrz_bin);
+    *a = NULL;
+  }
 }
 
@@ -158 +160 @@
 static int nrzSize(number a, const coeffs)
 {
-  if (a == NULL) return 0;
-  return (((mpz_ptr)a)->_mp_alloc);
+  mpz_ptr p=(mpz_ptr)a;
+  int s=p->_mp_alloc;
+  if (s==1) s=(mpz_cmp_ui(p,0)!=0);
+  return s;
+
 }
 
@@ -203 +208 @@
 static BOOLEAN nrzIsOne (number a, const coeffs)
 {
-  return (a!=NULL) && (0 == mpz_cmp_ui((mpz_ptr) a, 1));
+  return (0 == mpz_cmp_ui((mpz_ptr) a, 1));
 }
 
 static BOOLEAN nrzIsMOne (number a, const coeffs)
 {
-  return (a!=NULL) && (0 == mpz_cmp_si((mpz_ptr) a, -1));
+  return (0 == mpz_cmp_si((mpz_ptr) a, -1));
 }
 
@@ -303 +308 @@
   {
     WerrorS("Non invertible element.");
-    return (number)0; //TODO
+    return (number)NULL;
   }
   return nrzCopy(c,r);
@@ -685 +690 @@
 static int nrzSize(number a, const coeffs)
 {
-  if (a == NULL) return 0;
   if (a==INT_TO_SR(0)) return 0;
   if (n_Z_IS_SMALL(a)) return 1;
@@ -717 +721 @@
 #endif
 {
-  if (n_Z_IS_SMALL(a) && n_Z_IS_SMALL(b)) {
+  if (n_Z_IS_SMALL(a) && n_Z_IS_SMALL(b))
+  {
   //from longrat.cc
     if (SR_TO_INT(a)==0)
@@ -1315 +1320 @@
 static BOOLEAN nrzIsZero (number  a, const coeffs)
 {
-  return (a==NULL) || (a==INT_TO_SR(0));
+  return (a==INT_TO_SR(0));
 }
 
@@ -1483 +1488 @@
   {
     WerrorS("Non invertible element.");
-    return (number)0; //TODO
+    return (number)NULL;
   }
   return c; // has to be 1 or -1....

libpolys/coeffs/rmodulon.cc

@@ -164 +164 @@
 static void nrnDelete(number *a, const coeffs)
 {
-  if (*a == NULL) return;
-  mpz_clear((mpz_ptr) *a);
-  omFreeBin((void *) *a, gmp_nrz_bin);
-  *a = NULL;
+  if (*a != NULL)
+  {
+    mpz_clear((mpz_ptr) *a);
+    omFreeBin((void *) *a, gmp_nrz_bin);
+    *a = NULL;
+  }
 }
 
 static int nrnSize(number a, const coeffs)
 {
-  if (a == NULL) return 0;
   mpz_ptr p=(mpz_ptr)a;
   int s=p->_mp_alloc;
+  if (s==1) s=(mpz_cmp_ui(p,0)!=0);
   return s;
 }
@@ -226 +228 @@
 static BOOLEAN nrnIsZero(number a, const coeffs)
 {
-#ifdef LDEBUG
-  if (a == NULL) return FALSE;
-#endif
   return 0 == mpz_cmpabs_ui((mpz_ptr)a, 0);
 }
@@ -251 +250 @@
  * Give the largest k, such that a = x * k, b = y * k has
  * a solution.
+ * a may be NULL, b not
  */
 static number nrnGcd(number a, number b, const coeffs r)
 {
-  if ((a == NULL) && (b == NULL)) return nrnInit(0,r);
   mpz_ptr erg = (mpz_ptr)omAllocBin(gmp_nrz_bin);
   mpz_init_set(erg, r->modNumber);
   if (a != NULL) mpz_gcd(erg, erg, (mpz_ptr)a);
-  if (b != NULL) mpz_gcd(erg, erg, (mpz_ptr)b);
+  mpz_gcd(erg, erg, (mpz_ptr)b);
   if(mpz_cmp(erg,r->modNumber)==0)
   {
@@ -323 +322 @@
 static BOOLEAN nrnIsOne(number a, const coeffs)
 {
-#ifdef LDEBUG
-  if (a == NULL) return FALSE;
-#endif
   return 0 == mpz_cmp_si((mpz_ptr)a, 1);
 }
@@ -338 +334 @@
   if (mpz_divisible_p(r->modNumber, (mpz_ptr)k)) return nrnInit(1,r);
 
-  mpz_ptr unit = (mpz_ptr)nrnGcd(k, 0, r);
+  mpz_ptr unit = (mpz_ptr)nrnGcd(NULL, k, r);
   mpz_tdiv_q(unit, (mpz_ptr)k, unit);
-  mpz_ptr gcd = (mpz_ptr)nrnGcd((number)unit, 0, r);
+  mpz_ptr gcd = (mpz_ptr)nrnGcd(NULL, (number)unit, r);
   if (!nrnIsOne((number)gcd,r))
   {
@@ -347 +343 @@
     mpz_ptr tmp = (mpz_ptr) nrnMult((number) unit,(number) unit,r);
     // gcd_new := gcd(tmp, 0)
-    mpz_ptr gcd_new = (mpz_ptr) nrnGcd((number) tmp, 0, r);
+    mpz_ptr gcd_new = (mpz_ptr) nrnGcd(NULL, (number) tmp, r);
     while (!nrnEqual((number) gcd_new,(number) gcd,r))
     {
@@ -364 +360 @@
     mpz_add(unit, unit, tmp);
     mpz_mod(unit, unit, r->modNumber);
-    nrnDelete((number*) &gcd_new, NULL);
-    nrnDelete((number*) &tmp, NULL);
-  }
-  nrnDelete((number*) &gcd, NULL);
+    nrnDelete((number*) &gcd_new, r);
+    nrnDelete((number*) &tmp, r);
+  }
+  nrnDelete((number*) &gcd, r);
   return (number)unit;
 }
@@ -473 +469 @@
 static BOOLEAN nrnIsMOne(number a, const coeffs r)
 {
-#ifdef LDEBUG
-  if (a == NULL) return FALSE;
-#endif
   if((r->ch==2) && (nrnIsOne(a,r))) return FALSE;
   mpz_t t; mpz_init_set(t, (mpz_ptr)a);
@@ -511 +504 @@
   number tmp = nrnGcd(a, (number)r->modNumber, r);
   bool res = nrnIsOne(tmp, r);
-  nrnDelete(&tmp, NULL);
+  nrnDelete(&tmp, r);
   return res;
 }
@@ -520 +513 @@
   mpz_init(tmp);
   mpz_gcd(tmp, (mpz_ptr) k, r->modNumber);
-  if (mpz_cmp_si(tmp, 1)==0) {
+  if (mpz_cmp_si(tmp, 1)==0)
+  {
     mpz_set_ui(tmp, 0);
     return (number) tmp;
@@ -530 +524 @@
 static BOOLEAN nrnDivBy(number a, number b, const coeffs r)
 {
-  if (a == NULL)
-    return mpz_divisible_p(r->modNumber, (mpz_ptr)b);
-  else
-  { /* b divides a iff b/gcd(a, b) is a unit in the given ring: */
-    number n = nrnGcd(a, b, r);
-    mpz_tdiv_q((mpz_ptr)n, (mpz_ptr)b, (mpz_ptr)n);
-    bool result = nrnIsUnit(n, r);
-    nrnDelete(&n, NULL);
-    return result;
-  }
+  /* b divides a iff b/gcd(a, b) is a unit in the given ring: */
+  number n = nrnGcd(a, b, r);
+  mpz_tdiv_q((mpz_ptr)n, (mpz_ptr)b, (mpz_ptr)n);
+  bool result = nrnIsUnit(n, r);
+  nrnDelete(&n, NULL);
+  return result;
 }
 
@@ -559 +549 @@
     return erg;
   }
-  if (a == NULL) a = (number)r->modNumber;
   mpz_ptr erg = (mpz_ptr)omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
@@ -574 +563 @@
     {
       WerrorS("Division not possible, even by cancelling zero divisors.");
-      WerrorS("Result is integer division without remainder.");
-      mpz_tdiv_q(erg, (mpz_ptr) a, (mpz_ptr) b);
-      nrnDelete((number*) &gcd, NULL);
-      return (number)erg;
+      nrnDelete((number*) &gcd, r);
+      nrnDelete((number*) &erg, r);
+      return (number)NULL;
     }
     // a / gcd(a,b) * [b / gcd (a,b)]^(-1)
@@ -583 +571 @@
     mpz_divexact(erg, (mpz_ptr)a, gcd);
     mpz_mul(erg, erg, tmp);
-    nrnDelete((number*) &gcd, NULL);
-    nrnDelete((number*) &tmp, NULL);
+    nrnDelete((number*) &gcd, r);
+    nrnDelete((number*) &tmp, r);
     mpz_mod(erg, erg, r->modNumber);
     return (number)erg;
@@ -626 +614 @@
   mpz_ptr erg = (mpz_ptr)omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
-  if (a == NULL) a = (number)r->modNumber;
   mpz_tdiv_q(erg, (mpz_ptr)a, (mpz_ptr)b);
   return (number)erg;
@@ -838 +825 @@
       }
       else
-      if (nrnDivBy(NULL, (number) nrnMapModul,dst))
+      if (mpz_divisible_p(dst->modNumber,nrnMapModul))
       {
         mpz_divexact(nrnMapCoef, dst->modNumber, nrnMapModul);
@@ -901 +888 @@
 BOOLEAN nrnDBTest (number a, const char *f, const int l, const coeffs r)
 {
-  if (a==NULL) return TRUE;
   if ( (mpz_sgn1((mpz_ptr) a) < 0) || (mpz_cmp((mpz_ptr) a, r->modNumber) > 0) )
   {