Changeset 7d2b89 in git

Timestamp:

Jun 9, 2016, 1:41:17 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

72fd164d224c701f45aaf30d20586e1bb5edc133

Parents:

459ec942488fc3417e5bcc3965cb5119e5add894

Message:

SBA looks good

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (2 diffs)
• kstd1.cc (modified) (4 diffs)
• kstd2.cc (modified) (8 diffs)
• kutil.cc (modified) (2 diffs)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kspoly.cc

@@ -23 +23 @@
 #endif
 
-#define ADIDEBUG 1
+#define ADIDEBUG 0
 
 #ifdef KDEBUG
@@ -289 +289 @@
           pDelete(&PR->sig);
           PR->sig = origsig;
+          strat->blockred++;
           return 3;
         }

kernel/GBEngine/kstd1.cc

@@ -2591 +2591 @@
     #endif
     //This is how we set the SBA algorithm;
-    int totalsbaruns =-1,loops = 0;
-    while(sigdrop && (loops < totalsbaruns || totalsbaruns == -1))
+    int totalsbaruns = 1,blockedreductions = 10,blockred = 0,loops = 0;
+    while(sigdrop && (loops < totalsbaruns || totalsbaruns == -1) 
+                  && (blockred <= blockedreductions))
     {
       loops++;
@@ -2602 +2603 @@
       strat->sbaEnterS = sbaEnterS;
       strat->sigdrop = sigdrop;
+      #if 0
+      strat->blockred = blockred;
+      #else
+      strat->blockred = 0;
+      #endif
+      strat->blockredmax = blockedreductions;
       //printf("\nsbaEnterS beginning = %i\n",strat->sbaEnterS);
       //printf("\nsigdrop beginning = %i\n",strat->sigdrop);
@@ -2726 +2733 @@
       sigdrop = strat->sigdrop;
       sbaEnterS = strat->sbaEnterS;
+      blockred = strat->blockred;
       #if ADIDEBUG
       printf("\nsbaEnterS = %i\n",sbaEnterS);
@@ -2733 +2741 @@
     }
     // Go to std
-    if(sigdrop)
+    if(sigdrop || blockred > blockedreductions)
     {
       #if ADIDEBUG
       printf("\nWent to std\n");
       //idPrint(r);
-      getchar();
+      //getchar();
       #endif
       r = kStd(r, Q, h, w, hilb, syzComp, newIdeal, vw);

kernel/GBEngine/kstd2.cc

@@ -925 +925 @@
       strat->sigdrop = FALSE;
     }
+    #if 0
     //If the reducer has the same lt (+ or -) as the other one, reduce it via redRing
+    //In some cases this proves to be very bad
     if(rField_is_Ring(currRing) && h->p != NULL && pLmCmp(h->p,strat->T[ii].p)==0)
     {
@@ -949 +951 @@
       }
     }
+    #endif
+    if(strat->sigdrop)
+      return 1;
 #if SBA_PRINT_REDUCTION_STEPS
     if (sigSafe != 3)
@@ -2253 +2258 @@
     printf("\n   list   L\n");
     int iii;
-    #if 0
+    #if 1
     for(iii = 0; iii<= strat->Ll; iii++)
     {
@@ -2436 +2441 @@
     printf("\nAfter reduce (redresult=%i): \n",red_result);pWrite(strat->P.p);pWrite(strat->P.sig);
     #endif
-    #ifdef HAVE_RINGS
     //sigdrop case
     if(rField_is_Ring(currRing) && strat->sigdrop)
@@ -2465 +2469 @@
       }
     }
-    #endif
+    if(strat->blockred > strat->blockredmax)
+    {
+      #if ADIDEBUG
+      printf("\nToo many blocked reductions\n");
+      #endif
+      strat->sigdrop = TRUE;
+      break;
+    }
     
     if (errorreported)  break;
@@ -2652 +2663 @@
       */
       if (rField_is_Ring(currRing))
-        superenterpairsSig(strat->P.p,strat->P.sig,strat->P.sig_sba_max,strat->sl+1,strat->sl,strat->P.ecart,pos,strat, strat->tl);
         superenterpairsSig(strat->P.p,strat->P.sig,strat->sl+1,strat->sl,strat->P.ecart,pos,strat, strat->tl);
       else
@@ -2659 +2669 @@
         printf("\nThis element is added to S\n");
         p_Write(strat->P.p, strat->tailRing);p_Write(strat->P.p1, strat->tailRing);p_Write(strat->P.p2, strat->tailRing);pWrite(strat->P.sig);
-        //getchar();
+        getchar();
         #endif
       // posInS only depends on the leading term
@@ -3382 +3392 @@
       if (TEST_OPT_PROT) PrintS("s");
       int pos;
-      #if 0
+      #if 1
       if(!rField_is_Ring(currRing))
         pos = posInS(strat,strat->sl,strat->P.p,strat->P.ecart);

kernel/GBEngine/kutil.cc

@@ -4716 +4716 @@
 {
   if (length<0) return 0;
-  if(pNext(p) == NULL) return 0;
   polyset set=strat->S;
-  int o = p_Deg(p,currRing);
-  int op = p_Deg(set[length],currRing);
-
-  if ((op < o)
-  || ((op == o) && (pLtCmp(set[length],p) == -1)))
-    return length+1;
-  int i;
-  int an = 0;
-  for(i=0;i<=length;i++)
-    if(set[i] != NULL && pNext(set[i]) == NULL)
-      an++;
-  int en= length;
-  loop
-  {
-    if (an >= en-1)
-    {
-      op = p_Deg(set[an],currRing);
+  if(pNext(p) == NULL)
+  {
+    int mon = 0;
+    for(int i = 0;i<=length;i++)
+    {
+      if(set[i] != NULL && pNext(set[i]) == NULL)
+        mon++;
+    }
+    int o = p_Deg(p,currRing);
+    int op = p_Deg(set[mon],currRing);
+    
+    if ((op < o)
+    || ((op == o) && (pLtCmp(set[mon],p) == -1)))
+      return length+1;
+    int i;
+    int an = 0;
+    int en= mon;
+    loop
+    {
+      if (an >= en-1)
+      {
+        op = p_Deg(set[an],currRing);
+        if ((op < o)
+        || ((op == o) && (pLtCmp(set[an],p) == -1)))
+          return en;
+        return an;
+      }
+      i=(an+en) / 2;
+      op = p_Deg(set[i],currRing);
       if ((op < o)
-      || ((op == o) && (pLtCmp(set[an],p) == -1)))
-        return en;
-      return an;
-    }
-    i=(an+en) / 2;
-    op = p_Deg(set[i],currRing);
+      || ((op == o) && (pLtCmp(set[i],p) == -1)))
+        an=i;
+      else
+        en=i;
+    }
+  }
+  if(pNext(p) != NULL)
+  {
+    int o = p_Deg(p,currRing);
+    int op = p_Deg(set[length],currRing);
+    
     if ((op < o)
-    || ((op == o) && (pLtCmp(set[i],p) == -1)))
-      an=i;
-    else
-      en=i;
+    || ((op == o) && (pLtCmp(set[length],p) == -1)))
+      return length+1;
+    int i;
+    int an = 0;
+    for(i=0;i<=length;i++)
+      if(set[i] != NULL && pNext(set[i]) == NULL)
+        an++;
+    int en= length;
+    loop
+    {
+      if (an >= en-1)
+      {
+        op = p_Deg(set[an],currRing);
+        if ((op < o)
+        || ((op == o) && (pLtCmp(set[an],p) == -1)))
+          return en;
+        return an;
+      }
+      i=(an+en) / 2;
+      op = p_Deg(set[i],currRing);
+      if ((op < o)
+      || ((op == o) && (pLtCmp(set[i],p) == -1)))
+        an=i;
+      else
+        en=i;
+    }
   }
 }
@@ -6647 +6685 @@
 {
   //printf("Faugere Rewritten Criterion\n");
+  if(rField_is_Ring(currRing))
+    return FALSE;
 //#if 1
 #ifdef DEBUGF5

kernel/GBEngine/kutil.h

@@ -361 +361 @@
   int sbaEnterS; // sba over Z strategy: if sigdrop element has _*gen(sbaEnterS+1), then 
                  // add directly sbaEnterS elements into S
+  int blockred;  // counter for blocked reductions in redSig
+  int blockredmax;
   #endif
   #ifdef HAVE_SHIFTBBA