Changeset 31c731 in git

Timestamp:

Sep 27, 2011, 12:05:01 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

1577ebd5335ce968d500335fe1900d966692ef82

Parents:

e9039a74ae2d173584dadd1c33af0b75e429a59b

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-27 12:05:01+02:00

git-committer:

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

Message:

fix some mapping stuff: alg.ext -> transz. ext.

File:

• libpolys/polys/ext_fields/transext.cc (modified) (9 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -270 +270 @@
   definiteGcdCancellation(a, cf, FALSE);
   fraction f = (fraction)a;
-  return DENIS1(f) && NUMIS1(f);
+  return (f!=NULL) && DENIS1(f) && NUMIS1(f);
 }
 
@@ -278 +278 @@
   definiteGcdCancellation(a, cf, FALSE);
   fraction f = (fraction)a;
-  if (!DENIS1(f)) return FALSE;
+  if ((f==NULL) || (!DENIS1(f))) return FALSE;
   poly g = NUM(f);
   if (!p_IsConstant(g, ntRing)) return FALSE;
@@ -983 +983 @@
 }
 
+number ntCopyAlg(number a, const coeffs src, const coeffs dst)
+{
+  if (n_IsZero(a, src)) return NULL;
+  fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
+  NUM(f) = p_Copy((poly)a,src->extRing);// DEN(f) = NULL; COM(f) = 0;
+  return (number)f;
+}
+
 /* assumes that src = Q, dst = Z/p(t_1, ..., t_s) */
 number ntMap0P(number a, const coeffs src, const coeffs dst)
@@ -999 +1007 @@
   p_SetCoeff(g, q, dst->extRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(f) = g; DEN(f) = NULL; COM(f) = 0;
+  NUM(f) = g; // DEN(f) = NULL; COM(f) = 0;
   return (number)f;
 }
@@ -1045 +1053 @@
   /* for the time being, we only provide maps if h = 1 and if b is Q or
      some field Z/pZ: */
+  if (h==0)
+  {
+    if (nCoeff_is_Q(src) && nCoeff_is_Q(bDst))
+      return ntMap00;                                 /// Q       -->  Q(T)
+    if (nCoeff_is_Zp(src) && nCoeff_is_Q(bDst))
+      return ntMapP0;                                 /// Z/p     -->  Q(T)
+    if (nCoeff_is_Q(src) && nCoeff_is_Zp(bDst))
+      return ntMap0P;                                 /// Q       --> Z/p(T)
+    if (nCoeff_is_Zp(src) && nCoeff_is_Zp(bDst))
+    {
+      if (src->ch == dst->ch) return ntMapPP;         /// Z/p     --> Z/p(T)
+      else return ntMapUP;                            /// Z/u     --> Z/p(T)
+    }
+  }
   if (h != 1) return NULL;
   if ((!nCoeff_is_Zp(bDst)) && (!nCoeff_is_Q(bDst))) return NULL;
@@ -1053 +1075 @@
      of the form t_1, ..., t_w with w <= s. */
   
-  if (nCoeff_is_Q(src) && nCoeff_is_Q(bDst))
-    return ntMap00;                                      /// Q       -->  Q(T)
-  
-  if (nCoeff_is_Zp(src) && nCoeff_is_Q(bDst))
-    return ntMapP0;                                      /// Z/p     -->  Q(T)
-  
-  if (nCoeff_is_Q(src) && nCoeff_is_Zp(bDst))
-    return ntMap0P;                                      /// Q       --> Z/p(T)
-  
-  if (nCoeff_is_Zp(src) && nCoeff_is_Zp(bDst))
-  {
-    if (src->ch == dst->ch) return ntMapPP;              /// Z/p     --> Z/p(T)
-    else return ntMapUP;                                 /// Z/u     --> Z/p(T)
-  }
-  
   coeffs bSrc = nCoeff_bottom(src, h); /* the bottom field in the tower src */
   if (h != 1) return NULL;
@@ -1078 +1085 @@
       if (strcmp(rRingVar(i, src->extRing),
                  rRingVar(i, dst->extRing)) != 0) return NULL;
-      return ntCopyMap;                                  /// Q(T')   --> Q(T)
+      if (src->type==n_transExt)
+        return ntCopyMap;                              /// Q(T')   --> Q(T)
+      else
+        return ntCopyAlg;
   }
   
@@ -1087 +1097 @@
       if (strcmp(rRingVar(i, src->extRing),
                  rRingVar(i, dst->extRing)) != 0) return NULL;
-      return ntCopyMap;                                  /// Z/p(T') --> Z/p(T)
+      if (src->type==n_transExt)
+        return ntCopyMap;                              /// Z/p(T') --> Z/p(T)
+      else
+        return ntCopyAlg;
   }
   
@@ -1093 +1106 @@
 }
 
-void ntKillChar(coeffs cf) {
+void ntKillChar(coeffs cf)
+{
   if ((--cf->extRing->ref) == 0)
     rDelete(cf->extRing);