Changeset 4378bb in git

Timestamp:

Nov 12, 2008, 5:07:20 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

6ba61462da1bbd769df3d51f1714e8e370942645

Parents:

6bd405f611d9e3d1ccbd34fdf122aa98e8474bc6

Message:

*hannes/gp: interred


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

File:

• kernel/kstd1.cc (modified) (7 diffs)

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.39 2008-09-16 12:35:32 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.40 2008-11-12 16:07:20 Singular Exp $ */
 /*
 * ABSTRACT:
@@ -2231 +2231 @@
     else
     {
+      int deg_before=olddeg;
       if (TEST_OPT_PROT)
-        message((strat->honey ? strat->P.ecart : 0) + strat->P.pFDeg(),
+        message(strat->P.pFDeg(),
                 &olddeg,&reduc,strat, red_result);
 
@@ -2256 +2257 @@
       {
         strat->P.pCleardenom();
-        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+        if (0)
+        //if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
         {
           strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
@@ -2265 +2267 @@
       {
         strat->P.pNorm();
-        if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
+        if (0)
+        //if ((TEST_OPT_REDSB)||(TEST_OPT_REDTAIL))
           strat->P.p = redtailBba(&(strat->P),pos-1,strat, withT);
       }
@@ -2300 +2303 @@
   /* complete reduction of the standard basis--------- */
 
-  //if (TEST_OPT_REDSB)
-  if(need_retry==0)
+  if((need_retry==0) && (TEST_OPT_REDSB))
   {
     completeReduce(strat);
@@ -2345 +2347 @@
   if(pOrdSgn==-1) return kInterRedOld(F,Q);
 
+  BITSET save=test;
+  //test|=Sy_bit(OPT_NOT_SUGAR);
+  test|=Sy_bit(OPT_REDTHROUGH);
+  //test&= ~Sy_bit(OPT_REDTAIL);
+  //test&= ~Sy_bit(OPT_REDSB);
+  //extern char * showOption() ;
+  //Print("%s\n",showOption());
+
   int need_retry;
   int counter=3;
@@ -2358 +2368 @@
     res = res1;
   }
+  test=save;
   idSkipZeroes(res);
   return res;