Changeset 1950d7 in git

Timestamp:

Oct 28, 2020, 12:51:54 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2694e4bb422106b6c10873c2b061ad87b870f453

Parents:

0a6f360449d9d3f50e2f00fcff58bd71f9c1917c

Message:

opt: nlGMP -> nlMPZ, nlMapGMP -> nlInitMPZ

Files:

• Singular/ipshell.cc (modified) (3 diffs)
• Singular/number2.cc (modified) (2 diffs)
• libpolys/coeffs/longrat.cc (modified) (5 diffs)
• libpolys/coeffs/longrat.h (modified) (1 diff)
• libpolys/coeffs/rintegers2.cc (modified) (1 diff)
• libpolys/coeffs/rmodulo2m.cc (modified) (1 diff)
• libpolys/coeffs/rmodulon.cc (modified) (1 diff)

Singular/ipshell.cc

@@ -1838 +1838 @@
   LL->Init(2);
   LL->m[0].rtyp=BIGINT_CMD;
-  LL->m[0].data=nlMapGMP((number) C->modBase, C, coeffs_BIGINT);
+  LL->m[0].data=n_InitMPZ( C->modBase, coeffs_BIGINT);
   LL->m[1].rtyp=INT_CMD;
   LL->m[1].data=(void *) C->modExponent;
@@ -1867 +1867 @@
   LL->Init(2);
   LL->m[0].rtyp=BIGINT_CMD;
-  LL->m[0].data=nlMapGMP((number) R->cf->modBase, R->cf, R->cf); // TODO: what is this?? // extern number nlMapGMP(number from, const coeffs src, const coeffs dst); // FIXME: replace with n_InitMPZ(R->cf->modBase, coeffs_BIGINT); ?
+  LL->m[0].data=n_InitMPZ( R->cf->modBase, R->cf);
   LL->m[1].rtyp=INT_CMD;
   LL->m[1].data=(void *) R->cf->modExponent;
@@ -5837 +5837 @@
       {
         number p=(number)pnn->next->CopyD();
-        nlGMP(p,modBase,coeffs_BIGINT); // TODO? // extern void   nlGMP(number &i, mpz_t n, const coeffs r); // FIXME: n_MPZ( modBase, p, coeffs_BIGINT); ?
+                n_MPZ(modBase,p,coeffs_BIGINT);
         n_Delete(&p,coeffs_BIGINT);
       }

Singular/number2.cc

@@ -4 +4 @@
 #include "coeffs/rmodulon.h" // ZnmInfo
 #include "coeffs/bigintmat.h" // bigintmat
-#include "coeffs/longrat.h" // BIGINTs: nlGMP
+#include "coeffs/longrat.h" // BIGINTs: nlMPZ
 #include "polys/ext_fields/algext.h" // AlgExtInfo
 #include "misc/prime.h" // IsPrime
@@ -94 +94 @@
     ZnmInfo info;
     mpz_t modBase;
-    mpz_init(modBase);
-    nlGMP(i2,modBase,coeffs_BIGINT); // FIXME? TODO? // extern void   nlGMP(number &i, mpz_t n, const coeffs r); // to be replaced with n_MPZ(modBase,i2,coeffs_BIGINT); // ?
+    nlMPZ(modBase,i2,coeffs_BIGINT);
     info.base= (mpz_ptr)modBase;
     info.exp= 1;

libpolys/coeffs/longrat.cc

@@ -63 +63 @@
 number   nlBigInt(number &n);
 
-#ifdef HAVE_RINGS
-number nlMapGMP(number from, const coeffs src, const coeffs dst);
-#endif
-
 BOOLEAN  nlGreaterZero(number za, const coeffs r);
 number   nlInvers(number a, const coeffs r);
@@ -166 +162 @@
 }
 
+static number nlInitMPZ(mpz_t m, const coeffs)
+{
+  number z = ALLOC_RNUMBER();
+  z->s = 3;
+  #ifdef LDEBUG
+  z->debug=123456;
+  #endif
+  mpz_init_set(z->z, m);
+  z=nlShort3(z);
+  return z;
+}
 
 #if (__GNU_MP_VERSION*10+__GNU_MP_VERSION_MINOR < 31)
@@ -197 +204 @@
 * convert from a GMP integer
 */
-number nlMapGMP(number from, const coeffs /*src*/, const coeffs /*dst*/)
-{
-  number z=ALLOC_RNUMBER();
-#if defined(LDEBUG)
-  z->debug=123456;
-#endif
-  mpz_init_set(z->z,(mpz_ptr) from);
-  z->s = 3;
-  z=nlShort3(z);
-  return z;
+static inline number nlMapGMP(number from, const coeffs /*src*/, const coeffs dst)
+{
+  return nlInitMPZ((mpz_ptr)from,dst);
 }
 
@@ -215 +215 @@
     return from;
   }
-  return nlMapGMP(from,src,dst);
+  return nlInitMPZ((mpz_ptr)from,dst);
 }
 
@@ -503 +503 @@
 }
 
-#ifndef P_NUMBERS_H
-
-static number nlInitMPZ(mpz_t m, const coeffs)
-{
-  number z = ALLOC_RNUMBER();
-  z->s = 3;
-  #ifdef LDEBUG
-  z->debug=123456;
-  #endif
-  mpz_init_set(z->z, m);
-  z=nlShort3(z);
-  return z;
-}
-#endif
 
 static number nlMapC(number from, const coeffs src, const coeffs dst)

libpolys/coeffs/longrat.h

@@ -119 +119 @@
 number   nlInit2gmp (mpz_t i, mpz_t j, const coeffs r);
 
-// FIXME: TODO:  why only if HAVE_RINGS? bug?
-#  ifdef HAVE_RINGS
-void   nlGMP(number &i, mpz_t n, const coeffs r); // to be replaced with n_MPZ(number n, number &i,const coeffs r)???
-number nlMapGMP(number from, const coeffs src, const coeffs dst);
-#  endif
+#if 0 // substituted by nlMPZ
+void   nlGMP(number &i, mpz_t n, const coeffs r);
+#endif
 // for ring similiar to Q/Z (char 0 required):
 number   nlChineseRemainderSym(number *x, number *q,int rl, BOOLEAN sym, CFArray &inv_cache,const coeffs CF);

libpolys/coeffs/rintegers2.cc

@@ -361 +361 @@
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
   mpz_init(erg);
-  nlGMP(from, erg, src); // FIXME? TODO? // extern void   nlGMP(number &i, number n, const coeffs r); // to be replaced with n_MPZ(erg, from, src); // ?
+  nlMPZ(erg, from, src);
   return (number) erg;
 }

libpolys/coeffs/rmodulo2m.cc

@@ -635 +635 @@
 {
   mpz_ptr gmp = (mpz_ptr)omAllocBin(gmp_nrz_bin);
-  mpz_init(gmp);
-  nlGMP(from, gmp, src); // FIXME? TODO? // extern void   nlGMP(number &i, number n, const coeffs r); // to be replaced with n_MPZ(erg, from, src); // ?
+  nlMPZ(gmp, from, src);
   number res=nr2mMapGMP((number)gmp,src,dst);
   mpz_clear(gmp); omFree((ADDRESS)gmp);

libpolys/coeffs/rmodulon.cc

@@ -711 +711 @@
 {
   mpz_ptr erg = (mpz_ptr)omAllocBin(gmp_nrz_bin);
-  mpz_init(erg);
-  nlGMP(from, erg, src); // FIXME? TODO? // extern void   nlGMP(number &i, number n, const coeffs r); // to be replaced with n_MPZ(erg, from, src); // ?
+  nlMPZ(erg, from, src);
   mpz_mod(erg, erg, dst->modNumber);
   return (number)erg;