Changeset a30a39a in git

Timestamp:

Dec 2, 2010, 4:53:23 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

852d4b70bcea05af98462b8e106e5659ea831e1b

Parents:

014b65b05f3dcc53c2482f7290e78a289930ae54

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-12-02 16:53:23+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:57:46+01:00

Message:

code cleanup: pGetMaxPower, pDivByMonom, pCancelPolyByMonom

Location:

libpolys/polys

Files:

• monomials/p_polys.cc (modified) (1 diff)
• monomials/p_polys.h (modified) (1 diff)
• polys.h (modified) (1 diff)

libpolys/polys/monomials/p_polys.cc

@@ -2464 +2464 @@
 }
 
-/*4
-*Returns the exponent of the maximal power of the leading monomial of
-*p2 in that of p1
-*/
-static int p_GetMaxPower (poly p1,poly p2, const ring r)
-{
-  int     i,k,res = MAX_INT; /*a very large integer*/
-
-  if (p1 == NULL) return 0;
-  for (i=rVar(r); i>0; i--)
-  {
-    if ( pGetExp(p2,i) != 0)
-    {
-      k =  p_GetExp(p1,i,r) /  p_GetExp(p2,i,r);
-      if (k < res) res = k;
-    }
-  }
-  return res;
-}
-
-/*2
-*returns the leading monomial of p1 divided by the maximal power of that
-*of p2
-*/
-static poly p_DivByMonom (poly p1,poly p2, const ring r)
-{
-  int     k, i;
-
-  if (p1 == NULL) return NULL;
-  k = p_GetMaxPower(p1,p2,r);
-  if (k == 0)
-    return p_Head(p1,r);
-  else
-  {
-    number n;
-    poly p = pInit(r);
-
-    p->next = NULL;
-    for (i=rVar(r);i>0; i--)
-    {
-       p_SetExp(p,i, p_GetExp(p1,i,r)-k* p_GetExp(p2,i,r),r);
-    }
-    n_Power(p2->coef,k,&n,r->cf);
-    pSetCoeff0(p,n_Div(p1->coef,n,r->cf));
-    n_Delete(&n,r->cf);
-    p_Setm(p,r);
-    return p;
-  }
-}
-
-/*2
-*Returns as i-th entry of P the coefficient of the (i-1) power of
-*the leading monomial of p2 in p1
-*/
-static void p_CancelPolyByMonom (poly p1,poly p2,polyset * P,int * SizeOfSet, const ring r)
-{
-  int   maxPow;
-  poly  p,qp,Coeff;
-
-  if (*P == NULL)
-  {
-    *P = (polyset) omAlloc0(5*sizeof(poly));
-    *SizeOfSet = 5;
-  }
-  p = p_Copy(p1,r);
-  while (p != NULL)
-  {
-    qp = pNext(p);
-    pNext(p) = NULL;
-    maxPow = p_GetMaxPower(p,p2,r);
-    Coeff = p_DivByMonom(p,p2,r);
-    if (maxPow > *SizeOfSet)
-    {
-      pEnlargeSet(P,*SizeOfSet,maxPow+1-*SizeOfSet);
-      *SizeOfSet = maxPow+1;
-    }
-    (*P)[maxPow] = p_Add_q((*P)[maxPow],Coeff,r);
-    p_Delete(&p,r);
-    p = qp;
-  }
-}
-/*2
-*replaces the maximal powers of the leading monomial of p2 in p1 by
-*the same powers of n, utility for dehomogenization
-*/
-poly p_Dehomogen (poly p1,poly p2,number n, const ring r)
-{
-  polyset P;
-  int     SizeOfSet=5;
-  int     i;
-  poly    p;
-  number  nn;
-
-  P = (polyset)omAlloc0(5*sizeof(poly));
-  p_CancelPolyByMonom(p1,p2,&P,&SizeOfSet,r);
-  p = P[0];
-  for (i=1; i<SizeOfSet; i++)
-  {
-    if (P[i] != NULL)
-    {
-      nPower(n,i,&nn);
-      pMult_nn(P[i],nn);
-      p = pAdd(p,P[i]);
-      //P[i] =NULL; // for safety, may be removed later
-      nDelete(&nn);
-    }
-  }
-  omFreeSize((ADDRESS)P,SizeOfSet*sizeof(poly));
-  return p;
-}
-
 /*2
 *tests if p is homogeneous with respect to the actual weigths

libpolys/polys/monomials/p_polys.h

@@ -310 +310 @@
 // homogenizes p by multiplying certain powers of the varnum-th variable
 poly      p_Homogen (poly p, int varnum, const ring r);
-// replaces the maximal powers of the leading monomial of p2 in p1 by
-// the same powers of n, utility for dehomogenization
-poly      p_Dehomogen (poly p1,poly p2,number n, const ring r);
+
 BOOLEAN   p_IsHomogeneous (poly p, const ring r);
 

libpolys/polys/polys.h

@@ -291 +291 @@
 // #define   pDehomogen(p1,p2,n) p_Dehomgen(p1,p2,n,currRing)
 // #define   pIsHomogen(p)       p_IsHomggen(p,currRing)
+#define   pIsHomogen(p)       p_IsHomogen(p,currRing)
 
 /*BOOLEAN   pVectorHasUnitM(poly p, int * k);*/