Changeset 9866fc in git

Timestamp:

Jul 23, 2007, 12:50:02 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9870019aa6443f84c0f191537798b699dea0a7b5

Parents:

78b904c6080f8b523545e5a4a1b9d12db23607d4

Message:

*hannes: NF2: lazy normalize


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

Location:

kernel

Files:

• kstd2.cc (modified) (3 diffs)
• kutil.cc (modified) (7 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.47 2007-07-23 10:46:57 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.48 2007-07-23 10:50:02 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1405 +1405 @@
   /*- compute------------------------------------------------------- -*/
   res=idInit(IDELEMS(q),q->rank);
-  //if ((TEST_OPT_INTSTRATEGY)&&(lazyReduce==0))
-  {
-    for (i=strat->sl;i>=0;i--)
-      pNorm(strat->S[i]);
-  }
   for (i=IDELEMS(q)-1; i>=0; i--)
   {
@@ -1418 +1413 @@
       if ((p!=NULL)&&(lazyReduce==0))
       {
+        BITSET save=test;
+        test &= ~Sy_bit(OPT_INTSTRATEGY);
         if (TEST_OPT_PROT) { PrintS("t"); mflush(); }
         p = redtailBba(p,max_ind,strat);
+        test=save;
       }
       res->m[i]=p;

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.62 2007-07-13 14:19:26 Singular Exp $ */
+/* $Id: kutil.cc,v 1.63 2007-07-23 10:46:57 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -2530 +2530 @@
   idSkipZeroes(G0);
   return G0;
-}   
+}
 #endif
 
@@ -4267 +4267 @@
         if (With == NULL) break;
       }
+      if ((!TEST_OPT_INTSTRATEGY) && (!nIsOne(pGetCoeff(With->p))))
+      {
+        With->pNorm();
+        //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+      }
       strat->redTailChange=TRUE;
       if (ksReducePolyTail(L, With, &Ln))
       {
         // reducing the tail would violate the exp bound
-        //  set a flag and hope for a retry (in bba)
-        strat->completeReduce_retry=TRUE;
+        //  set a flag and hope for a retry (in bba)
+        strat->completeReduce_retry=TRUE;
         do
         {
@@ -4279 +4284 @@
           L->pLength++;
         } while (!Ln.IsNull());
-        goto all_done;
+        goto all_done;
       }
       if (Ln.IsNull()) goto all_done;
@@ -4494 +4499 @@
   }
   /*- test, if a unit is in F -*/
-  if ((strat->sl>=0) 
+  if ((strat->sl>=0)
 #ifdef HAVE_RINGS
        && !rField_is_Ring(currRing)
@@ -5477 +5482 @@
   strat->fromT = FALSE;
   strat->noTailReduction = !TEST_OPT_REDTAIL;
-  if (!TEST_OPT_SB_1) 
+  if (!TEST_OPT_SB_1)
   {
     updateS(TRUE,strat);
@@ -6370 +6375 @@
           enterOnePair(j,h,ecart,isFromQ,strat, atR);
         }
-        /* HERE we put (h, s*h) pairs */
+        /* HERE we put (h, s*h) pairs */
       }
     }