Changeset 3b58e9 in git

Timestamp:

Dec 7, 2000, 1:22:42 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

7b34aedfeac63b17a621ba2a14291c7dc1930641

Parents:

fb4232247333afc978e691cd03863a559e8e8f29

Message:

*hannes:p_IsConstant


git-svn-id: file:///usr/local/Singular/svn/trunk@4829 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• polys.h (modified) (2 diffs)
• polys1.cc (modified) (4 diffs)

Singular/polys.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.h,v 1.48 2000-11-30 16:46:08 Singular Exp $ */
+/* $Id: polys.h,v 1.49 2000-12-07 12:22:42 Singular Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate polynomials of the
@@ -235 +235 @@
 
 /*-------------predicate on polys ----------------------*/
-BOOLEAN   pIsConstant(const poly p);
+BOOLEAN   p_IsConstant(const poly p, const ring r);
+#define   pIsConstant(p)    p_IsConstant(p,currRing)
 BOOLEAN   pIsConstantPoly(poly p);
 #define   pIsPurePower(p)   p_IsPurePower(p, currRing)
-#define   pIsVector(p)     (pGetComp(p)!=0)
+#define   pIsVector(p)      (pGetComp(p)>0)
 BOOLEAN   pHasNotCF(poly p1, poly p2);   /*has no common factor ?*/
 void      pSplit(poly p, poly * r);   /*p => IN(p), r => REST(p) */

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.55 2000-11-23 17:44:07 Singular Exp $ */
+/* $Id: polys1.cc,v 1.56 2000-12-07 12:22:42 Singular Exp $ */
 
 /*
@@ -32 +32 @@
 *test if the monomial is a constant
 */
-BOOLEAN   pIsConstant(const poly p)
+BOOLEAN   p_IsConstant(const poly p, const ring r)
 {
   if (p!=NULL)
   {
     int i;
-    for (i=pVariables;i;i--)
-    {
-      if (pGetExp(p,i)!=0) return FALSE;
-    }
-    if (pGetComp(p)) return FALSE;
+    for (i=r->N;i;i--)
+    {
+      if (p_GetExp(p,i,r)!=0) return FALSE;
+    }
+    if (p_GetComp(p,r)>0) return FALSE;
   }
   return TRUE;
@@ -873 +873 @@
           {
             lnumber c=(lnumber)pGetCoeff(qq);
-            c->z->e[-perm[i]-1]+=e/*p_GetExp( p,i,oldRing)*/;
+            napAddExp(c->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
             mapped_to_par=1;
           }
@@ -951 +951 @@
 }
 
+#if 0
+/*2
+*returns a re-ordered copy of a polynomial, with permutation of the variables
+*/
+poly p_PermPoly (poly p, int * perm, ring oldRing,
+   int *par_perm, int OldPar, ring newRing)
+{
+  int OldpVariables = oldRing->N;
+  poly result = NULL;
+  poly result_last = NULL;
+  poly aq=NULL; /* the map coefficient */
+  poly qq; /* the mapped monomial */
+
+  while (p != NULL)
+  {
+    if (OldPar==0)
+    {
+      qq = pInit();
+      number n=newRing->cf->nMap(pGetCoeff(p));
+      if ((newRing->minpoly!=NULL)
+      && ((rField_is_Zp_a(newRing)) || (rField_is_Q_a(newRing))))
+      {
+        newRing->cf->nNormalize(n);
+      }
+      pGetCoeff(qq)=n;
+    // coef may be zero:  pTest(qq);
+    }
+    else
+    {
+      qq=p_ISet(1, newRing);
+      aq=naPermNumber(pGetCoeff(p),par_perm,OldPar);
+      if ((newRing->minpoly!=NULL)
+      && ((rField_is_Zp_a(newRing)) || (rField_is_Q_a(newRing))))
+      {
+        poly tmp=aq;
+        while (tmp!=NULL)
+        {
+          number n=pGetCoeff(tmp);
+          newRing->cf->nNormalize(n);
+          pGetCoeff(tmp)=n;
+          pIter(tmp);
+        }
+      }
+      //pTest(aq);
+    }
+    p_SetComp(qq, p_GetComp(p,oldRing), newRing);
+    if (newRing->cf->nIsZero(pGetCoeff(qq)))
+    {
+      p_DeleteLm(&qq, newRing);
+    }
+    else
+    {
+      int i;
+      int mapped_to_par=0;
+      for(i=1; i<=OldpVariables; i++)
+      {
+        int e=p_GetExp(p,i,oldRing);
+        if (e!=0)
+        {
+          if (perm==NULL)
+          {
+            p_SetExp(qq,i, e, newRing);
+          }
+          else if (perm[i]>0)
+            p_AddExp(qq,perm[i], e/*p_GetExp( p,i,oldRing)*/, newRing);
+          else if (perm[i]<0)
+          {
+            lnumber c=(lnumber)pGetCoeff(qq);
+            napAddExp(c->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
+            mapped_to_par=1;
+          }
+          else
+          {
+            /* this variable maps to 0 !*/
+            p_DeleteLm(&qq, newRing);
+            break;
+          }
+        }
+      }
+      if (mapped_to_par
+      && (newRing->minpoly!=NULL))
+      {
+        number n=pGetCoeff(qq);
+        newRing->cf->nNormalize(n);
+        pGetCoeff(qq)=n;
+      }
+    }
+    pIter(p);
+    if (qq!=NULL)
+    {
+      p_Setm(qq, newRing);
+      //pTest(aq);
+      //pTest(qq);
+      if (aq!=NULL) qq=pMult(aq,qq);
+      aq = qq;
+      while (pNext(aq) != NULL) pIter(aq);
+      if (result_last==NULL)
+      {
+        result=qq;
+      }
+      else
+      {
+        pNext(result_last)=qq;
+      }
+      result_last=aq;
+      aq = NULL;
+    }
+    else if (aq!=NULL)
+    {
+      p_Delete(&aq, newRing);
+    }
+  }
+  result=pOrdPolyMerge(result);
+  //pTest(result);
+  return result;
+}
+#endif
+
 poly pJet(poly p, int m)
 {