Changeset c1489f2 in git for Singular/kstdfac.cc

Timestamp:

Oct 19, 1999, 2:42:51 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

828c28214a338ded17f2365a5cc851ddddadfac3

Parents:

d2b6cf082728946a490177ca3d6aba074109fe5c

Message:

* stuff from Thomas
* various bug fixes


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

File:

• Singular/kstdfac.cc (modified) (5 diffs)

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.26 1999-10-18 11:19:27 obachman Exp $ */
+/* $Id: kstdfac.cc,v 1.27 1999-10-19 12:42:45 obachman Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -288 +288 @@
       if (TEST_OPT_INTSTRATEGY)
       {
-        if (!TEST_OPT_MINRES||(n->syzComp==0)||(!n->homog))
-        {
-          n->P.p = redtailBba(n->P.p,pos-1,n);
-          pCleardenom(n->P.p);
-        }
+        n->P.p = redtailBba(n->P.p,pos-1,n);
+        pCleardenom(n->P.p);
       }
       else
       {
         pNorm(n->P.p);
-        if (!TEST_OPT_MINRES||(n->syzComp==0)||(!n->homog))
-        {
-          n->P.p = redtailBba(n->P.p,pos-1,n);
-        }
+        n->P.p = redtailBba(n->P.p,pos-1,n);
       }
       if (TEST_OPT_DEBUG)
@@ -498 +492 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (!TEST_OPT_MINRES||(strat->syzComp==0)||(!strat->homog))
-          {
-            strat->P.p = redtailBba(strat->P.p,strat->sl,strat);
-            if (strat->redTailChange) pCleardenom(strat->P.p);
-          }
+          strat->P.p = redtailBba(strat->P.p,strat->sl,strat);
+          if (strat->redTailChange) pCleardenom(strat->P.p);
         }
         else
         {
           pNorm(strat->P.p);
-          if (!TEST_OPT_MINRES||(strat->syzComp==0)||(!strat->homog))
-          {
-            strat->P.p = redtailBba(strat->P.p,strat->sl,strat);
-          }
+          strat->P.p = redtailBba(strat->P.p,strat->sl,strat);
         }
         if (strat->redTailChange)
@@ -534 +522 @@
       if (strat->P.lcm!=NULL) pFree1(strat->P.lcm);
       int i;
-//      for(i=0;i<IDELEMS(fac);i++)
-//      {
-//        int pos;
-//        if (strat->sl==-1) pos=0;
-//        else pos=posInS(strat->S,strat->sl,fac->m[i]);
-//        if (TEST_OPT_INTSTRATEGY)
-//        {
-//          if (!TEST_OPT_MINRES||(strat->syzComp==0)||(!strat->homog))
-//          {
-//            fac->m[i] = redtailBba(fac->m[i],pos-1,strat);
-//            pCleardenom(fac->m[i]);
-//          }
-//        }
-//        else
-//        {
-//          pNorm(fac->m[i]);
-//          if (!TEST_OPT_MINRES||(strat->syzComp==0)||(!strat->homog))
-//          {
-//            fac->m[i] = redtailBba(fac->m[i],pos-1,strat);
-//          }
-//        }
-//      }
 
       for(i=IDELEMS(fac)-1;i>=0;i--)
@@ -579 +545 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          if (!TEST_OPT_MINRES||(n->syzComp==0)||(!n->homog))
-          {
-            n->P.p = redtailBba(n->P.p,pos-1,n);
-            if (n->redTailChange) pCleardenom(n->P.p);
-          }
+          n->P.p = redtailBba(n->P.p,pos-1,n);
+          if (n->redTailChange) pCleardenom(n->P.p);
         }
         else
         {
           pNorm(n->P.p);
-          if (!TEST_OPT_MINRES||(n->syzComp==0)||(!n->homog))
-          {
-            n->P.p = redtailBba(n->P.p,pos-1,n);
-          }
+          n->P.p = redtailBba(n->P.p,pos-1,n);
         }