Changeset bcfd11a in git for libpolys/polys/monomials/maps.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/maps.cc (modified) (4 diffs)

libpolys/polys/monomials/maps.cc

@@ -152 +152 @@
       omFreeSize((ADDRESS)monoms,l*sizeof(poly));
     }
-    if (!rMinpolyIsNULL(dst_r)) result=p_MinPolyNormalize(result, dst_r);
+
+    assume(dst_r != NULL);
+    assume(dst_r->cf != NULL);
+    
+    if (nCoeff_is_algExt(dst_r->cf))
+      result = p_MinPolyNormalize(result, dst_r);
   }
   return result;
@@ -318 +323 @@
 poly p_MinPolyNormalize(poly p, const ring r)
 {
-  number one = n_Init(1, r->cf);
+  const coeffs C = r->cf;
+  number one = n_Init(1, C);
   spolyrec rp;
 
@@ -326 +332 @@
   {
     // this returns 0, if p == MinPoly
-    number product = n_Mult(pGetCoeff(p), one,r->cf);
-    if ((product == NULL)||(n_IsZero(product,r->cf)))
-    {
-      p_LmDelete(&p,r);
+    number product = n_Mult(p_GetCoeff(p, r), one, C);
+    if ((product == NULL)||(n_IsZero(product, C)))
+    {
+      p_LmDelete(&p, r);
     }
     else
     {
-      p_SetCoeff(p, product,r);
+      p_SetCoeff(p, product, r);
       pNext(q) = p;
       q = p;
@@ -340 +346 @@
   }
   pNext(q) = NULL;
+  n_Delete(&one, C);
   return rp.next;
 }