Changeset d22092f in git

Timestamp:

Jan 13, 2017, 6:55:16 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e85feda0c40361dfe1754b7c0fa791e33c600e71f22f22a625c09743d75f7358aecdd7eb5411298a

Parents:

f0bd4cf28bbb221bfdd95862537792a67c30ef12

Message:

ZZ: represention via longrat

Location:

libpolys/coeffs

Files:

• rintegers.cc (modified) (1 diff)
• rmodulon.cc (modified) (3 diffs)

libpolys/coeffs/rintegers.cc

@@ -159 +159 @@
 {
   if (a == NULL) return 0;
-  return ((mpz_ptr)a)->_mp_alloc;
+  return ABS(((mpz_ptr)a)->_mp_size);
 }
 

libpolys/coeffs/rmodulon.cc

@@ -686 +686 @@
 }
 
+static number nrnMapQ(number from, const coeffs src, const coeffs dst)
+{
+  mpz_ptr erg = (mpz_ptr)omAllocBin(gmp_nrz_bin);
+  mpz_init(erg);
+  nlGMP(from, (number)erg, src); // FIXME? TODO? // extern void   nlGMP(number &i, number n, const coeffs r); // to be replaced with n_MPZ(erg, from, src); // ?
+  mpz_mod(erg, erg, dst->modNumber);
+  return (number)erg;
+}
+
 #if SI_INTEGER_VARIANT==3
 static number nrnMapZ(number from, const coeffs /*src*/, const coeffs dst)
@@ -715 +724 @@
 #endif
 #if SI_INTEGER_VARIANT!=2
-static void nrnWrite (number a, const coeffs)
+void nrnWrite (number a, const coeffs)
 {
   char *s,*z;
@@ -732 +741 @@
 }
 #endif
-
-static number nrnMapQ(number from, const coeffs src, const coeffs dst)
-{
-  mpz_ptr erg = (mpz_ptr)omAllocBin(gmp_nrz_bin);
-  mpz_init(erg);
-  nlGMP(from, (number)erg, src); // FIXME? TODO? // extern void   nlGMP(number &i, number n, const coeffs r); // to be replaced with n_MPZ(erg, from, src); // ?
-  mpz_mod(erg, erg, dst->modNumber);
-  return (number)erg;
-}
 
 nMapFunc nrnSetMap(const coeffs src, const coeffs dst)