Changeset 391323 in git for kernel/kstd2.cc

Timestamp:

Oct 12, 2006, 10:55:42 AM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

200e7290fa530efe0851712fa9c959236d73cb35

Parents:

8fc1b4d51d3b74816a22e5b09d2875ca81a5c44d

Message:

*hannes: NF/redNF optimized


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.21 2006-10-05 18:26:10 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.22 2006-10-12 08:55:40 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -81 +81 @@
 
 // same as above, only with set S
-int kFindDivisibleByInS(const kStrategy strat, LObject* L)
+int kFindDivisibleByInS(const kStrategy strat, int* max_ind, LObject* L)
 {
   unsigned long not_sev = ~L->sev;
@@ -88 +88 @@
 
   pAssume(~not_sev == p_GetShortExpVector(p, currRing));
-  int ende=posInS(strat,strat->sl,p,0)+1;
-  if (ende>strat->sl) ende=strat->sl;
+  int ende=strat->sl;
+  if ((*max_ind)<ende) ende=posInS(strat,*max_ind,p,0)+1;
+  if (ende>(*max_ind)) ende=(*max_ind);
+  (*max_ind)=ende;
   loop
   {
@@ -708 +710 @@
       if (at <= strat->Ll)
       {
-        if (kFindDivisibleByInS(strat, h) < 0)
+        int dummy=strat->sl;
+        if (kFindDivisibleByInS(strat, &dummy, h) < 0)
           return 1;
         enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
@@ -730 +733 @@
 */
 
-poly redNF (poly h,kStrategy strat)
+poly redNF (poly h,int &max_ind,kStrategy strat)
 {
   if (h==NULL) return NULL;
   int j;
+  max_ind=strat->sl;
 
   if (0 > strat->sl)
@@ -755 +759 @@
 #endif
 */
-      j=kFindDivisibleByInS(strat,&P);
+      j=kFindDivisibleByInS(strat,&max_ind,&P);
     if (j>=0)
     {
@@ -1062 +1066 @@
   kTest(strat);
   if (TEST_OPT_PROT) { PrintS("r"); mflush(); }
-  p = redNF(pCopy(q),strat);
+  int max_ind;
+  p = redNF(pCopy(q),max_ind,strat);
   if ((p!=NULL)&&(lazyReduce==0))
   {
     if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
-    p = redtailBba(p,strat->sl,strat);
+    p = redtailBba(p,max_ind,strat);
   }
   /*- release temp data------------------------------- -*/
@@ -1089 +1094 @@
   int   i;
   ideal res;
+  int max_ind;
 
   if (idIs0(q))
@@ -1117 +1123 @@
     {
       if (TEST_OPT_PROT) { PrintS("r");mflush(); }
-      p = redNF(pCopy(q->m[i]),strat);
+      p = redNF(pCopy(q->m[i]),max_ind,strat);
       if ((p!=NULL)&&(lazyReduce==0))
       {
         if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
-        p = redtailBba(p,strat->sl,strat);
+        p = redtailBba(p,max_ind,strat);
       }
       res->m[i]=p;