Changeset 4c4979 in git

Timestamp:

Jun 19, 2009, 5:31:48 PM (14 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

03057341d897afb7daf5d8d5346c88a961df4184

Parents:

ca02ab01da5c28f679d205662ca93d894d1719eb

Message:

*levandov: redSB and redTail for non-homogeneous shift gb


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

Location:

kernel

Files:

• kstd2.cc (modified) (2 diffs)
• shiftgb.cc (modified) (2 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.93 2009-06-19 10:05:45 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.94 2009-06-19 15:31:48 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1632 +1632 @@
 #endif
   /* complete reduction of the standard basis--------- */
-  if (TEST_OPT_SB_1)
-  {
-    int k=1;
-    int j;
+  /*  shift case: look for elt's in S such that they are divisible by elt in T */ 
+  //  if (TEST_OPT_SB_1)
+  if (TEST_OPT_REDSB)
+  {
+    int k=0;
+    int j=-1;
     while(k<=strat->sl)
     {
-      j=0;
-      loop
-      {
-        if (j>=k) break;
-        clearS(strat->S[j],strat->sevS[j],&k,&j,strat);
-        j++;
-      }
-      k++;
+//       loop
+//       {
+//         if (j>=k) break;
+//         clearS(strat->S[j],strat->sevS[j],&k,&j,strat);
+//         j++;
+//       }
+      LObject Ln (strat->S[k],currRing, strat->tailRing);
+      Ln.SetShortExpVector();
+      j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, &Ln, j+1);
+      if (j<0) {  k++; j=-1;}
+      else
+      {
+        if ( pLmCmp(strat->S[k],strat->T[j].p) == 0)
+        {
+          j = kFindDivisibleByInT(strat->T, strat->sevT, strat->tl, &Ln, j+1);
+          if (j<0) {  k++; j=-1;}
+          else
+          {
+            deleteInS(k,strat);
+          }
+        }
+        else
+        {
+          deleteInS(k,strat);
+        }
+      }
     }
   }
 
   if (TEST_OPT_REDSB)
-  {
-    completeReduce(strat, TRUE); //shift: withT = TRUE
+  {    completeReduce(strat, TRUE); //shift: withT = TRUE
     if (strat->completeReduce_retry)
     {

kernel/shiftgb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: shiftgb.cc,v 1.11 2009-02-23 13:50:52 Singular Exp $ */
+/* $Id: shiftgb.cc,v 1.12 2009-06-19 15:31:48 levandov Exp $ */
 /*
 * ABSTRACT: kernel: utils for shift GB and free GB
@@ -578 +578 @@
 
 
+/*2
+ *if the leading term of p
+ *divides the leading term of some T[i] it will be canceled
+ */
+// static inline void clearSShift (poly p, unsigned long p_sev,int l, int* at, int* k,
+//                            kStrategy strat)
+// {
+//   assume(p_sev == pGetShortExpVector(p));
+//   if (!pLmShortDivisibleBy(p,p_sev, strat->T[*at].p, ~ strat->sevT[*at])) return;
+//   //  if (l>=strat->lenS[*at]) return;
+//   if (TEST_OPT_PROT)
+//     PrintS("!");
+//   mflush();
+//   //pDelete(&strat->S[*at]);
+//   deleteInS((*at),strat);
+//   (*at)--;
+//   (*k)--;
+// //  assume(lenS_correct(strat));
+// }
+
 /* remarks: cleanT : just deletion
 enlargeT: just reallocation */