Changeset e7d1fd in git

Timestamp:

Sep 27, 1999, 3:35:53 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

88ff58c3e09f5825f063912877992d787c2b0525

Parents:

e72e836bdc4f7b2643f6d02eef8fb1bd7e012d0c

Message:

* small changes


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

File:

• Singular/kbuckets.cc (modified) (43 diffs)

Singular/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.2 1999-05-26 16:20:17 obachman Exp $ */
+/* $Id: kbuckets.cc,v 1.3 1999-09-27 13:35:53 obachman Exp $ */
 
 #include "mod2.h"
@@ -25 +25 @@
 {
   unsigned int i = 0;
-  
+
   if (l == 0) return 0;
   l--;
@@ -38 +38 @@
 }
 
-  
+
 
 #if defined(PDEBUG) && ! defined(HAVE_PSEUDO_BUCKETS)
@@ -50 +50 @@
   if (bucket->buckets_length[i] != pLength(bucket->buckets[i]))
   {
-    Warn("Bucket %d lengths difference should:%d has:%d in %s:%d\n",
+    Warn("Bucket %d lengths difference should:%d has:%d in %s:%d",
           i, bucket->buckets_length[i], pLength(bucket->buckets[i]), file, line);
     assume(0);
@@ -56 +56 @@
   else if (i > 0 && (int) pLogLength(bucket->buckets_length[i]) > i)
   {
-    Warn("Bucket %d too long %d in %s:%d\n", 
+    Warn("Bucket %d too long %d in %s:%d",
           i, bucket->buckets_length[i], file, line);
     assume(0);
@@ -62 +62 @@
   else if (i==0 && bucket->buckets_length[0] > 1)
   {
-    Warn("Bucket 0 too long \n");
+    Warn("Bucket 0 too long");
   }
 }
@@ -79 +79 @@
         && pComp0(lm, bucket->buckets[i]) != 1)
     {
-      Warn("Bucket %d larger than lm in %s:%d\n", i, file, line);
+      Warn("Bucket %d larger than lm in %s:%d", i, file, line);
       assume(0);
     }
   }
-  
+
   for (; i<=MAX_BUCKET; i++)
   {
     if (bucket->buckets[i] != NULL || bucket->buckets_length[i] != 0)
     {
-      Warn("Bucket %d not zero in %s:%d\n", i, file, line);
+      Warn("Bucket %d not zero in %s:%d", i, file, line);
       assume(0);
     }
@@ -126 +126 @@
 inline void kBucketAdjustBucketsUsed(kBucket_pt bucket)
 {
-  while ( bucket->buckets_used > 0 &&  
+  while ( bucket->buckets_used > 0 &&
           bucket->buckets[bucket->buckets_used] == NULL)
     (bucket->buckets_used)--;
@@ -152 +152 @@
   }
 }
-           
-                             
+
+
 static BOOLEAN kBucketIsCleared(kBucket_pt bucket)
 {
@@ -171 +171 @@
 {
   int i;
-  
+
   assume(bucket != NULL);
   assume(length <= 0 || length == pLength(lm));
@@ -207 +207 @@
   BOOLEAN zero = FALSE;
   assume(bucket->buckets[0] == NULL && bucket->buckets_length[0] == 0);
-  
+
   do
   {
@@ -217 +217 @@
         int comp = (j == 0 ? 1 :
                     pComp0(bucket->buckets[i], bucket->buckets[j]));
-        
-        if (comp > 0) 
+
+        if (comp > 0)
         {
           if (j > 0 &&
@@ -249 +249 @@
   while (j < 0);
 
-  if (j == 0) 
+  if (j == 0)
   {
     return;
@@ -290 +290 @@
   bucket->buckets_length[1] = 0;
 
-  
+
   for (i=2; i<=bucket->buckets_used; i++)
   {
@@ -347 +347 @@
 {
   int i;
-  
+
   assume(bucket != NULL);
   assume(length <= 0 || length == pLength(lm));
@@ -354 +354 @@
   if (length <= 0) bucket->l = pLength(lm);
   else bucket->l = length;
-  
+
   bucket->heap = heap;
   assume(pprocs != NULL);
@@ -377 +377 @@
 void kBucketClear(kBucket_pt bucket, poly *p, int *length)
 {
-  assume(pLength(bucket->p) == bucket->l); 
+  assume(pLength(bucket->p) == bucket->l);
   *p = bucket->p;
   *length = bucket->l;
@@ -406 +406 @@
   }
 }
-    
+
 #else
 
-#define kBucketCompactifyIfNecessary(b) 
+#define kBucketCompactifyIfNecessary(b)
 
 #endif
@@ -421 +421 @@
 #ifndef HAVE_PSEUDO_BUCKETS
   int i;
-  
+
   for (i=0; i<= bucket->buckets_used; i++)
-    if (bucket->buckets[i] != NULL) 
+    if (bucket->buckets[i] != NULL)
       bucket->pprocs->n_Mult_p(n, bucket->buckets[i]);
 #else
   bucket->pprocs->n_Mult_p(n, bucket->p);
-#endif  
+#endif
 }
 
@@ -435 +435 @@
 /// Does not destroy p and m
 /// assume (*l <= 0 || pLength(p) == *l)
-void kBucket_Minus_m_Mult_p(kBucket_pt bucket, poly m, poly p, int *l, 
+void kBucket_Minus_m_Mult_p(kBucket_pt bucket, poly m, poly p, int *l,
                             poly spNoether)
 {
@@ -441 +441 @@
   int i, l1;
   poly p1 = p;
-  
-  if (*l <= 0) 
+
+  if (*l <= 0)
   {
     l1 = pLength(p1);
@@ -449 +449 @@
   else
     l1 = *l;
-  
+
   if (m == NULL || p == NULL) return;
-  
+
 #ifndef HAVE_PSEUDO_BUCKETS
   kBucketMergeLm(bucket);
@@ -461 +461 @@
       (&(bucket->buckets[i]), &(bucket->buckets_length[i]),
        m,
-       p1, l1, 
+       p1, l1,
        spNoether,
        bucket->pprocs->p_Mult_m,
@@ -473 +473 @@
     {
       bucket->pprocs->p_Add_q(&p1, &l1,
-                              &(bucket->buckets[i]), 
+                              &(bucket->buckets[i]),
                               &(bucket->buckets_length[i]),
                               bucket->heap);
@@ -488 +488 @@
   bucket->buckets[i] = p1;
   bucket->buckets_length[i]=l1;
-  if (i >= bucket->buckets_used) 
+  if (i >= bucket->buckets_used)
     bucket->buckets_used = i;
   else
@@ -494 +494 @@
 #else // HAVE_PSEUDO_BUCKETS
   bucket->pprocs->p_Minus_m_Mult_q(&(bucket->p), &(bucket->l),
-                                   m, p, l1, spNoether, 
+                                   m, p, l1, spNoether,
                                    bucket->pprocs->p_Mult_m,
                                    bucket->heap);
-#endif  
+#endif
   kbTests(bucket);
 }
 
 /////////////////////////////////////////////////////////////////////////////
-// 
+//
 // Extract all monomials from bucket with component comp
 // Return as a polynomial *p with length *l
-// In other words, afterwards 
+// In other words, afterwards
 // Bpoly == Bpoly - (poly consisting of all monomials with component comp)
 // and components of monomials of *p are all 0
-// 
-void kBucketTakeOutComp(kBucket_pt bucket, 
-                        Exponent_t comp, 
+//
+void kBucketTakeOutComp(kBucket_pt bucket,
+                        Exponent_t comp,
                         poly *r_p, int *l)
 {
@@ -536 +536 @@
   pTakeOutComp(&(bucket->p), comp, &p, &lp);
   (bucket->l) -= lp;
-#endif  
+#endif
   *r_p = p;
   *l = lp;
-  
+
   kbTests(bucket);
 }
 
-void kBucketDecrOrdTakeOutComp(kBucket_pt bucket, 
-                               Exponent_t comp, Order_t order, 
+void kBucketDecrOrdTakeOutComp(kBucket_pt bucket,
+                               Exponent_t comp, Order_t order,
                                poly *r_p, int *l)
 {
   poly p = NULL, q;
   int i, lp = 0, lq;
-  
+
 #ifndef HAVE_PSEUDO_BUCKETS
   kBucketMergeLm(bucket);
@@ -568 +568 @@
   pDecrOrdTakeOutComp(&(bucket->p), comp, order, &p, &lp);
   (bucket->l) -= lp;
-#endif  
+#endif
 
   *r_p = p;
   *l = lp;
 }
-  
+
 /////////////////////////////////////////////////////////////////////////////
 // Reduction of Bpoly with a given poly
@@ -580 +580 @@
 extern int spCheckCoeff(number *a, number *b);
 
-number kBucketPolyRed(kBucket_pt bucket, 
-                      poly p1, int l1, 
+number kBucketPolyRed(kBucket_pt bucket,
+                      poly p1, int l1,
                       poly spNoether)
 {
-  assume(p1 != NULL && 
+  assume(p1 != NULL &&
          pDivisibleBy(p1,  kBucketGetLm(bucket)));
   assume(pLength(p1) == (int) l1);
@@ -591 +591 @@
   BOOLEAN reset_vec=FALSE;
   number rn;
-  
+
   if(a1==NULL)
   {
@@ -615 +615 @@
     pSetCompP(a1, pGetComp(lm));
     reset_vec = TRUE;
-  }
-  
+    pSetComp(lm, pGetComp(p1));
+    pSetm(lm);
+  }
+
   spMonSub(lm,p1);
   l1--;
 
   kBucket_Minus_m_Mult_p(bucket, lm, a1, &l1, spNoether);
-  
+
   kb_pDelete1(lm, bucket->heap);
   if (reset_vec) spModuleToPoly(a1);
@@ -654 +656 @@
   }
 #endif
-  
+
   kBucketInit(&(strat->bucket), h->p, h->length, &(strat->pprocs),
               h->heap);
-  
+
   lm = kBucketGetLm(&(strat->bucket));
-  
+
   for(;;)
   {
@@ -666 +668 @@
 #endif
     j = 0;
-    
+
 #ifdef KB_HAVE_SHORT_EVECTORS
     unsigned long ev = ~ pGetShortExpVector(lm);
 #endif
-    
+
     if (strat->ak)
     {
@@ -716 +718 @@
     if (strat->T[j].length <= 0)
       strat->T[j].length = pLength(strat->T[j].p);
-      
-    // Compactify 
+
+    // Compactify
     kBucketCompactifyIfNecessary(&(strat->bucket));
 
@@ -725 +727 @@
     nDelete(&up);
     lm = kBucketGetLm(&(strat->bucket));
-      
+
     if (lm == NULL)
     {
@@ -768 +770 @@
 #endif
   kTest(strat);
-  
+
   if (strat->fromT)
   {
@@ -781 +783 @@
 
   poly lm = kBucketGetLm(&(strat->bucket));
-  
+
   strat->fromT=FALSE;
 
@@ -790 +792 @@
     unsigned long ev = ~ pGetShortExpVector(lm);
 #endif
- 
+
     if (strat->ak)
     {
@@ -808 +810 @@
         else
           goto Found;
-#else        
+#else
         if (pDivisibleBy2(strat->T[j].p,lm)) goto Found;
         j++;
@@ -818 +820 @@
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG) PrintLn();
-#endif  
+#endif
     kBucketClear(&(strat->bucket), &(h->p), &(h->length));
     if (TEST_OPT_INTSTRATEGY) pCleardenom(h->p);// also does a pContent
@@ -837 +839 @@
     }
 
-      
+
     /*
      * the polynomial to reduce with (up to the moment) is;
@@ -1026 +1028 @@
                       hp->heap);
         }
-        number up = kBucketPolyRed(&(strat->bucket), strat->S[j], 
-                                   pLength(strat->S[j]), 
+        number up = kBucketPolyRed(&(strat->bucket), strat->S[j],
+                                   pLength(strat->S[j]),
                                    strat->kNoether);
         nDelete(&up);
@@ -1059 +1061 @@
     length++;
   }
-  
+
 
   Finish: