Changeset 39e957 in git for kernel/kbuckets.cc

Timestamp:

Dec 19, 2005, 1:11:15 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

718935a4ec10cf39c554d39d260b570546b0906f

Parents:

bde566f8e3ab304ae39514dbd39106d953e58031

Message:

*bricken: coef buckets improved: kBucketSetLm helper


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

File:

• kernel/kbuckets.cc (modified) (5 diffs)

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.8 2005-12-16 08:29:15 bricken Exp $ */
+/* $Id: kbuckets.cc,v 1.9 2005-12-19 12:11:15 bricken Exp $ */
 
 #include "mod2.h"
@@ -107 +107 @@
         && p_LmCmp(lm, bucket->buckets[i], bucket->bucket_ring) != 1)
     {
-      dReportError("Bucket %d larger than lm", i);
+      dReportError("Bucket %d larger or equal than lm", i);
+      if (p_LmCmp(lm, bucket->buckets[i], bucket->bucket_ring) ==0)
+      dReportError("Bucket %d equal to lm", i);
       return FALSE;
     }
@@ -1048 +1050 @@
     number coef=n_Init(0,r);
     //ATTENTION: will not work correct for GB over ring
-    PrintS("CCCCCCCCCCCCC");
+    if (TEST_OPT_PROT)
+        PrintS("CCCCCCCCCCCCC");
     for (i=0;i<=MAX_BUCKET;i++){
         if (i==0)
@@ -1070 +1073 @@
          }
     }
-    PrintS("SSSSSSSSSSSSS");
+    if (TEST_OPT_PROT)
+        PrintS("SSSSSSSSSSSSS");
     for(i=0;i<=MAX_BUCKET;i++){
         if (bucket->buckets[i]!=NULL)
@@ -1083 +1087 @@
 
 
+poly kBucketExtractLmOfBucket(kBucket_pt bucket, int i){
+    assume(bucket->buckets[i]!=NULL);
+    
+    ring r=bucket->bucket_ring;
+    poly p=bucket->buckets[i];
+    bucket->buckets_length[i]--;
+    if (bucket->coef[i]!=NULL){
+        poly next=pNext(p);
+        if (next==NULL){
+            MULTIPLY_BUCKET(bucket,i);
+            p=bucket->buckets[i];
+            bucket->buckets[i]=NULL;
+            return p;
+        } else {
+            bucket->buckets[i]=next;
+            number c=p_GetCoeff(bucket->coef[i],r);
+            pNext(p)=NULL;
+            p=p_Mult_nn(p,c,r);
+            assume(p!=NULL);
+            return p;
+        }
+        
+    } else {
+        
+        bucket->buckets[i]=pNext(bucket->buckets[i]);
+        pNext(p)=NULL;
+        assume(p!=NULL);
+        return p;
+    }
+    
+}