Changeset 0047ec in git

Timestamp:

Jul 29, 2008, 9:39:57 AM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

d42b51540898000893023b8114f71bad09c3c7c2

Parents:

4debf02efdbe8aa7eb872be69e638d78d3ffd3d7

Message:

hannes: ratGB fixes


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

File:

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

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.19 2008-07-28 18:18:34 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.20 2008-07-29 07:39:57 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -198 +198 @@
   int pass = 0;
   int j = 0;
-  int c_j=-1, c_e=-1;
+  int c_j=-1, c_e=-2;
   poly c_p=NULL;
   assume(strat->tailRing==currRing);
@@ -256 +256 @@
         pass++;
         j=0;
+        c_j=-1; c_e=-2;
       }
       else
@@ -262 +263 @@
       }
     }
+    // first try usal division
+    if (p_LmDivisibleBy(strat->S[j],(*h).p,currRing))
+    {
+      if(TEST_OPT_DEBUG)
+      {
+        p_wrp(h->p,currRing); Print(" divisibly by S[%d]=",j);
+        p_wrp(strat->S[j],currRing); PrintS(" e=-1\n");
+      }
+      if ((c_j==-1)||(c_e>=0))
+      {
+        c_e=-1; c_j=j;
+        pDelete(&c_p);
+        c_p = nc_CreateSpoly(pCopy(strat->S[c_j]),pCopy((*h).p), currRing);
+      }
+    }
+    else
     if (p_LmDivisibleByPart(strat->S[j],(*h).p,currRing,
         currRing->real_var_start,currRing->real_var_end))
@@ -1019 +1036 @@
   nc_gr_initBba(F,strat);
   initBuchMoraPos(strat);
+  if (currRing->real_var_start>0)
+  {
+    strat->posInL=posInL0; // by pCmp of lcm
+  }
   /*set enterS, spSpolyShort, reduce, red, initEcart, initEcartPair*/
   /*Shdl=*/initBuchMora(F, Q,strat);
   strat->posInT=posInT110;
-  if (currRing->real_var_start>0)
-  {
-    strat->posInL=posInL0; // by pCmp of lcm
-  }
   srmax = strat->sl;
   reduc = olddeg = lrmax = 0;