Changeset 722db6 in git

Timestamp:

Dec 2, 2010, 5:07:36 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

ffe4fd8760d02e6be0620d213646ceeb9a2c4e18

Parents:

66bff8383ec423ff4d78015828b80285a4d2888a

Message:

code cleanup: kBucketTakeOutComp, pDecrOrdTakeOutComp

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

Location:

kernel

Files:

• kbuckets.cc (modified) (2 diffs)
• kbuckets.h (modified) (1 diff)
• polys.cc (modified) (1 diff)

kernel/kbuckets.cc

@@ -1014 +1014 @@
 // But better declare it extern than including polys.h
 extern void pTakeOutComp(poly *p, long comp, poly *q, int *lq);
-void pDecrOrdTakeOutComp(poly *p, long comp, long order,
-                         poly *q, int *lq);
 
 void kBucketTakeOutComp(kBucket_pt bucket,
@@ -1050 +1048 @@
 
   kbTest(bucket);
-}
-
-void kBucketDecrOrdTakeOutComp(kBucket_pt bucket,
-                               long comp, long order,
-                               poly *r_p, int *l)
-{
-  poly p = NULL, q;
-  int i, lp = 0, lq;
-
-#ifndef HAVE_PSEUDO_BUCKETS
-  kBucketMergeLm(bucket);
-  for (i=1; i<=bucket->buckets_used; i++)
-  {
-    if (bucket->buckets[i] != NULL)
-    {
-      MULTIPLY_BUCKET(bucket,i);
-      pDecrOrdTakeOutComp(&(bucket->buckets[i]), comp, order, &q, &lq);
-      if (q != NULL)
-      {
-        bucket->buckets_length[i] -= lq;
-        p = p_Add_q(p, q, lp, lq, bucket->bucket_ring);
-      }
-    }
-  }
-  kBucketAdjustBucketsUsed(bucket);
-#else
-  pDecrOrdTakeOutComp(&(bucket->p), comp, order, &p, &lp);
-  (bucket->l) -= lp;
-#endif
-
-  *r_p = p;
-  *l = lp;
 }
 

kernel/kbuckets.h

@@ -100 +100 @@
                         poly *p, int *l);
 
-// Here we only extract such monoms which have component == comp and
-// degree == order
-// ASSUME: monomial ordering is Order compatible, i.e., if m1, m2 Monoms then
-//         m1 >= m2 ==> pGetOrder(m1) >= pGetOrder(m2)
-void kBucketDecrOrdTakeOutComp(kBucket_pt bucket,
-                               long comp, long order,
-                               poly *p, int *l);
-
 //////////////////////////////////////////////////////////////////////////
 ///

kernel/polys.cc

@@ -465 +465 @@
   pTest(*r_p);
   pTest(*r_q);
-}
-
-void pDecrOrdTakeOutComp(poly *r_p, long comp, long order,
-                         poly *r_q, int *lq)
-{
-  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(pGetOrder(p) >= pGetOrder(pNext(p)));
-      pIter(p);
-    }
-  }
-  p = *r_p;
-#endif
-
-  while (p != NULL && pGetOrder(p) > order) pIter(p);
-
-  while(p != NULL && pGetOrder(p) == order)
-  {
-    while (pGetComp(p) == comp)
-    {
-      pNext(q) = p;
-      pIter(q);
-      pIter(p);
-      pSetComp(p, 0);
-      pSetmComp(p);
-      l++;
-      if (p == NULL || pGetOrder(p) != 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;
 }