Changeset ab1c36 in git

Timestamp:

Feb 28, 2009, 12:49:05 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

4e35c764980400902281d4a110155ff73cfed41c

Parents:

8066e80d7cea5de772f7b10b2b1930521cb72523

Message:

*hannes: no-norm in NF


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

Location:

kernel

Files:

• kstd2.cc (modified) (6 diffs)
• kutil.h (modified) (2 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.81 2009-02-27 15:51:28 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.82 2009-02-28 11:49:05 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -788 +788 @@
 */
 
-poly redNF (poly h,int &max_ind,kStrategy strat)
+poly redNF (poly h,int &max_ind,int nonorm,kStrategy strat)
 {
   if (h==NULL) return NULL;
@@ -815 +815 @@
       {
 #endif
-      int sl=pSize(strat->S[j]);
-      int jj=j;
-      loop
-      {
-        int sll;
-        jj=kFindNextDivisibleByInS(strat,jj+1,max_ind,&P);
-        if (jj<0) break;
-        sll=pSize(strat->S[jj]);
-        if (sll<sl)
+        int sl=pSize(strat->S[j]);
+        int jj=j;
+        loop
         {
-          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]);
-          }
+          int sll;
+          jj=kFindNextDivisibleByInS(strat,jj+1,max_ind,&P);
+          if (jj<0) break;
+          sll=pSize(strat->S[jj]);
           if (sll<sl)
           {
@@ -847 +833 @@
           }
         }
-      }
-      if (!nIsOne(pGetCoeff(strat->S[j])))
-      {
-        pNorm(strat->S[j]);
-        //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
-      }
+        if (!nonorm && !nIsOne(pGetCoeff(strat->S[j])))
+        {
+          pNorm(strat->S[j]);
+          //if (TEST_OPT_PROT) { PrintS("n"); mflush(); }
+        }
 #ifdef HAVE_RINGS
       }
@@ -1230 +1215 @@
   if (TEST_OPT_PROT) { PrintS("r"); mflush(); }
   int max_ind;
-  p = redNF(pCopy(q),max_ind,strat);
+  p = redNF(pCopy(q),max_ind,lazyReduce & KSTD_NF_NONORM,strat);
   if ((p!=NULL)&&((lazyReduce & KSTD_NF_LAZY)==0))
   {
@@ -1292 +1277 @@
     {
       if (TEST_OPT_PROT) { PrintS("r");mflush(); }
-      p = redNF(pCopy(q->m[i]),max_ind,strat);
+      p = redNF(pCopy(q->m[i]),max_ind,lazyReduce & KSTD_NF_NONORM,strat);
       if ((p!=NULL)&&((lazyReduce & KSTD_NF_LAZY)==0))
       {

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.41 2009-02-22 17:37:55 Singular Exp $ */
+/* $Id: kutil.h,v 1.42 2009-02-28 11:49:04 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -406 +406 @@
 poly redtail (poly p,int pos,kStrategy strat);
 poly redtail (LObject *L,int pos,kStrategy strat);
-poly redNF (poly h,int & max_ind,kStrategy strat);
+poly redNF (poly h,int & max_ind,int nonorm,kStrategy strat);
 int redNF0 (LObject *P,kStrategy strat);
 poly redNFTail (poly h,const int sl,kStrategy strat);