Changeset 36b9ef in git for kernel/gr_kstd2.cc

Timestamp:

Jul 29, 2008, 3:16:44 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

63774ecd0500a3c894a18af2fea779b41ee11c64

Parents:

342c80d50cde81c223648091d8364e6eeb6dc3f3

Message:

hannes: vaoid ratGB in rat_GB


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

File:

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

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.22 2008-07-29 12:38:52 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.23 2008-07-29 13:16:44 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -253 +253 @@
 #endif
         //poly hh = nc_CreateSpoly(strat->S[c_j],(*h).p, currRing);
-        poly hh=c_p; c_p=NULL;
+        if(c_e==-1)
+          c_p = nc_CreateSpoly(pCopy(strat->S[c_j]),pCopy((*h).p), currRing);
+        else
+          c_p=nc_rat_ReduceSpolyNew(pCopy(strat->S[c_j]),
+               pCopy((*h).p),currRing->real_var_start-1,currRing);
         pDelete(&((*h).p));
-        (*h).p=hh;
+        (*h).p=c_p;
         if (!TEST_OPT_INTSTRATEGY)
         {
@@ -282 +286 @@
         pass++;
         j=0;
-        c_j=-1; c_e=-2;
+        c_j=-1; c_e=-2; c_p=NULL;
       }
       else
@@ -302 +306 @@
       {
         c_e=-1; c_j=j;
-        pDelete(&c_p);
-        c_p = nc_CreateSpoly(pCopy(strat->S[c_j]),pCopy((*h).p), currRing);
       }
     }
@@ -321 +323 @@
       {
         c_e=a_e; c_j=j;
-        pDelete(&c_p);
         //c_p = nc_CreateSpoly(pCopy(strat->S[c_j]),pCopy((*h).p), currRing);
-        c_p=nc_rat_ReduceSpolyNew(strat->S[c_j],(*h).p,currRing->real_var_start-1,currRing);
-      }
-      else if (c_e == a_e)
-      {
-         //poly cc_pp= nc_CreateSpoly(pCopy(strat->S[j]),pCopy((*h).p), currRing);
-         poly cc_pp=nc_rat_ReduceSpolyNew(strat->S[c_j],(*h).p,currRing->real_var_start-1,currRing);
-         if (((cc_pp==NULL)&&(c_p!=NULL)) || (pCmp(cc_pp,c_p)==-1))
-         {
-           assume(pTotaldegree(cc_pp)<=pTotaldegree(c_p));
-           c_e=a_e; c_j=j;
-           pDelete(&c_p);
-           c_p = cc_pp;
-         }
       }
       /*computes the ecart*/
@@ -993 +981 @@
   if (currRing->real_var_start>0)
   {
-    strat->red=redGrRatGB;
+    int ii=IDELEMS(F)-1;
+    int jj;
+    BOOLEAN is_rat_id=FALSE;
+    for(;ii>=0;ii--)
+    {
+      for(jj=currRing->real_var_start;jj<=currRing->real_var_end;jj++)
+      {
+        if(pGetExp(F->m[ii],jj)>0) { is_rat_id=TRUE; break; }
+      }
+      if (is_rat_id) break;
+    }
+    if (is_rat_id) strat->red=redGrRatGB;
   }