Changeset b130fb in git for kernel/gr_kstd2.cc

Timestamp:

Feb 17, 2005, 10:42:23 AM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

08db0a0dca2c73d19b0d83ba8110def246830498

Parents:

ecce503e3c38e63f043db34fbea817c3fc1fdc6c

Message:

*hannes: gcc-3.4


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

File:

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

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.4 2004-11-09 14:54:59 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.5 2005-02-17 09:42:18 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -50 +50 @@
   int j = 0;
 
-  d = pFDeg((*h).p)+(*h).ecart;
+  d = pFDeg((*h).p,currRing)+(*h).ecart;
   reddeg = strat->LazyDegree+d;
   loop
@@ -93 +93 @@
       }
       /*computes the ecart*/
-      d = pLDeg((*h).p,&((*h).length));
-      (*h).FDeg=pFDeg((*h).p);
+      d = pLDeg((*h).p,&((*h).length),currRing);
+      (*h).FDeg=pFDeg((*h).p,currRing);
       (*h).ecart = d-(*h).FDeg; /*pFDeg((*h).p);*/
       if ((strat->syzComp!=0) && !strat->honey)
@@ -298 +298 @@
   int j = 0;
   int pass = 0;
-  int reddeg = pFDeg((*h).p);
+  int reddeg = pFDeg((*h).p,currRing);
 
   if (TEST_OPT_DEBUG)
@@ -343 +343 @@
       /*- try to reduce the s-polynomial -*/
       pass++;
-      d = pFDeg((*h).p);
+      d = pFDeg((*h).p,currRing);
       if ((strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
       {
@@ -409 +409 @@
 
   pass = j = 0;
-  d = reddeg = pFDeg((*h).p)+(*h).ecart;
+  d = reddeg = pFDeg((*h).p,currRing)+(*h).ecart;
   if (TEST_OPT_DEBUG)
   {
@@ -498 +498 @@
       /* compute the ecart */
       if (ei <= (*h).ecart)
-        (*h).ecart = d-pFDeg((*h).p);
+        (*h).ecart = d-pFDeg((*h).p,currRing);
       else
-        (*h).ecart = d-pFDeg((*h).p)+ei-(*h).ecart;
+        (*h).ecart = d-pFDeg((*h).p,currRing)+ei-(*h).ecart;
 //      if (strat->syzComp)
 //      {
@@ -520 +520 @@
       */
       pass++;
-      d = pFDeg((*h).p)+(*h).ecart;
+      d = pFDeg((*h).p,currRing)+(*h).ecart;
       if ((strat->Ll >= 0) && ((d > reddeg) || (pass > strat->LazyPass)))
       {
@@ -587 +587 @@
 
   if (strat->honey)
-    reddeg = pFDeg((*h).p)+(*h).ecart;
+    reddeg = pFDeg((*h).p,currRing)+(*h).ecart;
   else
-    reddeg = pFDeg((*h).p);
+    reddeg = pFDeg((*h).p,currRing);
   loop
   {
@@ -686 +686 @@
       {
         pass++;
-        d = pFDeg((*h).p);
+        d = pFDeg((*h).p,currRing);
         if (strat->honey)
           d += (*h).ecart;
@@ -808 +808 @@
     if (strat->Ll== 0) strat->interpt=TRUE;
     if (TEST_OPT_DEGBOUND
-    && ((strat->honey && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))
-       || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p)>Kstd1_deg))))
+    && ((strat->honey
+    && (strat->L[strat->Ll].ecart+pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))
+       || ((!strat->honey) && (pFDeg(strat->L[strat->Ll].p,currRing)>Kstd1_deg))))
     {
       /*
@@ -887 +888 @@
               if (strat->sl==-1) pos=0;
               else pos=posInS(strat,strat->sl,strat->P.p,strat->P.ecart);
-              strat->enterS(strat->P,pos,strat);
+              strat->enterS(strat->P,pos,strat,-1);
             }
             if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);