Changeset 9d68fd in git for libpolys/polys

Timestamp:

Feb 25, 2013, 3:35:27 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1c94e44b6b2645f28d5bc81b7b3facc71b2b582d

Parents:

27c79fcbc083eb57ec1345d22a6892cf162f017b

Message:

fix: better tests and normalization for subst

Location:

libpolys/polys

Files:

• ext_fields/transext.cc (modified) (3 diffs)
• monomials/maps.cc (modified) (1 diff)
• pDebug.cc (modified) (1 diff)

libpolys/polys/ext_fields/transext.cc

@@ -278 +278 @@
 {
   ntTest(a);
+  if (IS0(a)) return NULL;
+
   definiteGcdCancellation(a, cf, FALSE);
-
-  if (IS0(a)) return NULL;
 
   fraction f = (fraction)a;
@@ -1488 +1488 @@
   assume(src == dst->extRing->cf);
   if ((SR_HDL(a) & SR_INT) || (a->s==3))
-    return ntInit(p_NSet(n_Copy(a, src), dst->extRing), dst);
+  {
+    number res=ntInit(p_NSet(n_Copy(a, src), dst->extRing), dst);
+    n_Test(res,dst);
+    return res;
+  }
   number nn=nlGetDenom(a,src);
   number zz=nlGetNumerator(a,src);
   number res=ntInit(p_NSet(zz,dst->extRing), dst);
   fraction ff=(fraction)res;
-  DEN(ff)=p_NSet(nn,dst->extRing);
+  if (n_IsOne(nn,src)) DEN(ff)=NULL;
+  else                 DEN(ff)=p_NSet(nn,dst->extRing);
+  n_Test((number)ff,dst);
   return (number)ff;
 }
@@ -1746 +1752 @@
 
   poly p = p_One(R); p_SetExp(p, iParameter, 1, R); p_Setm(p, R);
-
-//  return (number) p;
+  p_Test(p,R);
 
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);

libpolys/polys/monomials/maps.cc

@@ -87 +87 @@
            nMapFunc nMap, const ring dst_r)
 {
+    p_Test(p,preimage_r);
     poly q=p_NSet(nMap(pGetCoeff(p),preimage_r->cf,dst_r->cf),dst_r);
 

libpolys/polys/pDebug.cc

@@ -248 +248 @@
     _pPolyAssumeReturnMsg(p->coef != NULL || (n_GetChar(r->cf) >= 2), "NULL coef",p,r);
     #ifdef LDEBUG
-    r->cf->cfDBTest(p->coef,__FILE__,__LINE__,r->cf);
+    _pPolyAssumeReturnMsg(r->cf->cfDBTest(p->coef,__FILE__,__LINE__,r->cf),"coeff err",p,r);
     #endif
     _pPolyAssumeReturnMsg(!n_IsZero(p->coef, r->cf), "Zero coef",p,r);