Changeset de714a7 in git

Timestamp:

Sep 2, 2020, 11:13:41 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d1aba562c8f27c78d855590201241d36c3bef972

Parents:

40632978ce2cb84dae846b23a573eee15545abcc

Message:

Revert "removed: p_IsConstantPoly (->p_IsConstant)"

This reverts commit 08f2a1fadb363c59a659cf6741ae0a35a7aed204.

Files:

• Singular/ipassign.cc (modified) (2 diffs)
• kernel/polys.h (modified) (1 diff)
• libpolys/polys/clapconv.cc (modified) (2 diffs)
• libpolys/polys/clapsing.cc (modified) (2 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)
• libpolys/polys/nc/old.gring.cc (modified) (1 diff)
• libpolys/polys/simpleideals.cc (modified) (1 diff)

Singular/ipassign.cc

@@ -222 +222 @@
   {
     poly n=DEN((fraction)(p));
-    if(!p_IsConstant(n,r->cf->extRing))
+    if(!p_IsConstantPoly(n,r->cf->extRing))
     {
       WarnS("denominator must be constant - ignoring it");
@@ -343 +343 @@
   {
     poly n=DEN((fraction)(p));
-    if(!p_IsConstant(n,currRing->cf->extRing))
+    if(!p_IsConstantPoly(n,currRing->cf->extRing))
     {
       WarnS("denominator must be constant - ignoring it");

kernel/polys.h

@@ -244 +244 @@
 
 /// return TRUE if all monomials of p are constant
-#define   pIsConstantPoly(p)        p_IsConstant(p, currRing)
+#define   pIsConstantPoly(p)        p_IsConstantPoly(p, currRing)
 
 #define   pIsPurePower(p)   p_IsPurePower(p, currRing)

libpolys/polys/clapconv.cc

@@ -325 +325 @@
 
     // test if denominator is constant
-    if (!errorreported && !p_IsConstant(DEN ((fraction)p_GetCoeff (p,r)),r->cf->extRing))
+    if (!errorreported && !p_IsConstantPoly(DEN ((fraction)p_GetCoeff (p,r)),r->cf->extRing))
       WerrorS("conversion error: denominator!= 1");
 
@@ -357 +357 @@
 
     // test if denominator is constant
-    if (!p_IsConstant(DEN ((fraction)p_GetCoeff (p,r)),r->cf->extRing))
+    if (!p_IsConstantPoly(DEN ((fraction)p_GetCoeff (p,r)),r->cf->extRing))
       return FALSE;
     pIter(p);

libpolys/polys/clapsing.cc

@@ -826 +826 @@
   p_Test(fac,r);
   int e=0;
-  if (!p_IsConstant(fac,r))
+  if (!p_IsConstantPoly(fac,r))
   {
 #ifdef FACTORIZE2_DEBUG
@@ -1141 +1141 @@
         prune (a);
 #ifndef SING_NDEBUG
-    if ((r->cf->extRing!=NULL) && (!p_IsConstant(ff,r)))
+    if ((r->cf->extRing!=NULL) && (!p_IsConstantPoly(ff,r)))
     {
       singclap_factorize_retry++;

libpolys/polys/monomials/p_polys.h

@@ -1983 +1983 @@
 }
 
-#define p_IsConstantPoly(p,r) p_IsConstant(p,r)
+static inline BOOLEAN p_IsConstantPoly(const poly p, const ring r)
+{
+  p_Test(p, r);
+  poly pp=p;
+  while(pp!=NULL)
+  {
+    if (! p_LmIsConstantComp(pp, r))
+      return FALSE;
+    pIter(pp);
+  }
+  return TRUE;
+}
 
 static inline BOOLEAN p_IsUnit(const poly p, const ring r)

libpolys/polys/nc/old.gring.cc

@@ -3361 +3361 @@
 
   int *perm=(int *)omAlloc0((Rop->N+1)*sizeof(int));
-  if (!p_IsConstant(p, Rop))
+  if (!p_IsConstantPoly(p, Rop))
   {
     /* we know perm exactly */

libpolys/polys/simpleideals.cc

@@ -404 +404 @@
   for (int k = IDELEMS(id)-1; k>=0; k--)
   {
-    if (!p_IsConstant(id->m[k],r))
+    if (!p_IsConstantPoly(id->m[k],r))
       return FALSE;
   }