Changeset 20f29bb in git

Timestamp:

Apr 24, 2015, 2:06:33 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

4442f24da6fca98672573b143a53742e82d5b9c2

Parents:

769a27f375c14dbe7cac70321db6bb76ef18fb07

Message:

conversion of bigint to extension fields

Files:

• Tst/Short/conv_bi.res.gz.uu (added)
• Tst/Short/conv_bi.stat (added)
• Tst/Short/conv_bi.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)

Tst/Short/ok_s.lst

@@ -42 +42 @@
 bug_tr704
 bug_genus_etc
+conv_bi
 facstd
 fermat_gcd_1var

libpolys/coeffs/coeffs.h

@@ -824 +824 @@
 { assume(r != NULL); return getCoeffType(r)==n_Q && (r->is_field); }
 
+static FORCE_INLINE BOOLEAN nCoeff_is_Q_or_BI(const coeffs r)
+{ assume(r != NULL); return getCoeffType(r)==n_Q; }
+
 static FORCE_INLINE BOOLEAN nCoeff_is_numeric(const coeffs r) /* R, long R, long C */
 { assume(r != NULL);  return (getCoeffType(r)==n_R) || (getCoeffType(r)==n_long_R) || (getCoeffType(r)==n_long_C); }

libpolys/polys/ext_fields/algext.cc

@@ -1054 +1054 @@
     if (nCoeff_is_Zp(src) && nCoeff_is_Q(bDst))
       return naMapP0;                            /// Z/p   -->  Q(a)
-    if (nCoeff_is_Q(src) && nCoeff_is_Zp(bDst))
+    if (nCoeff_is_Q_or_BI(src) && nCoeff_is_Zp(bDst))
       return naMap0P;                            /// Q      --> Z/p(a)
     if ((src->rep==n_rep_gap_gmp) && nCoeff_is_Zp(bDst))
@@ -1066 +1066 @@
   if (h != 1) return NULL;
   if ((!nCoeff_is_Zp(bDst)) && (!nCoeff_is_Q(bDst))) return NULL;
-  if ((!nCoeff_is_Zp(bSrc)) && (!nCoeff_is_Q(bSrc))) return NULL;
+  if ((!nCoeff_is_Zp(bSrc)) && (!nCoeff_is_Q_or_BI(bSrc))) return NULL;
 
   nMapFunc nMap=n_SetMap(src->extRing->cf,dst->extRing->cf);

libpolys/polys/ext_fields/transext.cc

@@ -1962 +1962 @@
     if (nCoeff_is_Zp(src) && nCoeff_is_Q(bDst))
       return ntMapP0;                                 /// Z/p     -->  Q(T)
-    if (nCoeff_is_Q(src) && nCoeff_is_Zp(bDst))
+    if (nCoeff_is_Q_or_BI(src) && nCoeff_is_Zp(bDst))
       return ntMap0P;                                 /// Q       --> Z/p(T)
     if (nCoeff_is_Zp(src) && nCoeff_is_Zp(bDst))