Changeset 11416e in git for kernel

Timestamp:

May 27, 2016, 1:08:52 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

48cbb08675244a2938cd9318ad2f38b0c70e5172

Parents:

d6e0c0fd81f7fba2ec29faa8a27186e0133b2293

Message:

add: posInLSigRing
add: messageSba

Location:

kernel/GBEngine

Files:

• kspoly.cc (modified) (3 diffs)
• kstd1.cc (modified) (2 diffs)
• kstd2.cc (modified) (7 diffs)
• kutil.cc (modified) (4 diffs)
• kutil.h (modified) (3 diffs)

kernel/GBEngine/kspoly.cc

@@ -280 +280 @@
         //The sigs have the same lm, have to substract
         PR->sig = pSub(PR->sig, pCopy(sigMult));
+        pDelete(&sigMult);
         //It may happen that now the signature is 0 (drop)
         if(PR->sig == NULL)
@@ -288 +289 @@
           strat->sigdrop=TRUE;
         }
-      }
-      else
-      {
-        if(sigSafe == -1)
+        else
         {
-          // do not allow this reduction - it will increase it's signature
-          // and the partially standard basis is just till the old sig, not the new one
-          PR->is_redundant = TRUE;
-          return 3;
+          if(sigSafe == -1)
+          {
+            // do not allow this reduction - it will increase it's signature
+            // and the partially standard basis is just till the old sig, not the new one
+            PR->is_redundant = TRUE;
+            return 3;
+          }
         }
       }
@@ -302 +303 @@
     #endif
     //pDelete(&f1);
-    pDelete(&sigMult);
     // go on with the computations only if the signature of p2 is greater than the
     // signature of fm*p1

kernel/GBEngine/kstd1.cc

@@ -2564 +2564 @@
         r=sba(F,Q,NULL,hilb,strat);
         #if ADIDEBUG
-        printf("\nSBA Run 1: %i elements (syzCrit = %i)\n",IDELEMS(r),strat->nrsyzcrit);
+        printf("\nSBA Run 1: %i elements (syzCrit = %i,rewCrit = %i)\n",IDELEMS(r),strat->nrsyzcrit,strat->nrrewcrit);
         //idPrint(r);
         //getchar();
@@ -2573 +2573 @@
           r=sba(r,Q,NULL,hilb,strat);
           #if ADIDEBUG
-          printf("SBA Run %i: %i elements (syzCrit = %i)\n",sbarun++,IDELEMS(r),strat->nrsyzcrit);
+          printf("SBA Run %i: %i elements (syzCrit = %i,rewCrit = %i)\n",sbarun++,IDELEMS(r),strat->nrsyzcrit,strat->nrrewcrit);
           //idPrint(r);
           //getchar();

kernel/GBEngine/kstd2.cc

@@ -1656 +1656 @@
     printf("\n   list   L\n");
     int iii;
-    #if 1
+    #if 0
     for(iii = 0; iii<= strat->Ll; iii++)
     {
@@ -1672 +1672 @@
     }
     #endif
-    #if 1
+    #if 0
     for(iii = 0; iii<= strat->Bl; iii++)
     {
@@ -2049 +2049 @@
     strat->sigdrop = FALSE;
   strat->nrsyzcrit = 0;
+  strat->nrrewcrit = 0;
   #endif
 #if SBA_INTERRED_START
@@ -2165 +2166 @@
     }
     #endif
-    //getchar();
+    getchar();
     #endif
     if (strat->Ll > lrmax) lrmax =strat->Ll;/*stat.*/
@@ -2348 +2349 @@
         #endif
         strat->enterS(strat->P, 0, strat, strat->tl);
+        if (TEST_OPT_PROT)
+          PrintS("-");
         break;
       }
@@ -2365 +2368 @@
     }
 #endif
+    if (TEST_OPT_PROT)
+    {
+      if(strat->P.p != NULL)
+        message((strat->honey ? strat->P.ecart : 0) + strat->P.pFDeg(),
+                &olddeg,&reduc,strat, red_result);
+      else
+        message((strat->honey ? strat->P.ecart : 0),
+                &olddeg,&reduc,strat, red_result);
+    }
 
     if (strat->overflow)
@@ -2825 +2837 @@
 //    }
 //  }
-  if (TEST_OPT_PROT) messageStat(hilbcount,strat);
+  if (TEST_OPT_PROT) messageStatSBA(hilbcount,strat);
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
 #if SBA_PRINT_SIZE_G

kernel/GBEngine/kutil.cc

@@ -5522 +5522 @@
                LObject* p,const kStrategy /*strat*/)
 {
-if (length<0) return 0;
-if (pLtCmp(set[length].sig,p->sig)== currRing->OrdSgn)
-  return length+1;
-
-int i;
-int an = 0;
-int en= length;
-loop
-{
-  if (an >= en-1)
-  {
-    if (pLtCmp(set[an].sig,p->sig) == currRing->OrdSgn) return en;
-    return an;
-  }
-  i=(an+en) / 2;
-  if (pLtCmp(set[i].sig,p->sig) == currRing->OrdSgn) an=i;
-  else                                      en=i;
-  /*aend. fuer lazy == in !=- machen */
-}
+  if (length<0) return 0;
+  if (pLtCmp(set[length].sig,p->sig)== currRing->OrdSgn)
+    return length+1;
+
+  int i;
+  int an = 0;
+  int en= length;
+  loop
+  {
+    if (an >= en-1)
+    {
+      if (pLtCmp(set[an].sig,p->sig) == currRing->OrdSgn) return en;
+      return an;
+    }
+    i=(an+en) / 2;
+    if (pLtCmp(set[i].sig,p->sig) == currRing->OrdSgn) an=i;
+    else                                      en=i;
+    /*aend. fuer lazy == in !=- machen */
+  }
+}
+//sorts the pair list in this order: pLtCmp on the sigs, FDeg, pLtCmp on the polys
+int posInLSigRing (const LSet set, const int length,
+               LObject* p,const kStrategy /*strat*/)
+{
+  assume(currRing->OrdSgn == 1 && rField_is_Ring(currRing));
+  if (length<0) return 0;
+  if (pLtCmp(set[length].sig,p->sig)== 1)
+    return length+1;
+
+  int an,en,i;
+  an = 0;
+  en = length+1;
+  int cmp;
+  loop
+  {
+    if (an >= en-1)
+    {
+      if(an == en)
+        return en;
+      cmp = pLtCmp(set[an].sig,p->sig);
+      if (cmp == 1)
+        return en;
+      if (cmp == -1)
+        return an;
+      if (cmp == 0)
+      {
+         if (set[an].FDeg > p->FDeg)
+          return en;
+         if (set[an].FDeg < p->FDeg)
+          return an;
+         if (set[an].FDeg == p->FDeg)
+         {
+            cmp = pLtCmp(set[an].p,p->p);
+            if(cmp == 1)
+              return en;
+            else
+              return an;
+         }
+      }
+    }
+    i=(an+en) / 2;
+    cmp = pLtCmp(set[i].sig,p->sig);
+    if (cmp == 1)
+      an = i;
+    if (cmp == -1)
+      en = i;
+    if (cmp == 0)
+    {
+       if (set[i].FDeg > p->FDeg)
+        an = i;
+       if (set[i].FDeg < p->FDeg)
+        en = i;
+       if (set[i].FDeg == p->FDeg)
+       {
+          cmp = pLtCmp(set[i].p,p->p);
+          if(cmp == 1)
+            an = i;
+          else
+            en = i;
+       }
+    }
+  }
 }
 
@@ -6467 +6530 @@
       printf("\nFaugere RewCrit: * divisible by *\n");pWrite(sig);pWrite(strat->sig[k]);
       #endif
+      strat->nrrewcrit++;
       return TRUE;
     }
@@ -7083 +7147 @@
   //Print("%d/%d polynomials in set L (for lazy alg.)",lrmax+1,strat->Lmax);
   Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3);
+  if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount);
+  /* in usual case strat->cv is 0, it gets changed only in shift routines */
+  if (strat->cv!=0) Print("shift V criterion:%d\n",strat->cv);
+  /*mflush();*/
+}
+
+void messageStatSBA (int hilbcount,kStrategy strat)
+{
+  //PrintS("\nUsage/Allocation of temporary storage:\n");
+  //Print("%d/%d polynomials in standard base\n",srmax,IDELEMS(Shdl));
+  //Print("%d/%d polynomials in set L (for lazy alg.)",lrmax+1,strat->Lmax);
+  Print("syz criterion:%d rew criterion:%d\n",strat->nrsyzcrit,strat->nrrewcrit);
+  //Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3);
   if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount);
   /* in usual case strat->cv is 0, it gets changed only in shift routines */
@@ -9399 +9476 @@
   //strat->posInL     = posInLSig;
   strat->posInL     = posInLF5C;
+  if (rField_is_Ring(currRing))
+  {
+    strat->posInLSba  = posInLSigRing;
+    strat->posInL     = posInL11Ring;
+  }
   //strat->posInT     = posInTSig;
 }

kernel/GBEngine/kutil.h

@@ -358 +358 @@
   bool sigdrop; //This is used to check sigdrop in sba over Z
   int nrsyzcrit; // counts how many pairs are deleted by SyzCrit
+  int nrrewcrit; // counts how many pairs are deleted by FaugereRewCrit
   int sbaEnterS; // sba over Z strategy: if sigdrop element has _*gen(sbaEnterS+1), then 
                  // add directly sbaEnterS elements into S
@@ -453 +454 @@
 int posInLSig (const LSet set, const int length,
                LObject* L,const kStrategy strat);
+int posInLSigRing (const LSet set, const int length,
+               LObject* L,const kStrategy strat);
 int posInLRing (const LSet set, const int length,
                LObject* L,const kStrategy strat);
@@ -519 +522 @@
 void message (int i,int* reduc,int* olddeg,kStrategy strat,int red_result);
 void messageStat (int hilbcount,kStrategy strat);
+void messageStatSBA (int hilbcount,kStrategy strat);
 #ifdef KDEBUG
 void messageSets (kStrategy strat);