Changeset 889de3e in git

Timestamp:

Nov 29, 2006, 7:09:45 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

9539e8af1a7d0840365c263c55c25018387e104c

Parents:

d257ae16f04da87471103e162ffbf37e5a882860

Message:

*hannes: updateS simplified


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

File:

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

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.36 2006-11-17 14:48:40 Singular Exp $ */
+/* $Id: kutil.cc,v 1.37 2006-11-29 18:09:45 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -4748 +4748 @@
   int i, suc=0;
   poly redSi=NULL;
+  BOOLEAN change;
 //  Print("nach initS: updateS start mit sl=%d\n",(strat->sl));
 //  for (i=0; i<=(strat->sl); i++)
@@ -4763 +4764 @@
       while (i<=strat->sl)
       {
+        change=FALSE;
         if (((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
         && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
         {
-          pDelete(&redSi);
           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 (TEST_OPT_DEBUG && (pCmp(redSi,strat->S[i])!=0))
-          {
-            PrintS("reduce:");
-            wrp(redSi);PrintS(" to ");p_wrp(strat->S[i], currRing, strat->tailRing);PrintLn();
-          }
-          if (TEST_OPT_PROT && (pCmp(redSi,strat->S[i])!=0))
-          {
-            if (strat->S[i]==NULL)
-              PrintS("V");
-            else
-              PrintS("v");
-            mflush();
-          }
+          if (pCmp(redSi,strat->S[i])!=0)
+          {
+            change=TRUE;
+            if (TEST_OPT_DEBUG)
+            {
+              PrintS("reduce:");
+              wrp(redSi);PrintS(" to ");p_wrp(strat->S[i], currRing, strat->tailRing);PrintLn();
+            }
+            if (TEST_OPT_PROT)
+            {
+              if (strat->S[i]==NULL)
+                PrintS("V");
+              else
+                PrintS("v");
+              mflush();
+            }
+          }
+          pDeleteLm(&redSi);
           if (strat->S[i]==NULL)
           {
-            pDelete(&redSi);
             deleteInS(i,strat);
             i--;
           }
-          else
+          else if (change)
           {
-            pDelete(&redSi);
             if (TEST_OPT_INTSTRATEGY)
             {
@@ -4847 +4851 @@
       while (i<=strat->sl)
       {
+        change=FALSE;
         if (((strat->syzComp==0) || (pGetComp(strat->S[i])<=strat->syzComp))
         && ((strat->fromQ==NULL) || (strat->fromQ[i]==0)))
         {
-          pDelete(&redSi);
           redSi=pHead((strat->S)[i]);
           (strat->S)[i] = redMora((strat->S)[i],i-1,strat);
@@ -4858 +4862 @@
             i--;
           }
-          else
+          else if (pCmp((strat->S)[i],redSi)!=0)
           {
             if (TEST_OPT_INTSTRATEGY)
             {
-              pDelete(&redSi);
               pCleardenom(strat->S[i]);// also does a pContent
               h.p = strat->S[i];
@@ -4870 +4873 @@
             else
             {
-              pDelete(&redSi);
               pNorm(strat->S[i]);
               h.p = strat->S[i];
@@ -4879 +4881 @@
             strat->sevS[i] = h.sev;
           }
+          pDeleteLm(&redSi);
           kTest(strat);
         }
@@ -4924 +4927 @@
     if (suc!= -1) updateS(toT,strat);
   }
-  if (redSi!=NULL) pDeleteLm(&redSi);
 #ifdef KDEBUG
   kTest(strat);