Changeset 5eb865 in git for kernel/kstd2.cc

Timestamp:

Jun 9, 2009, 8:21:50 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

e4be351ada16eebdaa1e48ce01115ffc5287dbd3

Parents:

b82abb0dc3349df20acd8231f648b8ff51bc61b6

Message:

*hannes: redtail for Z


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.87 2009-06-04 08:15:45 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.88 2009-06-09 18:21:50 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1221 +1221 @@
   if ((p!=NULL)&&((lazyReduce & KSTD_NF_LAZY)==0))
   {
-    BITSET save=test;
-    test &= ~Sy_bit(OPT_INTSTRATEGY);
     if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
-    p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0);
-    test=save;
+    #ifdef HAVE_RINGS
+    if (rField_is_Ring())
+    {
+      p = redtailBba_Z(p,max_ind,strat);
+    }
+    else
+    #endif
+    {
+      BITSET save=test;
+      test &= ~Sy_bit(OPT_INTSTRATEGY);
+      p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0);
+      test=save;
+    }
   }
   /*- release temp data------------------------------- -*/
@@ -1277 +1286 @@
   /*- compute------------------------------------------------------- -*/
   res=idInit(IDELEMS(q),si_max(q->rank,F->rank));
+  BITSET save=test;
+  test &= ~Sy_bit(OPT_INTSTRATEGY);
   for (i=IDELEMS(q)-1; i>=0; i--)
   {
@@ -1285 +1296 @@
       if ((p!=NULL)&&((lazyReduce & KSTD_NF_LAZY)==0))
       {
-        BITSET save=test;
-        test &= ~Sy_bit(OPT_INTSTRATEGY);
         if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
-        p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0);
-        test=save;
+        #ifdef HAVE_RINGS
+        if (rField_is_Ring())
+        {
+          p = redtailBba_Z(p,max_ind,strat);
+        }
+        else
+        #endif
+        {
+          p = redtailBba(p,max_ind,strat,(lazyReduce & KSTD_NF_NONORM)==0);
+        }
       }
       res->m[i]=p;
@@ -1297 +1314 @@
   }
   /*- release temp data------------------------------- -*/
+  test=save;
   omfree(strat->sevS);
   omfree(strat->ecartS);