Changeset 924cca in git

Timestamp:

Feb 13, 2006, 6:12:42 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

42ddd0dbdece5354f0a671a1747d9a01790bf8b8

Parents:

c7afb70a6725827461cf4b44dca573c599e0a11d

Message:

*bricken: some macros for without USE_COEF_BUCKETS, seems not to break with, but not enough to repair without


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

Location:

kernel

Files:

• kbuckets.cc (modified) (12 diffs)
• p_kBucketSetLm__T.cc (modified) (2 diffs)

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.23 2006-02-13 14:54:59 Singular Exp $ */
+/* $Id: kbuckets.cc,v 1.24 2006-02-13 17:12:28 bricken Exp $ */
 
 #include "mod2.h"
@@ -248 +248 @@
     }
 #endif
-#if 0
+#ifndef USE_COEF_BUCKETS
     MULTIPLY_BUCKET(bucket,i);
     pNext(lm) = bucket->buckets[i];
@@ -257 +257 @@
     bucket->buckets[0] = NULL;
     bucket->buckets_length[0] = 0;
-#endif
+    kbTest(bucket);
+#else
     if (i > bucket->buckets_used)  bucket->buckets_used = i;
     assume(i!=0);
@@ -296 +297 @@
     bucket->coef[0]=NULL;
     kbTest(bucket);
-  }
+    #endif
+  }
+
 }
 
@@ -801 +804 @@
   {
     //if (FALSE){
+    #ifdef USE_COEF_BUCKETS
     if ((bucket->coef[i]!=NULL) &&(i>=coef_start))
     {
@@ -843 +847 @@
     }
     else
+    #endif
     {
       MULTIPLY_BUCKET(bucket,i);
@@ -853 +858 @@
     }
   }
+  #ifdef USE_COEF_BUCKETS
   else
   {
@@ -867 +873 @@
     p_SetCoeff(m,n_Copy(n,r),r);
   }
+  #endif
 
   while ((bucket->buckets[i] != NULL) && (p1!=NULL))
   {
     assume(i!=0);
+    #ifdef USE_COEF_BUCKETS
     if ((bucket->coef[i]!=NULL) &&(i>=coef_start))
     {
@@ -905 +913 @@
     }
     else
+    #endif
     {
       //don't do that, pull out gcd
+      #ifdef USE_COEF_BUCKETS
       if(!(n_IsOne(n,r)))
       {
@@ -913 +923 @@
         n=n_Init(1,r);
       }
+      #endif
       MULTIPLY_BUCKET(bucket,i);
       p1 = p_Add_q(p1, bucket->buckets[i],
@@ -923 +934 @@
 
   bucket->buckets[i] = p1;
-
+#ifdef USE_COEF_BUCKETS
   assume(bucket->coef[i]==NULL);
+  
   if (!(n_IsOne(n,r)))
   {
@@ -934 +946 @@
     n_Delete(&n,r);
   }
+  #endif
   if ((p1==NULL) && (bucket->coef[i]!=NULL))
     p_Delete(&bucket->coef[i],r);

kernel/p_kBucketSetLm__T.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 12/00
- *  Version: $Id: p_kBucketSetLm__T.cc,v 1.3 2005-12-19 13:33:36 bricken Exp $
+ *  Version: $Id: p_kBucketSetLm__T.cc,v 1.4 2006-02-13 17:12:42 bricken Exp $
  *******************************************************************/
 #undef USE_COEF_BUCKETS
@@ -25 +25 @@
 #define MULTIPLY_BUCKET(B,I)
 #endif
-#if 0
+#ifndef USE_COEF_BUCKETS
 LINKAGE void p_kBucketSetLm(kBucket_pt bucket)
 {