Changeset 1315ea in git

Timestamp:

Jan 26, 2007, 1:08:28 PM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

724bb08fec87e2a03469244f7f07c731354fe49b

Parents:

603d451f8e2d1a13a2299b7b484a8db3ded8f19b

Message:

+ redTail for nc


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

File:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.112 2007-01-11 10:58:22 Singular Exp $ */
+/* $Id: tgb.cc,v 1.113 2007-01-26 12:08:28 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -1964 +1964 @@
     kBucketDestroy(&buf[j].bucket);
 
-    if (!c->nc) {
+    //if (!c->nc) {
       if ((TEST_OPT_REDTAIL)&&(c->S->rank<=1)){
       p=redNFTail(p,c->strat->sl,c->strat, 0);
@@ -1970 +1970 @@
       p=redTailShort(p, c->strat);
       }
-      }
+      //}
     sbuf[j]=add_to_basis_ideal_quotient(p,c,ibuf+j);
     //sbuf[j]=add_to_basis(p,-1,-1,c,ibuf+j);
@@ -2076 +2076 @@
 static poly redNFTail (poly h,const int sl,kStrategy strat, int len)
 {
+  BOOLEAN nc=rIsPluralRing(currRing);
   if (h==NULL) return NULL;
   pTest(h);
@@ -2119 +2120 @@
             number coef;
             pTest(strat->S[j]);
-            coef=kBucketPolyRed(P.bucket,strat->S[j],
+            if (nc){
+              nc_BucketPolyRed_Z(P.bucket, strat->S[j], &coef);
+            } else
+              coef=kBucketPolyRed(P.bucket,strat->S[j],
                                 strat->lenS[j]/*pLength(strat->S[j])*/,strat->kNoether);
             pMult_nn(res,coef);