Changeset 045efb in git

Timestamp:

Aug 10, 2011, 7:43:14 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

5ff1d31f3d80f972b5abf4d4435d01cb9b033ffb

Parents:

b1ca9992c1a4e67c4f6161015c9bb3efd24c96f4

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-10 19:43:14+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:19:14+01:00

Message:

ADD: conversion between numbers and mpz_t (GMP integers)

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (2 diffs)
• longrat.cc (modified) (4 diffs)
• longrat.h (modified) (1 diff)
• numbers.cc (modified) (4 diffs)

libpolys/coeffs/coeffs.h

@@ -116 +116 @@
    // general stuff
    numberfunc cfMult, cfSub ,cfAdd ,cfDiv, cfIntDiv, cfIntMod, cfExactDiv;
+   
    /// init with an integer
    number  (*cfInit)(int i,const coeffs r);
+
+   /// init with a GMP integer
+   number  (*cfInitMPZ)(mpz_t i, const coeffs r);
+   
    /// how complicated, (0) => 0, or positive
    int     (*cfSize)(number n, const coeffs r);
-   /// convertion, 0 if impossible
+   
+   /// convertion to int, 0 if impossible
    int     (*cfInt)(number &n, const coeffs r);
 
+   /// Converts a non-negative number n into a GMP number, 0 if impossible
+   void     (*cfMPZ)(mpz_t result, number &n, const coeffs r);
+   
 #ifdef HAVE_RINGS
    int     (*cfDivComp)(number a,number b,const coeffs r);
@@ -374 +383 @@
 { assume(r != NULL); assume(r->cfInit!=NULL); return r->cfInit(i,r); }
 
+/// conversion of a GMP integer to number
+static inline number n_Init(mpz_t n,     const coeffs r)
+{ assume(r != NULL); assume(r->cfInitMPZ != NULL); return r->cfInitMPZ(n,r); }
+
 /// conversion of n to an int; 0 if not possible
 /// in Z/pZ: the representing int lying in (-p/2 .. p/2]
 static inline int n_Int(number &n,       const coeffs r)
 { assume(r != NULL); assume(r->cfInt!=NULL); return r->cfInt(n,r); }
+
+/// conversion of n to a GMP integer; 0 if not possible
+static inline void n_MPZ(mpz_t result, number &n,       const coeffs r)
+{ assume(r != NULL); assume(r->cfMPZ!=NULL); r->cfMPZ(result, n, r); }
+
 
 /// in-place negation of n

libpolys/coeffs/longrat.cc

@@ -542 +542 @@
 }
 
+void nlMPZ(mpz_t m, number &n, const coeffs r)
+{
+  assume( getCoeffType(r) == ID );
+   
+  nlTest(n, r);
+  nlNormalize(n, r);
+  if (SR_HDL(n) & SR_INT) mpz_init_set_si(m, SR_TO_INT(n));     /* n fits in an int */
+  else             mpz_init_set(m, (mpz_ptr)n->z);
+}
+
+
 /*2
 * convert number to int
@@ -2091 +2102 @@
 }
 
-
 LINLINE number nlInit (int i, const coeffs r)
 {
@@ -2102 +2112 @@
 }
 
+
+number nlInitMPZ(mpz_t m, const coeffs r)
+{
+  number z = ALLOC_RNUMBER();
+  mpz_init_set(z->z, m);
+  mpz_init_set_ui(z->n, 1);
+  z->s = 3;
+  return z;   
+}
 
 /*2
@@ -2596 +2615 @@
   r->cfExactDiv= nlExactDiv;
   r->cfInit = nlInit;
+  r->cfInitMPZ = nlInitMPZ;
   r->cfSize  = nlSize;
   r->cfInt  = nlInt;
+  r->cfMPZ = nlMPZ;
+  
   r->cfChineseRemainder=nlChineseRemainder;
   r->cfFarey=nlFarey;

libpolys/coeffs/longrat.h

@@ -90 +90 @@
 number   nlChineseRemainder(number *x, number *q,int rl, const coeffs C);
 number   nlFarey(number nN, number nP, const coeffs CF);
+
 #ifdef LDEBUG
 BOOLEAN  nlDBTest(number a, const char *f, const int l);

libpolys/coeffs/numbers.cc

@@ -144 +144 @@
   Werror("no conversion from bigint to this field");
   return NULL;
+}
+
+/**< [in, out] a bigint number >= 0  */
+/**< [out] the GMP equivalent    */
+/// Converts a non-negative bigint number into a GMP number.
+void ndMPZ(mpz_t result, number &n, const coeffs r)
+{
+  mpz_init_set_si( result, n_Int(n, r) );
+}
+
+number ndInitMPZ(mpz_t m, const coeffs r)
+{ 
+  return n_Init( mpz_get_si(m), r);
 }
 
@@ -215 +228 @@
     n->cfLcm  = ndGcd; /* tricky, isn't it ?*/
     n->cfInit_bigint = ndInit_bigint;
+    n->cfInitMPZ = ndInitMPZ;
+    n->cfMPZ = ndMPZ;
+
     //n->cfKillChar = ndKillChar; /* dummy */
     // temp. removed to catch all the coeffs which miss to implement this!
@@ -266 +282 @@
     assume(n->cfExactDiv!=NULL);
     assume(n->cfInit!=NULL);
+    assume(n->cfInitMPZ!=NULL);
     assume(n->cfSize!=NULL);
     assume(n->cfInt!=NULL);
+    assume(n->cfMPZ!=NULL);
     //assume(n->n->cfDivComp!=NULL);
     //assume(n->cfIsUnit!=NULL);
@@ -295 +313 @@
     assume(n->cfName!=NULL);
     assume(n->cfInpMult!=NULL);
-    //assume(n->cfInit_bigint!=NULL);
+//    assume(n->cfInit_bigint!=NULL);
     assume(n->cfCoeffWrite != NULL);
 #ifdef LDEBUG