Changeset 75d084 in git

Timestamp:

Apr 30, 2007, 5:47:41 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

580ab50138ac90a455bc8ccfd0bfb17268011c18

Parents:

8d670359ca4f71b1359f6a846d1286150c4f39e0

Message:

*hannes: reorderS, updateS, code simpl: paisr removed


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

File:

• kernel/kutil.cc (modified) (15 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.49 2007-03-29 11:34:52 Singular Exp $ */
+/* $Id: kutil.cc,v 1.50 2007-04-30 15:47:41 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2568 +2568 @@
 
 /*2
-*constructs the pairset at the beginning
-*of the buchberger/mora algorithm
-*/
-void pairs (kStrategy strat)
-{
-  int j,i;
-//  Print("pairs:sl=%d\n",strat->sl);
-//  for (i=0; i<=strat->sl; i++)
-//  {
-//    Print("s%d:",i);pWrite(strat->S[i]);
-//  }
-  if (strat->fromQ!=NULL)
-  {
-    for (i=1; i<=strat->sl; i++)
-    {
-      initenterpairs(strat->S[i],i-1,strat->ecartS[i],strat->fromQ[i],strat);
-    }
-  }
-  else
-  {
-    for (i=1; i<=strat->sl; i++)
-    {
-      initenterpairs(strat->S[i],i-1,strat->ecartS[i],0,strat);
-    }
-  }
-  /*deletes superfluous elements in S*/
-  i = -1;
-  loop
-  {
-    i++;
-    if (i >= strat->sl) break;
-    if (1//(strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
-    )
-    {
-      j=i;
-      loop
-      {
-        j++;
-        if (j > strat->sl) break;
-        if (pLmShortDivisibleBy(strat->S[i], strat->sevS[i],
-                              strat->S[j], ~ strat->sevS[j]))
-        {
-        //  Print("delete %d=",j);
-        //  wrp(strat->S[j]);
-        //  Print(" wegen %d=",i);
-        //  wrp(strat->S[i]);
-        //  Print("( fromQ=%d)\n", (strat->fromQ) ? strat->fromQ[j]:0);
-          if ((strat->fromQ==NULL) || (strat->fromQ[j]==0))
-          {
-            deleteInS(j,strat);
-            j--;
-          }
-        }
-      }
-    }
-  }
-}
-
-/*2
 *reorders  s with respect to posInS,
 *suc is the first changed index or zero
 */
+
 void reorderS (int* suc,kStrategy strat)
 {
@@ -2636 +2578 @@
   unsigned long sev;
   poly  p;
-
-  *suc = -1;
-  for (i=1; i<=strat->sl; i++)
+  int new_suc=strat->sl+1;
+  i= *suc;
+  if (i<0) i=0;
+
+  for (; i<=strat->sl; i++)
   {
     at = posInS(strat,i-1,strat->S[i],strat->ecartS[i]);
     if (at != i)
     {
-      if ((*suc > at) || (*suc == -1)) *suc = at;
+      if (new_suc > at) new_suc = at;
       p = strat->S[i];
       ecart = strat->ecartS[i];
@@ -2670 +2614 @@
     }
   }
+  if (new_suc <= strat->sl) *suc=new_suc;
+  else                      *suc=-1;
 }
 
@@ -4625 +4571 @@
 }
 
+#if 0
 /*2
 * reduces h using the elements from Q in the set S
@@ -4649 +4596 @@
   return h;
 }
+#endif
 
 /*2
@@ -4730 +4678 @@
   int i, suc=0;
   poly redSi=NULL;
-  BOOLEAN change;
+  BOOLEAN change,any_change;
 //  Print("nach initS: updateS start mit sl=%d\n",(strat->sl));
 //  for (i=0; i<=(strat->sl); i++)
@@ -4739 +4687 @@
 //  }
 //  Print("pOrdSgn=%d\n", pOrdSgn);
+  any_change=FALSE;
   if (pOrdSgn==1)
   {
@@ -4747 +4696 @@
       {
         change=FALSE;
-        if (1//((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
-        && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
+        if (((strat->fromQ==NULL) || (strat->fromQ[i]==0)) && (i>0))
         {
           redSi = pHead(strat->S[i]);
           strat->S[i] = redBba(strat->S[i],i-1,strat);
-          if ((strat->ak!=0)&&(strat->S[i]!=NULL))
-            strat->S[i]=redQ(strat->S[i],i+1,strat); /*reduce S[i] mod Q*/
+          //if ((strat->ak!=0)&&(strat->S[i]!=NULL))
+          //  strat->S[i]=redQ(strat->S[i],i+1,strat); /*reduce S[i] mod Q*/
           if (pCmp(redSi,strat->S[i])!=0)
           {
             change=TRUE;
+            any_change=TRUE;
             if (TEST_OPT_DEBUG)
             {
@@ -4793 +4742 @@
         i++;
       }
-      reorderS(&suc,strat);
+      if (any_change) reorderS(&suc,strat);
+      else break;
     }
     if (toT)
@@ -4833 +4783 @@
       {
         change=FALSE;
-        if (1//((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
-        && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
+        if (((strat->fromQ==NULL) || (strat->fromQ[i]==0)) && (i>0))
         {
           redSi=pHead((strat->S)[i]);
@@ -4845 +4794 @@
           else if (pCmp((strat->S)[i],redSi)!=0)
           {
+            any_change=TRUE;
             h.p = strat->S[i];
             strat->initEcart(&h);
@@ -4867 +4817 @@
       kTest(strat);
 #endif
-      reorderS(&suc,strat);
+      if (any_change) reorderS(&suc,strat);
+      else { suc=-1; break; }
       if (h.p!=NULL)
       {
@@ -4880 +4831 @@
     for (i=0; i<=strat->sl; i++)
     {
-      if (((strat->fromQ==NULL) || (strat->fromQ[i]==0))
-      )
+      if ((strat->fromQ==NULL) || (strat->fromQ[i]==0))
       {
         strat->S[i] = h.p = redtail(strat->S[i],strat->sl,strat);
@@ -5284 +5234 @@
   strat->fromT = FALSE;
   strat->noTailReduction = !TEST_OPT_REDTAIL;
-  if(!TEST_OPT_SB_1)
+  if (!TEST_OPT_SB_1) 
   {
     updateS(TRUE,strat);
-    pairs(strat);
   }
   if (strat->fromQ!=NULL) omFreeSize(strat->fromQ,IDELEMS(strat->Shdl)*sizeof(int));