Changeset bcfd11a in git for libpolys/polys/monomials/p_polys.cc

Timestamp:

Mar 20, 2012, 3:33:34 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7e9f1298826e9e80c154aaa465935c0ba2acad38

Parents:

dd668fd21e0141dd6716d45d63f34e6ca84d230f

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-20 15:33:34+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-23 16:06:34+01:00

Message:

elimination of rMinpolyIsNULL in favour of nCoeff_is_algExt

fix rMinpolyIsNULL (idIs0)

TODO: remove rMinpolyIsNULL it completely!

File:

• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -3457 +3457 @@
   poly qq; /* the mapped monomial */
 
+  assume(dst != NULL);
+  assume(dst->cf != NULL);
+  
   while (p != NULL)
   {
@@ -3466 +3469 @@
       number n = nMap(p_GetCoeff(p, oldRing), oldRing->cf, dst->cf);
 
-      if ( (!rMinpolyIsNULL(dst)) && (rField_is_Zp_a(dst) || rField_is_Q_a(dst)) )
+      if ( nCoeff_is_algExt(dst->cf) )
         n_Normalize(n, dst->cf);
 
@@ -3483 +3486 @@
       p_Test(aq, dst);
 
-      if ( (!rMinpolyIsNULL(dst)) && (rField_is_Zp_a(dst) || rField_is_Q_a(dst)) )
-      {
+      if ( nCoeff_is_algExt(dst->cf) )
         p_Normalize(aq,dst);
-
-      }
+      
       if (aq == NULL)
         p_SetCoeff(qq, n_Init(0, dst->cf),dst); // Very dirty trick!!!
@@ -3586 +3587 @@
         }
       }
-      if ( mapped_to_par && (!rMinpolyIsNULL(dst)) )
+      if ( mapped_to_par && nCoeff_is_algExt(dst->cf) )
       {
         number n = p_GetCoeff(qq, dst);
-        n_Normalize(n,dst->cf);
+        n_Normalize(n, dst->cf);
         p_GetCoeff(qq, dst) = n;
       }