Changeset 72f518 in git for libpolys

Timestamp:

Dec 2, 2016, 10:30:32 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

44b732cf21d0418e6797e04111cd38378ac2210e

Parents:

4c2cc11df5c1bc75cd355889dc6552e42c58f356

Message:

rintegers.cc: use static, implement nrzInitMPZ

File:

• libpolys/coeffs/rintegers.cc (modified) (31 diffs)

libpolys/coeffs/rintegers.cc

@@ -28 +28 @@
 #ifdef HAVE_RINGS
 
-
-number  nrzCopy        (number a, const coeffs r);
-int     nrzSize        (number a, const coeffs r);
-void    nrzDelete      (number *a, const coeffs r);
-BOOLEAN nrzGreaterZero (number k, const coeffs r);
-number  nrzMult        (number a, number b, const coeffs r);
-long    nrzInt         (number &n, const coeffs r);
-number  nrzAdd         (number a, number b, const coeffs r);
-number  nrzSub         (number a, number b, const coeffs r);
-void    nrzPower       (number a, int i, number * result, const coeffs r);
-BOOLEAN nrzIsZero      (number a, const coeffs r);
-BOOLEAN nrzIsOne       (number a, const coeffs r);
-BOOLEAN nrzIsMOne      (number a, const coeffs r);
-BOOLEAN nrzIsUnit      (number a, const coeffs r);
-number  nrzGetUnit     (number a, const coeffs r);
-number  nrzDiv         (number a, number b, const coeffs r);
-number  nrzExactDiv    (number a, number b, const coeffs r);
-number  nrzIntMod      (number a, number b, const coeffs r);
-number  nrzNeg         (number c, const coeffs r);
-number  nrzInvers      (number c, const coeffs r);
-BOOLEAN nrzGreater     (number a, number b, const coeffs r);
-BOOLEAN nrzDivBy       (number a, number b, const coeffs r);
-int     nrzDivComp     (number a, number b, const coeffs r);
-BOOLEAN nrzEqual       (number a, number b, const coeffs r);
-number  nrzLcm         (number a,number b, const coeffs r);
-number  nrzGcd         (number a,number b, const coeffs r);
-number  nrzExtGcd      (number a, number b, number *s, number *t, const coeffs r);
-nMapFunc nrzSetMap     (const coeffs src, const coeffs dst);
-void    nrzWrite       (number a, const coeffs r);
-const char *  nrzRead  (const char *s, number *a, const coeffs r);
-char *  nrzName        (number n, const coeffs r);
-void    nrzCoeffWrite  (const coeffs r, BOOLEAN details);
-#ifdef LDEBUG
-BOOLEAN nrzDBTest      (number a, const char *f, const int l, const coeffs r);
-#endif
-void    nrzSetExp(int c, coeffs r);
-void    nrzInitExp(int c, coeffs r);
-void    nrzDelete(number *a, const coeffs r);
-coeffs  nrzQuot1(number c, const coeffs r);
-
-//CanonicalForm nrzConvSingNFactoryN(number n, BOOLEAN setChar, const coeffs /*r*/);
-//number nrzConvFactoryNSingN(const CanonicalForm n, const coeffs r);
-
-number nrzMapQ(number from, const coeffs src, const coeffs dst);
-
-
 omBin gmp_nrz_bin = omGetSpecBin(sizeof(mpz_t));
 
@@ -80 +34 @@
  * Multiply two numbers
  */
-number nrzMult (number a, number b, const coeffs)
+static number nrzMult (number a, number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -91 +45 @@
  * Give the smallest non unit k, such that a * x = k = b * y has a solution
  */
-number nrzLcm (number a,number b,const coeffs)
+static number nrzLcm (number a,number b,const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -103 +57 @@
  * a solution.
  */
-number nrzGcd (number a,number b,const coeffs)
+static number nrzGcd (number a,number b,const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -115 +69 @@
  * a solution and r, s, s.t. k = s*a + t*b
  */
-number  nrzExtGcd (number a, number b, number *s, number *t, const coeffs)
+static number nrzExtGcd (number a, number b, number *s, number *t, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -129 +83 @@
 }
 
-number  nrzXExtGcd (number a, number b, number *s, number *t, number *u, number *v, const coeffs )
+static number nrzXExtGcd (number a, number b, number *s, number *t, number *u, number *v, const coeffs )
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -160 +114 @@
 }
 
-void nrzPower (number a, int i, number * result, const coeffs)
+static void nrzPower (number a, int i, number * result, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -178 +132 @@
 }
 
-void nrzDelete(number *a, const coeffs)
+static void nrzDelete(number *a, const coeffs)
 {
   if (*a == NULL) return;
@@ -186 +140 @@
 }
 
-number nrzCopy(number a, const coeffs)
+static number nrzCopy(number a, const coeffs)
 {
   if (a==NULL) return NULL;
@@ -201 +155 @@
 #endif
 
-int nrzSize(number a, const coeffs)
+static int nrzSize(number a, const coeffs)
 {
   if (a == NULL) return 0;
@@ -210 +164 @@
  * convert a number to int
  */
-long nrzInt(number &n, const coeffs)
+static long nrzInt(number &n, const coeffs)
 {
   return mpz_get_si( (mpz_ptr)n);
 }
 
-number nrzAdd (number a, number b, const coeffs)
+static number nrzAdd (number a, number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -223 +177 @@
 }
 
-number nrzSub (number a, number b, const coeffs)
+static number nrzSub (number a, number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -231 +185 @@
 }
 
-number  nrzGetUnit (number, const coeffs r)
+static number nrzGetUnit (number, const coeffs r)
 {
   return nrzInit(1, r);
 }
 
-BOOLEAN nrzIsUnit (number a, const coeffs)
+static BOOLEAN nrzIsUnit (number a, const coeffs)
 {
   return 0 == mpz_cmpabs_ui((mpz_ptr) a, 1);
 }
 
-BOOLEAN nrzIsZero (number  a, const coeffs)
+static BOOLEAN nrzIsZero (number  a, const coeffs)
 {
   return 0 == mpz_cmpabs_ui((mpz_ptr) a, 0);
 }
 
-BOOLEAN nrzIsOne (number a, const coeffs)
+static BOOLEAN nrzIsOne (number a, const coeffs)
 {
   return (a!=NULL) && (0 == mpz_cmp_si((mpz_ptr) a, 1));
 }
 
-BOOLEAN nrzIsMOne (number a, const coeffs)
+static BOOLEAN nrzIsMOne (number a, const coeffs)
 {
   return (a!=NULL) && (0 == mpz_cmp_si((mpz_ptr) a, -1));
 }
 
-BOOLEAN nrzEqual (number a,number b, const coeffs)
+static BOOLEAN nrzEqual (number a,number b, const coeffs)
 {
   return 0 == mpz_cmp((mpz_ptr) a, (mpz_ptr) b);
 }
 
-BOOLEAN nrzGreater (number a,number b, const coeffs)
+static BOOLEAN nrzGreater (number a,number b, const coeffs)
 {
   return 0 < mpz_cmp((mpz_ptr) a, (mpz_ptr) b);
 }
 
-BOOLEAN nrzGreaterZero (number k, const coeffs)
+static BOOLEAN nrzGreaterZero (number k, const coeffs)
 {
   return 0 < mpz_cmp_si((mpz_ptr) k, 0);
 }
 
-int nrzDivComp(number a, number b, const coeffs r)
+static BOOLEAN nrzDivBy (number a,number b, const coeffs)
+{
+  return mpz_divisible_p((mpz_ptr) a, (mpz_ptr) b) != 0;
+}
+
+static int nrzDivComp(number a, number b, const coeffs r)
 {
   if (nrzDivBy(a, b, r))
@@ -282 +241 @@
 }
 
-BOOLEAN nrzDivBy (number a,number b, const coeffs)
-{
-  return mpz_divisible_p((mpz_ptr) a, (mpz_ptr) b) != 0;
-}
-
-number nrzDiv (number a,number b, const coeffs)
+static number nrzDiv (number a,number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -304 +258 @@
 }
 
-number nrzExactDiv (number a,number b, const coeffs)
+static number nrzExactDiv (number a,number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -312 +266 @@
 }
 
-number nrzQuotRem (number a, number b, number * r, const coeffs )
+static number nrzQuotRem (number a, number b, number * r, const coeffs )
 {
   mpz_ptr qq = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -321 +275 @@
 }
 
-number nrzIntMod (number a,number b, const coeffs)
+static number nrzIntMod (number a,number b, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -333 +287 @@
 }
 
-number  nrzInvers (number c, const coeffs r)
+static number  nrzInvers (number c, const coeffs r)
 {
   if (!nrzIsUnit((number) c, r))
@@ -343 +297 @@
 }
 
-number nrzNeg (number c, const coeffs)
+static number nrzNeg (number c, const coeffs)
 {
 // nNeg inplace !!!
@@ -350 +304 @@
 }
 
-number nrzMapMachineInt(number from, const coeffs /*src*/, const coeffs /*dst*/)
+static number nrzMapMachineInt(number from, const coeffs /*src*/, const coeffs /*dst*/)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -357 +311 @@
 }
 
-number nrzMapZp(number from, const coeffs /*src*/, const coeffs /*dst*/)
+static number nrzMapZp(number from, const coeffs /*src*/, const coeffs /*dst*/)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -364 +318 @@
 }
 
-number nrzMapQ(number from, const coeffs src, const coeffs /*dst*/)
+static number nrzMapQ(number from, const coeffs src, const coeffs /*dst*/)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -372 +326 @@
 }
 
-nMapFunc nrzSetMap(const coeffs src, const coeffs /*dst*/)
+static nMapFunc nrzSetMap(const coeffs src, const coeffs /*dst*/)
 {
   /* dst = currRing */
@@ -400 +354 @@
 }
 
-
 /*
  * set the exponent (allocate and init tables) (TODO)
@@ -414 +367 @@
 
 #ifdef LDEBUG
-BOOLEAN nrzDBTest (number, const char *, const int, const coeffs)
+static BOOLEAN nrzDBTest (number, const char *, const int, const coeffs)
 {
   return TRUE;//TODO
@@ -488 +441 @@
 }
 
-const char * nrzRead (const char *s, number *a, const coeffs)
+static const char * nrzRead (const char *s, number *a, const coeffs)
 {
   mpz_ptr z = (mpz_ptr) omAllocBin(gmp_nrz_bin);
@@ -499 +452 @@
 }
 
-void    nrzCoeffWrite  (const coeffs, BOOLEAN /*details*/)
+static void nrzCoeffWrite  (const coeffs, BOOLEAN /*details*/)
 {
   PrintS("//   coeff. ring is : ZZ\n");
@@ -514 +467 @@
 }
 
-coeffs nrzQuot1(number c, const coeffs r)
+static coeffs nrzQuot1(number c, const coeffs r)
 {
     long ch = r->cfInt(c, r);
@@ -525 +478 @@
     coeffs rr = nInitChar(n_Zn, (void*)&info);
     return(rr);
+}
+
+static number nrzInitMPZ(mpz_t m, const coeffs)
+{
+  mpz_ptr z = (mpz_ptr) omAllocBin(gmp_nrz_bin);
+  mpz_init_set(z, m);
+  return (number)z;
 }
 
@@ -547 +507 @@
   r->cfExactDiv= nrzExactDiv;
   r->cfInit = nrzInit;
+  r->cfInitMPZ = nrzInitMPZ;
   r->cfSize  = nrzSize;
   r->cfInt  = nrzInt;
@@ -1084 +1045 @@
  * TODO: do not create an mpz if not necessary
  */
-number nrzInit (long i, const coeffs)
+static number nrzInit (long i, const coeffs)
 {
   mpz_ptr erg = (mpz_ptr) omAllocBin(gmp_nrz_bin);