Changeset 19408c in git

Timestamp:

Jul 25, 2007, 12:03:20 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

18ff4c01a3ffc8cf752b79bdab6fe61ba7bf80a2

Parents:

35468408f99e640b45941429275be4d3b72d2bf1

Message:

*hannes: NF


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

File:

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

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.51 2007-07-24 13:12:26 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.52 2007-07-25 10:03:20 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1033 +1033 @@
         if (sll<sl)
         {
-          j=jj;
-          sl=sll;
+          if (!nIsOne(pGetCoeff(strat->S[j])))
+          {
+            pNorm(strat->S[j]);
+            if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+            sl=pSize(strat->S[j]);
+          }
+          if (!nIsOne(pGetCoeff(strat->S[jj])))
+          {
+            pNorm(strat->S[jj]);
+            if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+            sll=pSize(strat->S[jj]);
+          }
+          if (sll<sl)
+          {
+            if (TEST_OPT_DEBUG) Print("better(S%d:%d -> S%d:%d)\n",j,sl,jj,sll);
+            else if (TEST_OPT_PROT) { PrintS("b"); mflush(); }
+            j=jj;
+            sl=sll;
+          }
         }
       }
@@ -1040 +1057 @@
       {
         pNorm(strat->S[j]);
-        //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+        if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
       }
       nNormalize(pGetCoeff(P.p));