Changeset d5856f in git for kernel/kutil.cc

Timestamp:

Dec 6, 2013, 4:05:10 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1eba3916d70fdfa610391e2779d72b202c1b7915

Parents:

cda0b04282903cc2bac5f3b79cb72d0319602785

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-06 16:05:10+01:00

git-committer:

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

Message:

fixes & improves syzygy handling in sba

File:

• kernel/kutil.cc (modified) (14 diffs)

kernel/kutil.cc

@@ -4639 +4639 @@
 if (pLmCmp(strat->syz[strat->syzl-1],sig) != currRing->OrdSgn)
   return strat->syzl;
-
 int i;
 int an = 0;
@@ -5091 +5090 @@
   for (int k=0; k<strat->syzl; k++)
   {
+    //printf("-%d",k);
 //#if 1
 #ifdef DEBUGF5
-    Print("checking with: %d --  \n",k);
+    Print("checking with: %d / %d --  \n",k,strat->syzl);
     pWrite(pHead(strat->syz[k]));
 #endif
@@ -5102 +5102 @@
       printf("DELETE!\n");
 #endif
+      //printf("- T -\n\n");
       return TRUE;
     }
-    //k++;
-  }
+  }
+  //printf("- F -\n\n");
   return FALSE;
 }
@@ -5116 +5117 @@
 //#if 1
 #ifdef DEBUGF5
-  Print("syzygy criterion checks:  ");
+  Print("--- syzygy criterion checks:  ");
   pWrite(sig);
 #endif
@@ -5139 +5140 @@
     for (int k=min; k<max; k++)
     {
-#ifdef DEBUGF5
+#ifdef F5DEBUG
       printf("COMP %d/%d - MIN %d - MAX %d - SYZL %ld\n",comp,strat->currIdx,min,max,strat->syzl);
       Print("checking with: %d --  ",k);
@@ -5146 +5147 @@
       if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing))
         return TRUE;
-      //k++;
     }
     return FALSE;
@@ -6114 +6114 @@
     strat->sevSyz     = initsevS(ps);
     strat->syz        = (poly *)omAlloc(ps*sizeof(poly));
-    strat->syzl       = strat->syzmax = ps;
+    strat->syzmax     = ps;
+    strat->syzl       = 0;
     strat->syzidxmax  = comp;
 #if defined(DEBUGF5) || defined(DEBUGF51)
@@ -6152 +6153 @@
         strat->syzIdx[j]  = ctr;
         j++;
+        LObject Q;
+        int pos;
         for (k = 0; k<i; k++)
         {
-          poly p          = pOne();
-          p_ExpVectorCopy(p,strat->S[k],currRing);
-          strat->syz[ctr] = p;
-          p_SetCompP (strat->syz[ctr], comp, currRing);
-          poly q          = p_Copy(p, currRing);
+          Q.sig          = pOne();
+          p_ExpVectorCopy(Q.sig,strat->S[k],currRing);
+          p_SetCompP (Q.sig, comp, currRing);
+          poly q          = p_One(currRing);
           p_ExpVectorCopy(q,strat->S[i],currRing);
           q               = p_Neg (q, currRing);
           p_SetCompP (q, p_GetComp(strat->sig[k], currRing), currRing);
-          strat->syz[ctr] = p_Add_q (strat->syz[ctr], q, currRing);
-#if defined(DEBUGF5) || defined(DEBUGF51)
-//#if 1
-          printf(". . \n");
-          pWrite(strat->syz[ctr]);
-#endif
-          strat->sevSyz[ctr] = p_GetShortExpVector(strat->syz[ctr],currRing);
+          Q.sig = p_Add_q (Q.sig, q, currRing);
+          Q.sevSig  = p_GetShortExpVector(Q.sig,currRing);
+          pos = posInSyz(strat, Q.sig);
+          enterSyz(Q, strat, pos);
           ctr++;
         }
@@ -6194 +6193 @@
     }
     strat->syzIdx[j]  = ctr;
+    LObject Q;
+    int pos;
     for (k = 0; k<strat->sl+1; k++)
     {
-      poly p          = pOne();
-      p_ExpVectorCopy(p,strat->S[k],currRing);
-      strat->syz[ctr] = p;
-      p_SetCompP (strat->syz[ctr], comp, currRing);
-      poly q          = p_Copy(p, currRing);
+      Q.sig          = pOne();
+      p_ExpVectorCopy(Q.sig,strat->S[k],currRing);
+      p_SetCompP (Q.sig, comp, currRing);
+      poly q          = p_One(currRing);
       p_ExpVectorCopy(q,strat->L[strat->Ll].p,currRing);
       q               = p_Neg (q, currRing);
       p_SetCompP (q, p_GetComp(strat->sig[k], currRing), currRing);
-      strat->syz[ctr] = p_Add_q (strat->syz[ctr], q, currRing);
-//#if 1
-#if DEBUGF5 || DEBUGF51
-      printf("..");
-      pWrite(strat->syz[ctr]);
-#endif
-      strat->sevSyz[ctr] = p_GetShortExpVector(strat->syz[ctr],currRing);
+      Q.sig = p_Add_q (Q.sig, q, currRing);
+      Q.sevSig = p_GetShortExpVector(Q.sig,currRing);
+      pos = posInSyz(strat, Q.sig);
+      enterSyz(Q, strat, pos);
       ctr++;
     }
@@ -6220 +6217 @@
     printf("ps     %d\n",ps);
     Print("--------------------------------\n");
-    for(i=0;i<=ps-1;i++)
-    {
+    for(i=0;i<=strat->syzl-1;i++)
+    {
+      printf("%d - ",i);
       pWrite(strat->syz[i]);
+    }
+    for(i=0;i<strat->currIdx;i++)
+    {
+      printf("%d - %d\n",i,strat->syzIdx[i]);
     }
     Print("--------------------------------\n");
@@ -7233 +7235 @@
   int i;
   strat->newt = TRUE;
-  if (strat->syzl == strat->syzmax)
+  if (strat->syzl == strat->syzmax-1)
   {
     pEnlargeSet(&strat->syz,strat->syzmax,setmaxTinc);
@@ -7242 +7244 @@
     strat->syzmax += setmaxTinc;
   }
-  if (atT < strat->syzl-1)
+  if (atT < strat->syzl)
   {
 #ifdef ENTER_USE_MEMMOVE
@@ -7258 +7260 @@
     }
   }
-  i = strat->syzl;
-  //i = atT;
-  strat->syz[i] = p.sig;
-  strat->sevSyz[i] = p.sevSig;
+  //i = strat->syzl;
+  i = atT;
+  strat->syz[atT] = p.sig;
+  strat->sevSyz[atT] = p.sevSig;
   strat->syzl++;
-#ifdef DEBUGF5
-  Print("last element in strat->syz: %d--%d  ",i+1,strat->syzmax);
-  pWrite(strat->syz[i]);
+#if F5DEBUG
+  Print("element in strat->syz: %d--%d  ",atT+1,strat->syzmax);
+  pWrite(strat->syz[atT]);
 #endif
   // recheck pairs in strat->L with new rule and delete correspondingly
@@ -7278 +7280 @@
     cc--;
   }
+//#if 1
+#ifdef DEBUGF5
+    Print("--- Syzygies ---\n");
+    printf("syzl   %d\n",strat->syzl);
+    printf("syzmax %d\n",strat->syzmax);
+    Print("--------------------------------\n");
+    for(i=0;i<=strat->syzl-1;i++)
+    {
+      printf("%d - ",i);
+      pWrite(strat->syz[i]);
+    }
+    Print("--------------------------------\n");
+#endif
 }