Changeset cc6544 in git

Timestamp:

Dec 12, 2013, 1:43:48 PM (9 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

d11734c14946aacc7d00348d000a1bb22c618823

Parents:

1eba3916d70fdfa610391e2779d72b202c1b7915

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:43:48+01:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:29+01:00

Message:

improves sba's syzygy handling for schreyer ordering

File:

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

kernel/kstd2.cc

@@ -53 +53 @@
 #endif
 
+#define SBA_INTERRED_START                  0
 #define SBA_TAIL_RED                        1
 #define SBA_PRODUCT_CRITERION               0
@@ -1715 +1716 @@
   for (int i=0; i<sort->length();++i)
     F->m[i] = F1->m[(*sort)[i]-1];
+#if SBA_INTERRED_START
+  F = kInterRed(F,NULL);
+#endif
 #if F5DEBUG
   printf("SBA COMPUTATIONS DONE IN THE FOLLOWING RING:\n");
@@ -2104 +2108 @@
             // the corresponding principal syzygy
             // => we do not need to compute the "real" syzygy completely
-            poly help = pCopy(strat->sig[ps]);
+            poly help = p_Copy(strat->sig[ps],currRing);
             p_ExpVectorAdd (help,strat->P.p,currRing);
             Q.sig = p_Add_q(Q.sig,help,currRing);
@@ -2117 +2121 @@
       // deg - idx - lp/rp
       // => we need to add syzygies with indices > pGetComp(strat->P.sig)
-      if(strat->sbaOrder == 3)
+      if(strat->sbaOrder == 0 || strat->sbaOrder == 3)
       {
         int cmp     = pGetComp(strat->P.sig);
@@ -2125 +2129 @@
         LObject Q;
         int pos;
-        for (int i=cmp+1; i<=max_cmp; ++i) {
-          Q.sig = p_One(currRing);
-          p_SetExpV(Q.sig, vv, currRing);
-          // F->m[i-1] corresponds to index i
-          p_ExpVectorAdd(Q.sig,F->m[i-1],currRing);
-          p_SetComp(Q.sig, i, currRing);
-          pos = posInSyz(strat, Q.sig);
-          enterSyz(Q, strat, pos);
-        }
-      }
-#if 1
-//#if DEBUGF50
+        int idx = p_GetComp(strat->P.sig,currRing);
+        //printf("++ -- adding syzygies -- ++\n");
+        // if new element is the first one in this index
+        if (strat->currIdx < idx) {
+          for (int i=0; i<strat->sl; ++i) {
+            Q.sig = p_Copy(strat->P.sig,currRing);
+            p_ExpVectorAdd(Q.sig,strat->S[i],currRing);
+            poly help = p_Copy(strat->sig[i],currRing);
+            p_ExpVectorAdd(help,strat->P.p,currRing);
+            Q.sig = p_Add_q(Q.sig,help,currRing);
+            //pWrite(Q.sig);
+            pos = posInSyz(strat, Q.sig);
+            enterSyz(Q, strat, pos);
+          }
+          strat->currIdx = idx;
+        } else {
+          // if the element is not the first one in the given index we build all
+          // possible syzygies with elements of higher index
+          for (int i=cmp+1; i<=max_cmp; ++i) {
+            pos = -1;
+            for (int j=0; j<strat->sl; ++j) {
+              if (p_GetComp(strat->sig[j],currRing) == i) {
+                pos = j;
+                break;
+              }
+            }
+            if (pos != -1) {
+              Q.sig = p_One(currRing);
+              p_SetExpV(Q.sig, vv, currRing);
+              // F->m[i-1] corresponds to index i
+              p_ExpVectorAdd(Q.sig,F->m[i-1],currRing);
+              p_SetComp(Q.sig, i, currRing);
+              poly help = p_Copy(strat->P.sig,currRing);
+              p_ExpVectorAdd(help,strat->S[pos],currRing);
+              Q.sig = p_Add_q(Q.sig,help,currRing);
+              if (p_LmCmp(Q.sig,strat->syz[strat->syzl-1],currRing) == -currRing->OrdSgn) {
+                pos = posInSyz(strat, Q.sig);
+                enterSyz(Q, strat, pos);
+              }
+            }
+          }
+          //printf("++ -- done adding syzygies -- ++\n");
+        }
+      }
+//#if 1
+#if DEBUGF50
     printf("---------------------------\n");
     Print(" %d. ELEMENT ADDED TO GCURR:\n",strat->sl+1);
@@ -2184 +2222 @@
         int pos = posInSyz(strat, strat->P.sig);
         enterSyz(strat->P, strat, pos);
-#if 1
-//#ifdef DEBUGF5
+//#if 1
+#ifdef DEBUGF5
         Print("ADDING STUFF TO SYZ :  ");
         //pWrite(strat->P.p);