Changeset bef194 in git for Singular/kstd1.cc

Timestamp:

Dec 18, 2000, 2:30:39 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

64b116830d916500b5f224c29ed87bb214f3c975

Parents:

35f23db1d98503370c2432aebc628c69b0560444

Message:

* new options: redThrough and oldStd
* increased version to 1.3.11


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

File:

• Singular/kstd1.cc (modified) (11 diffs)

Singular/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.72 2000-12-15 11:33:58 obachman Exp $ */
+/* $Id: kstd1.cc,v 1.73 2000-12-18 13:30:35 obachman Exp $ */
 /*
 * ABSTRACT:
@@ -41 +41 @@
                 |Sy_bit(OPT_SUGARCRIT)     /*  5 */
                 |Sy_bit(OPT_REDTHROUGH)
+                |Sy_bit(OPT_OLDSTD)
                 |Sy_bit(OPT_FASTHC)        /* 10 */
                 |Sy_bit(OPT_KEEPVARS)      /* 21 */
@@ -70 +71 @@
                 |Sy_bit(18)
                 |Sy_bit(19)
-//                |Sy_bit(20) obachman 11/00 tossed
+//                |Sy_bit(20) obachman 11/00 tossed: 12/00 used for redOldStd
+  |Sy_bit(OPT_OLDSTD)
                 |Sy_bit(21)
                 |Sy_bit(22)
@@ -225 +227 @@
 
     // end of search: have to reduce with pi
-    if (ei > h->ecart)
+    if (!K_TEST_OPT_REDTHROUGH && ei > h->ecart)
     {
       // It is not possible to reduce h with smaller ecart;
@@ -298 +300 @@
      *-if the number of pre-defined reductions jumps
      */
-    if ((strat->Ll >= 0)
+    if (!K_TEST_OPT_REDTHROUGH && (strat->Ll >= 0)
         && ((d >= reddeg) || (pass > strat->LazyPass)))
     {
@@ -401 +403 @@
     if (!strat->homog)
     {
-#ifndef HAVE_OLD_STD
-      if (strat->honey)
+      if (!K_TEST_OPT_OLDSTD && strat->honey)
       {
         h->SetpFDeg();
@@ -413 +414 @@
       }
       else
-#endif
-      d = h->SetDegStuffReturnLDeg(strat->LDegLast);
+        d = h->SetDegStuffReturnLDeg(strat->LDegLast);
       /*- try to reduce the s-polynomial -*/
       pass++;
@@ -422 +422 @@
        *-if the number of pre-defined reductions jumps
        */
-      if ((strat->Ll >= 0)
+      if (!K_TEST_OPT_REDTHROUGH && (strat->Ll >= 0)
           && ((d >= reddeg) || (pass > strat->LazyPass)))
       {
@@ -1071 +1071 @@
   int olddeg = 0;
   int reduc = 0;
+  int red_result = 1;
   int hilbeledeg=1,hilbcount=0;
 
@@ -1174 +1175 @@
       // might be NULL from noether !!!
       if (TEST_OPT_PROT) 
-        message(strat->P.ecart+strat->P.GetpFDeg(),&olddeg,&reduc,strat);
+        message(strat->P.ecart+strat->P.GetpFDeg(),&olddeg,&reduc,strat, red_result);
       // reduce
-      strat->red(&strat->P,strat);
+      red_result = strat->red(&strat->P,strat);
     }
 
@@ -1552 +1553 @@
   kStrategy strat=new skStrategy;
 
-#ifdef HAVE_OLD_STD
-  test &= ~Sy_bit(OPT_REDTHROUGH);
-#endif
-  
   if(!TEST_OPT_RETURN_SB)
     strat->syzComp = syzComp;