Changeset 391323 in git

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

200e7290fa530efe0851712fa9c959236d73cb35

Parents:

8fc1b4d51d3b74816a22e5b09d2875ca81a5c44d

Message:

*hannes: NF/redNF optimized


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

Location:

kernel

Files:

• kstd1.cc (modified) (3 diffs)
• kstd2.cc (modified) (9 diffs)
• kutil.cc (modified) (4 diffs)
• kutil.h (modified) (4 diffs)
• tgb.cc (modified) (5 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.12 2006-10-05 18:26:09 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.13 2006-10-12 08:55:39 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -295 +295 @@
       if (at <= strat->Ll)
       {
-        if (kFindDivisibleByInS(strat, h) < 0)
+        int dummy=strat->sl;
+        if (kFindDivisibleByInS(strat, &dummy, h) < 0)
         {
           if (strat->honey && !strat->posInLDependsOnLength)
@@ -416 +417 @@
         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);

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;

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.31 2006-10-05 10:30:03 Singular Exp $ */
+/* $Id: kutil.cc,v 1.32 2006-10-12 08:55:40 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1223 +1223 @@
   if (strat->sugarCrit)
   {
-    if(
-    (!((strat->ecartS[i]>0)&&(ecart>0)))
+    if((!((strat->ecartS[i]>0)&&(ecart>0)))
     && pHasNotCF(p,strat->S[i]))
     {
@@ -1460 +1459 @@
   {
     //PrintS("prod-crit\n");
-      if (!rIsPluralRing(currRing))
-      {
-        strat->cp++;
-        return;
-      }
+    if (!rIsPluralRing(currRing))
+    {
+      strat->cp++;
+      return;
+    }
   }
 
@@ -2651 +2650 @@
 *             otherwise, bba has to be changed
 */
-int posInS (kStrategy strat, int length,poly p, int ecart_p)
+int posInS (const kStrategy strat, const int length,const poly p,
+            const int ecart_p)
 {
   if(length==-1) return 0;

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.19 2006-10-05 18:26:10 Singular Exp $ */
+/* $Id: kutil.h,v 1.20 2006-10-12 08:55:41 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -354 +354 @@
 void initEcartPairBba (LObject* Lp,poly f,poly g,int ecartF,int ecartG);
 void initEcartPairMora (LObject* Lp,poly f,poly g,int ecartF,int ecartG);
-int posInS (kStrategy strat,int length,poly p, int ecart_p);
+int posInS (const kStrategy strat, const int length, const poly p, 
+            const int ecart_p);
 int posInT0 (const TSet set,const int length,LObject &p);
 int posInT1 (const TSet set,const int length,LObject &p);
@@ -391 +392 @@
 poly redtail (poly p,int pos,kStrategy strat);
 poly redtail (LObject *L,int pos,kStrategy strat);
-poly redNF (poly h,kStrategy strat);
+poly redNF (poly h,int & max_ind,kStrategy strat);
 int redNF0 (LObject *P,kStrategy strat);
 poly redNFTail (poly h,const int sl,kStrategy strat);
@@ -444 +445 @@
                         const int tl, const LObject* L, const int start=0);
 // same with S
-int kFindDivisibleByInS(const kStrategy strat, LObject* L);
+int kFindDivisibleByInS(const kStrategy strat, int *max_ind, LObject* L);
 
 TObject*

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.101 2006-10-05 18:26:10 Singular Exp $ */
+/* $Id: tgb.cc,v 1.102 2006-10-12 08:55:42 Singular Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -767 +767 @@
   int i=0;
   LObject P;
-  while(i<=strat->sl){
+  while(i<=strat->sl)
+  {
     P.p=strat->S[i];
     P.sev=strat->sevS[i];
-    if(kFindDivisibleByInS(strat,&P)!=i)
+    int dummy=strat->sl;
+    if(kFindDivisibleByInS(strat,&dummy,&P)!=i)
     {
       deleteInS(i,strat);
@@ -777 +779 @@
       int j;
       for(j=0;j<c->n;j++)
-  if(c->S->m[j]==P.p)
-  {
-    found=TRUE;
-    break;
-  }
+      {
+        if(c->S->m[j]==P.p)
+        {
+          found=TRUE;
+          break;
+        }
+      }
       if (!found)
   pDelete(&P.p);
@@ -1546 +1550 @@
   //int max_pos=simple_posInS(strat,P.p);
   loop
-    {
-      j=kFindDivisibleByInS(strat,&P);
+  {
+      int dummy=strat->sl;
+      j=kFindDivisibleByInS(strat,&dummy,&P);
       if ((j>=0) && ((!n)||
         ((strat->lenS[j]<=n) &&
@@ -2026 +2031 @@
       loop
       {
-          j=kFindDivisibleByInS(strat,&P);
+          int dummy=strat->sl;
+          j=kFindDivisibleByInS(strat,&dummy,&P);
           if (j>=0)
           {