Changeset 2e4de3d in git for kernel/kbuckets.cc

Timestamp:

Jan 13, 2006, 8:35:48 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c6022d8f25317f2f6b7390478a1df53933e9e351

Parents:

cea6f37c01957588684897357ff64b4850b3dc6a

Message:

*bricken: merging my new changes in


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

File:

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

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.17 2006-01-13 18:10:04 wienand Exp $ */
+/* $Id: kbuckets.cc,v 1.18 2006-01-13 19:35:48 bricken Exp $ */
 
 #include "mod2.h"
@@ -1105 +1105 @@
     if (rField_is_Zp(r))
         return TRUE;
-
+    if (r->parameter==NULL)
+    {
+        if (r->cf->nSize(n)==1)
+            return TRUE;
+        else
+            return FALSE;
+    }
     //if (r->parameter!=NULL)
     number one=n_Init(1,r);
@@ -1123 +1129 @@
 void kBucketSimpleContent(kBucket_pt bucket)
 {
+  ring r=bucket->bucket_ring;
   int i;
   //PrintS("HHHHHHHHHHHHH");
@@ -1136 +1143 @@
       return;
   }
+  for (i=0;i<=MAX_BUCKET;i++)
+  {
+    //if ((bucket->buckets[i]!=NULL) && (bucket->coef[i]!=NULL))
+    //    PrintS("H2H2H2");
+    if (i==0)
+    {
+      assume(bucket->buckets[i]==NULL);
+    }
+    if ((bucket->buckets[i]!=NULL) &&     (nIsPseudoUnit(p_GetCoeff(bucket->coef[i],r),r)))
+
+      return;
+  }
   //return;
-  ring r=bucket->bucket_ring;
+  
   number coef=n_Init(0,r);
   //ATTENTION: will not work correct for GB over ring