Changeset d9a25e7 in git

Timestamp:

Jan 13, 2021, 3:49:35 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e37c4ea9c75bd6e3085b62192a568e3f7754921a

Parents:

d13b0189befa38be770476b393bffce13bd31e62

Message:

to GF from very, very long Z

File:

• libpolys/coeffs/ffields.cc (modified) (3 diffs)

libpolys/coeffs/ffields.cc

@@ -721 +721 @@
 }
 
+static number nfMapMPZ(number c, const coeffs src, const coeffs dst)
+{
+  mpz_t tmp;
+  mpz_init(tmp);
+  mpz_mod_ui(tmp,(mpz_ptr)c,dst->m_nfCharP);
+  long l=mpz_get_si(tmp);
+  return nfInit(l,dst);
+}
+
+static number nfInitMPZ(mpz_t m, const coeffs cf)
+{
+  mpz_t tmp;
+  mpz_init(tmp);
+  mpz_mod_ui(tmp,m,cf->m_nfCharP);
+  long l=mpz_get_si(tmp);
+  return nfInit(l,cf);
+}
+
 static number nfMapViaInt(number c, const coeffs src, const coeffs dst)
 {
-  int i=src->cfInt(c,src);
+  long i=src->cfInt(c,src);
   if (i==0) return (number)(long)dst->m_nfCharQ;
   while (i <  0)    i += dst->m_nfCharP;
   while (i >= dst->m_nfCharP) i -= dst->m_nfCharP;
-  if (i==0) return (number)(long)dst->m_nfCharQ;
-  unsigned short cc=0;
-  while (i>1)
-  {
-    cc=dst->m_nfPlus1Table[cc];
-    i--;
-  }
-#ifdef LDEBUG
-  nfTest((number)(long)cc, dst);
-#endif
-  return (number)(long)cc;
+  return nfInit(i,dst);
 }
 
@@ -789 +797 @@
   if (nCoeff_is_Z(src)) /* Z*/
   {
-    return nfMapViaInt;
+    return nfMapMPZ;
   }
   if (nCoeff_is_Zp(src) && (src->ch==dst->m_nfCharP)) /* Zp*/
@@ -865 +873 @@
   r->cfExactDiv= nfDiv;
   r->cfInit = nfInit;
+  r->cfInitMPZ = nfInitMPZ;
   //r->cfSize  = ndSize;
   r->cfInt  = nfInt;