Changeset 58ea04 in git

Timestamp:

Mar 22, 2011, 11:40:25 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

a4081e52fffd1c1c6450f2811d458e9ebc4e2823

Parents:

494884581702ad06eefdf632a5e1abb42bd90f4d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-03-22 11:40:25+01:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:10+01:00

Message:

fixed: kbuckets.cc

File:

• libpolys/polys/kbuckets.cc (modified) (17 diffs)

libpolys/polys/kbuckets.cc

@@ -4 +4 @@
 /* $Id$ */
 
-#include <kernel/mod2.h>
-#include <kernel/structs.h>
+//#include <kernel/mod2.h>
 #include <omalloc/omalloc.h>
-#include <kernel/p_polys.h>
-#include <kernel/febase.h>
-#include <kernel/pShallowCopyDelete.h>
-#include <kernel/numbers.h>
-#include <kernel/ring.h>
-#include <kernel/p_Procs.h>
-#include <kernel/kutil.h>
-#include <kernel/kbuckets.h>
+#include <polys/monomials/p_polys.h>
+//#include <kernel/febase.h>
+//#include <kernel/pShallowCopyDelete.h>
+#include <coeffs/coeffs.h>
+#include <polys/monomials/ring.h>
+//#include <kernel/p_Procs.h>
+//#include <kernel/kutil.h>
+#include <polys/kbuckets.h>
 
 #ifdef HAVE_COEF_BUCKETS
@@ -30 +29 @@
     }                                                                  \
   } while(0)                                                           \
-    if (rField_is_Ring(currRing)) B->buckets_length[i] = pLength(B->buckets[i]);
+    if (rField_is_Ring(B->bucket_ring)) B->buckets_length[i] = pLength(B->buckets[i]);
 #else
 #define MULTIPLY_BUCKET(B,I) do                                        \
@@ -594 +593 @@
            performed when "(i<coef_start)" is true?
            For the time being, I leave it as it is. */
-        if (rField_is_Ring(r) && !(rField_is_Domain(r))) {
+        if (rField_is_Ring(r) && !(rField_is_Domain(r)))
+        {
           bucket->buckets_length[i] = pLength(bucket->buckets[i]);
           kBucketAdjust(bucket, i);
@@ -611 +611 @@
       bucket->buckets[i] = p_Mult_nn(bucket->buckets[i], n, r);
 #ifdef HAVE_RINGS
-      if (rField_is_Ring(currRing) && !(rField_is_Domain(currRing))) {
+      if (rField_is_Ring(r) && !(rField_is_Domain(r)))
+      {
         bucket->buckets_length[i] = pLength(bucket->buckets[i]);
         kBucketAdjust(bucket, i);
@@ -738 +739 @@
     bucket->buckets_length[i] = 0;
 #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing) && !(rField_is_Domain(currRing)))
+    if (rField_is_Ring(r) && !(rField_is_Domain(r)))
     {
       l1 = pLength(p1);
@@ -748 +749 @@
   else
   {
-    pSetCoeff0(m, nNeg(pGetCoeff(m)));
+    pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
     if (spNoether != NULL)
     {
@@ -758 +759 @@
       p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
 #ifdef HAVE_RINGS
-      if (rField_is_Ring(currRing) && !(rField_is_Domain(currRing)))
+      if (rField_is_Ring(r) && !(rField_is_Domain(r)))
       {
         l1 = pLength(p1);
@@ -765 +766 @@
 #endif
     }
-    pSetCoeff0(m, nNeg(pGetCoeff(m)));
+    pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
   }
 
@@ -820 +821 @@
   i = pLogLength(l1);
   #ifdef USE_COEF_BUCKETS
-  number n=n_Init(1,r);
+  number n=n_Init(1,r->cf);
   #endif
   if (i <= bucket->buckets_used && bucket->buckets[i] != NULL)
@@ -1062 +1063 @@
                       poly spNoether)
 {
-  assume((!rIsPluralRing(bucket->bucket_ring))||p_LmEqual(p1,kBucketGetLm(bucket), bucket->bucket_ring));
+  ring r=bucket->bucket_ring;
+  assume((!rIsPluralRing(r))||p_LmEqual(p1,kBucketGetLm(bucket), r));
   assume(p1 != NULL &&
-         p_DivisibleBy(p1,  kBucketGetLm(bucket), bucket->bucket_ring));
+         p_DivisibleBy(p1,  kBucketGetLm(bucket), r));
   assume(pLength(p1) == (int) l1);
 
@@ -1076 +1078 @@
   if(a1==NULL)
   {
-    p_LmDelete(&lm, bucket->bucket_ring);
-    return nInit(1);
-  }
-
-  if (! nIsOne(pGetCoeff(p1)))
+    p_LmDelete(&lm, r);
+    return n_Init(1,r->cf);
+  }
+
+  if (! n_IsOne(pGetCoeff(p1),r->cf))
   {
     number an = pGetCoeff(p1), bn = pGetCoeff(lm);
@@ -1091 +1093 @@
 
     /* setup factor for p1 which cancels leading terms */
-    p_SetCoeff(lm, bn, bucket->bucket_ring);
+    p_SetCoeff(lm, bn, r);
     if ((ct == 0) || (ct == 2))
     {
@@ -1100 +1102 @@
 
       /* correct factor for cancelation by changing sign if an=-1 */
-      if (rField_is_Ring())
-        lm = p_Mult_nn(lm, an, bucket->bucket_ring);
+      if (rField_is_Ring(r))
+        lm = p_Mult_nn(lm, an, r);
       else
         kBucket_Mult_n(bucket, an);
@@ -1109 +1111 @@
   else
   {
-    rn = nInit(1);
-  }
-
-  if (p_GetComp(p1, bucket->bucket_ring) != p_GetComp(lm, bucket->bucket_ring))
-  {
-    p_SetCompP(a1, p_GetComp(lm, bucket->bucket_ring), bucket->bucket_ring);
+    rn = n_Init(1,r->cf);
+  }
+
+  if (p_GetComp(p1, r) != p_GetComp(lm, r))
+  {
+    p_SetCompP(a1, p_GetComp(lm, r), r);
     reset_vec = TRUE;
-    p_SetComp(lm, p_GetComp(p1, bucket->bucket_ring), bucket->bucket_ring);
-    p_Setm(lm, bucket->bucket_ring);
-  }
-
-  p_ExpVectorSub(lm, p1, bucket->bucket_ring);
+    p_SetComp(lm, p_GetComp(p1, r), r);
+    p_Setm(lm, r);
+  }
+
+  p_ExpVectorSub(lm, p1, r);
   l1--;
 
@@ -1130 +1132 @@
   if(l1==1) {
 
-    //if (rField_is_Q(bucket->bucket_ring)) {
+    //if (rField_is_Q(r)) {
       //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);
-      p_SetCoeff0(a1, n_Init(1,bucket->bucket_ring), bucket->bucket_ring);
+      coef=p_GetCoeff(a1,r);
+      lm=p_Mult_nn(lm, coef, r);
+      p_SetCoeff0(a1, n_Init(1,r), r);
       backuped=TRUE;
       //WARNING: not thread_safe
@@ -1147 +1149 @@
 
   if (backuped)
-    p_SetCoeff0(a1,coef,bucket->bucket_ring);
-  p_LmDelete(&lm, bucket->bucket_ring);
-  if (reset_vec) p_SetCompP(a1, 0, bucket->bucket_ring);
+    p_SetCoeff0(a1,coef,r);
+  p_LmDelete(&lm, r);
+  if (reset_vec) p_SetCompP(a1, 0, r);
   kbTest(bucket);
   return rn;
@@ -1159 +1161 @@
   if (r->parameter==NULL)
   {
-    return (r->cf->nSize(n)==1);
+    return (r->cf->cfSize(n,r->cf)==1);
   }
   //if (r->parameter!=NULL)
-  return ((n_IsOne(n,r)) || (n_IsMOne(n,r)));
+  return (n_IsOne(n,r->cf) || n_IsMOne(n,r->cf));
 }