Changeset 0654122 in git

Timestamp:

May 10, 2011, 2:45:00 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

643b1eba3ef81d25890fada39f203bb96b71bd49

Parents:

7d73857bd54e9bc8480c720d2a0c39dae20a94ed

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-10 14:45:00+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:41+01:00

Message:

fixes in impl. of alg. ext. field / ifdef factory stuff

Location:

libpolys/polys

Files:

• ext_fields/algext.cc (modified) (2 diffs)
• monomials/p_polys.cc (modified) (1 diff)

libpolys/polys/ext_fields/algext.cc

@@ -511 +511 @@
 }
 
-nMapFunc naSetMap(const ring src, const ring dst)
-{
-  /* dst->cf is expected to be an (algebraic) extension field */
-  assume(dst->cf->type == n_Ext);
-  
-  if (rField_is_Q(src) && rField_is_Q_a(dst))
+nMapFunc naSetMap(const coeffs src, const coeffs dst)
+{
+  /* dst is expected to be an (algebraic) extension field */
+  assume(getCoeffType(dst) == n_Ext);
+  
+  if (nCoeff_is_Q(src) && nCoeff_is_Q_a(dst))
     return naMap00;                                      /// Q     -->  Q(a)
   
-  if (rField_is_Zp(src) && rField_is_Q_a(dst))
+  if (nCoeff_is_Zp(src) && nCoeff_is_Q_a(dst))
     return naMapP0;                                      /// Z/p   -->  Q(a)
   
-  if (rField_is_Q_a(src) && rField_is_Q_a(dst))
-  {
-    if (strcmp(rParameter(src)[0], rParameter(dst)[0]) == 0)
+  if (nCoeff_is_Q_a(src) && nCoeff_is_Q_a(dst))
+  {
+    if (strcmp(rParameter(src->algring)[0],
+               rParameter(dst->algring)[0]) == 0)
       return naCopyMap;                                  /// Q(a)   --> Q(a)
     else
@@ -530 +531 @@
   }
   
-  if (rField_is_Q(src) && rField_is_Zp_a(dst))
+  if (nCoeff_is_Q(src) && nCoeff_is_Zp_a(dst))
     return naMap0P;                                      /// Q      --> Z/p(a)
   
-  if (rField_is_Zp(src) && rField_is_Zp_a(dst))
-  {
-    if (rChar(src) == rChar(dst)) return naMapPP;        /// Z/p    --> Z/p(a)
+  if (nCoeff_is_Zp(src) && nCoeff_is_Zp_a(dst))
+  {
+    if (src->ch == dst->ch) return naMapPP;              /// Z/p    --> Z/p(a)
     else return naMapUP;                                 /// Z/u    --> Z/p(a)
   }
   
-  if (rField_is_Zp_a(src) && rField_is_Zp_a(dst))
-  {
-    if (strcmp(rParameter(src)[0], rParameter(dst)[0]) == 0)
+  if (nCoeff_is_Zp_a(src) && nCoeff_is_Zp_a(dst))
+  {
+    if (strcmp(rParameter(src->algring)[0],
+               rParameter(dst->algring)[0]) == 0)
       return naCopyMap;                                  /// Z/p(a) --> Z/p(a)
     else

libpolys/polys/monomials/p_polys.cc

@@ -39 +39 @@
 
 #include "coeffrings.h"
+#ifdef HAVE_FACTORY
 #include "clapsing.h"
-
+#endif
 
 /***************************************************************