Changeset e36a2c0 in git

Timestamp:

Feb 25, 2005, 4:07:05 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

41e418899bda23bfaa5122244dc67751826b1774

Parents:

c94036980b50bb7b8ff25462ce8b0f87a0ebad02

Message:

*hannes: more pContent


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

File:

• kernel/gr_kstd2.cc (modified) (8 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.5 2005-02-17 09:42:18 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.6 2005-02-25 15:07:05 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -90 +90 @@
       if (TEST_OPT_INTSTRATEGY)
       {
-        pCleardenom((*h).p);
+        if (rField_is_Zp_a()) pContent(h->p);
+        else pCleardenom(h->p);// also does a pContent
       }
       /*computes the ecart*/
@@ -250 +251 @@
         return 0;
       }
-      else if (strat->syzComp!=0)
-      {
-        if ((strat->syzComp>0) && (pMinComp((*h).p) > strat->syzComp))
-        {
-          //pContent((*h).p);
-          pCleardenom((*h).p);// also does a pContent
+      else
+      {
+        if (TEST_OPT_INTSTRATEGY)
+        {
+          if (rField_is_Zp_a()) pContent(h->p);
+          else pCleardenom(h->p);// also does a pContent
+        }
+        if (strat->syzComp!=0)
+        {
+          if ((strat->syzComp>0) && (pMinComp((*h).p) > strat->syzComp))
+          {
 /*
-*         (*h).length=pLength0((*h).p);
-*/
-          enterT((*h),strat);
-          return 0;
+*           (*h).length=pLength0((*h).p);
+*/
+            enterT((*h),strat);
+            return 0;
+          }
         }
       }
@@ -270 +277 @@
       if (j >= strat->tl)
       {
-        //pContent((*h).p);
-        pCleardenom((*h).p);// also does a pContent
+        if (TEST_OPT_INTSTRATEGY)
+        {
+          if (rField_is_Zp_a()) pContent(h->p);
+          else pCleardenom(h->p);// also does a pContent
+        }
 /*
 *       (*h).length=pLength0((*h).p);
@@ -335 +345 @@
 //        }
 //      }
-      else if (TEST_OPT_DEBUG)
-      {
-        PrintS("to:");
-        wrp((*h).p);
-        PrintLn();
+      else
+      {
+        if (TEST_OPT_DEBUG)
+        {
+          PrintS("to:");
+          wrp((*h).p);
+          PrintLn();
+        }
+        if (TEST_OPT_INTSTRATEGY)
+        {
+          pContent(h->p);
+          //pCleardenom(h->p);// also does a pContent
+        }
       }
       /*- try to reduce the s-polynomial -*/
@@ -359 +377 @@
             }
           }
-           while (!pDivisibleBy(strat->S[i],(*h).p));
+          while (!pDivisibleBy(strat->S[i],(*h).p));
           if (TEST_OPT_DEBUG) Print(" ->L[%d]\n",at);
           enterL(&strat->L,&strat->Ll,&strat->Lmax,*h,at);
@@ -381 +399 @@
         if (TEST_OPT_INTSTRATEGY)
         {
-          //pContent(h->p);
-          pCleardenom(h->p);// also does a pContent
+          if (rField_is_Zp_a()) pContent(h->p);
+          else pCleardenom(h->p);// also does a pContent
         }
         enterT((*h),strat);
@@ -495 +513 @@
         (*h).lcm=NULL;
         return 0;
+      }
+      if (TEST_OPT_INTSTRATEGY)
+      {
+        //pContent(h->p);
+        pCleardenom(h->p);// also does a pContent
       }
       /* compute the ecart */