Changeset 852d4b7 in git

Timestamp:

Dec 2, 2010, 5:06:03 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5698bbfd7b3c79fd778de53d05635f3bf8c2a250

Parents:

a30a39aaa446d00f01aab56db0ff2964711d5f1e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-12-02 17:06:03+01:00

git-committer:

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

Message:

code cleanup: pDecrOrdTakeOutComp"

Location:

libpolys/polys/monomials

Files:

• p_polys.cc (modified) (1 diff)
• p_polys.h (modified) (1 diff)

libpolys/polys/monomials/p_polys.cc

@@ -2706 +2706 @@
 }
 
-void p_DecrOrdTakeOutComp(poly *r_p, long comp, long order,
-                         poly *r_q, int *lq, const ring r)
-{
-  spolyrec pp, qq;
-  poly p, q, p_prev;
-  int l = 0;
-
-  pNext(&pp) = *r_p;
-  p = *r_p;
-  p_prev = &pp;
-  q = &qq;
-
-#ifdef HAVE_ASSUME
-  if (p != NULL)
-  {
-    while (pNext(p) != NULL)
-    {
-      assume(p_GetOrder(p,r) >= p_GetOrder(pNext(p),r));
-      pIter(p);
-    }
-  }
-  p = *r_p;
-#endif
-
-  while (p != NULL && p_GetOrder(p,r) > order) pIter(p);
-
-  while(p != NULL && p_GetOrder(p,r) == order)
-  {
-    while (p_GetComp(p,r) == comp)
-    {
-      pNext(q) = p;
-      pIter(q);
-      pIter(p);
-      p_SetComp(p, 0,r);
-      p_SetmComp(p,r);
-      l++;
-      if (p == NULL || p_GetOrder(p,r) != order)
-      {
-        pNext(p_prev) = p;
-        goto Finish;
-      }
-    }
-    pNext(p_prev) = p;
-    p_prev = p;
-    pIter(p);
-  }
-
-  Finish:
-  pNext(q) = NULL;
-  *r_p = pNext(&pp);
-  *r_q = pNext(&qq);
-  *lq = l;
-}
-
 void p_DeleteComp(poly * p,int k, const ring r)
 {

libpolys/polys/monomials/p_polys.h

@@ -1788 +1788 @@
 void p_TakeOutComp(poly *p, long comp, poly *q, int *lq, const ring r);
 
-// Similar to pTakeOutComp, except that only those components are
-// taken out whose Order == order
-// ASSUME: monomial ordering is Order compatible, i.e., if m1, m2 Monoms then
-//         m1 >= m2 ==> pGetOrder(m1) >= pGetOrder(m2)
-void p_DecrOrdTakeOutComp(poly *r_p, long comp, long order,
-                         poly *r_q, int *lq, const ring r)
-
 // This is something weird -- Don't use it, unless you know what you are doing
 poly      p_TakeOutComp(poly * p, int k);