Changeset 8227a9 in git

Timestamp:

Nov 23, 2006, 1:46:17 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

9edc1d34e7e5f871fd5bdb741da43dfa5e168ea2

Parents:

688c5f840bb21a424c4b9fa6527595a7dd39d409

Message:

*hannes: format


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

File:

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

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.27 2006-02-27 14:42:05 bricken Exp $ */
+/* $Id: kbuckets.cc,v 1.28 2006-11-23 12:46:17 Singular Exp $ */
 
 #include "mod2.h"
@@ -740 +740 @@
     l1 = pLength(p1);
     assume(pLength(p1) == l1);
-#endif    
+#endif
     i = pLogLength(l1);
   }
@@ -793 +793 @@
 void kBucket_Plus_mm_Mult_pp(kBucket_pt bucket, poly m, poly p, int l)
 {
-    assume((!rIsPluralRing(bucket->bucket_ring))||p_IsConstant(m, bucket->bucket_ring)); 
+    assume((!rIsPluralRing(bucket->bucket_ring))||p_IsConstant(m, bucket->bucket_ring));
   assume(l <= 0 || pLength(p) == l);
   int i, l1;
@@ -871 +871 @@
     }
   }
-  
+
   else
   {
@@ -889 +889 @@
     #endif
   }
-  
+
 
   while ((bucket->buckets[i] != NULL) && (p1!=NULL))
@@ -952 +952 @@
 #ifdef USE_COEF_BUCKETS
   assume(bucket->coef[i]==NULL);
-  
+
   if (!(n_IsOne(n,r)))
   {
@@ -962 +962 @@
     n_Delete(&n,r);
   }
-  
+
   if ((p1==NULL) && (bucket->coef[i]!=NULL))
     p_Delete(&bucket->coef[i],r);
@@ -1088 +1088 @@
                       poly spNoether)
 {
-  assume((!rIsPluralRing(bucket->bucket_ring))||p_LmEqual(p1,kBucketGetLm(bucket), bucket->bucket_ring)); 
+  assume((!rIsPluralRing(bucket->bucket_ring))||p_LmEqual(p1,kBucketGetLm(bucket), bucket->bucket_ring));
   assume(p1 != NULL &&
          p_DivisibleBy(p1,  kBucketGetLm(bucket), bucket->bucket_ring));
@@ -1133 +1133 @@
   //@Viktor, don't ignore coefficients on monomials
   if(l1==1) {
-    
+
     //if (rField_is_Q(bucket->bucket_ring)) {
       //avoid this for function fields, as gcds are expensive at the moment
-      
-     
+
+
       coef=p_GetCoeff(a1,bucket->bucket_ring);
       lm=p_Mult_nn(lm, coef, bucket->bucket_ring);
@@ -1147 +1147 @@
   }
   #endif
-  
+
   kBucket_Minus_m_Mult_p(bucket, lm, a1, &l1, spNoether);
-  
+
   if (backuped)
     p_SetCoeff0(a1,coef,bucket->bucket_ring);
@@ -1157 +1157 @@
   return rn;
 }
-static BOOLEAN nIsPseudoUnit(number n, ring r){
-    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);
-    if (n_Equal(n,one,r)) {
+static BOOLEAN nIsPseudoUnit(number n, ring r)
+{
+  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);
+  if (n_Equal(n,one,r))
+  {
     n_Delete(&one,r);
     return TRUE;
-    }
-    n_Delete(&one,r);
-    number minus_one=n_Init(-1,r);
-    if (n_Equal(n,minus_one,r)){
-        n_Delete(&minus_one,r);
-        return TRUE;
-    }
-    return FALSE;
+  }
+  n_Delete(&one,r);
+  number minus_one=n_Init(-1,r);
+  if (n_Equal(n,minus_one,r))
+  {
+    n_Delete(&minus_one,r);
+    return TRUE;
+  }
+  return FALSE;
 }
 
@@ -1207 +1210 @@
       assume(bucket->buckets[i]==NULL);
     }
-    if ((bucket->buckets[i]!=NULL) &&     (nIsPseudoUnit(p_GetCoeff(bucket->coef[i],r),r)))
-
+    if ((bucket->buckets[i]!=NULL)
+    && (nIsPseudoUnit(p_GetCoeff(bucket->coef[i],r),r)))
       return;
   }
   //return;
-  
+
   number coef=n_Init(0,r);
   //ATTENTION: will not work correct for GB over ring
@@ -1227 +1230 @@
       assume(bucket->coef[i]!=NULL);
       assume(!(n_IsZero(pGetCoeff(bucket->coef[i]),r)));
-      
-      
+
       //in this way it should crash on programming errors, yeah
       number temp=nGcd(coef, pGetCoeff(bucket->coef[i]),r);
@@ -1249 +1251 @@
   for(i=0;i<=MAX_BUCKET;i++)
   {
-    
     if (bucket->buckets[i]!=NULL)
     {