Changeset 78b904 in git

Timestamp:

Jul 23, 2007, 12:46:57 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9866fc7d15f2e47654cbf50937ac78e9ab9c7a33

Parents:

7c38bcb5f2878e308ca07340e00bfe7b4fdd406e

Message:

*hannes: NF2: lazy normalize


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

File:

• kernel/kstd2.cc (modified) (4 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.46 2007-07-13 14:19:26 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.47 2007-07-23 10:46:57 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -995 +995 @@
     if (j>=0)
     {
+      if (!nIsOne(pGetCoeff(strat->S[j])))
+      {
+         pNorm(strat->S[j]);
+         //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+      }
       nNormalize(pGetCoeff(P.p));
 #ifdef KDEBUG
@@ -1344 +1349 @@
   /*- compute------------------------------------------------------- -*/
   //if ((TEST_OPT_INTSTRATEGY)&&(lazyReduce==0))
-  {
-    for (i=strat->sl;i>=0;i--)
-      pNorm(strat->S[i]);
-  }
+  //{
+  //  for (i=strat->sl;i>=0;i--)
+  //    pNorm(strat->S[i]);
+  //}
   kTest(strat);
   if (TEST_OPT_PROT) { PrintS("r"); mflush(); }
@@ -1354 +1359 @@
   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;
   }
   /*- release temp data------------------------------- -*/