Changeset 978a8c in git for kernel

Timestamp:

May 13, 2016, 1:26:50 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ff38ee02732552e78a143ebf4f9aadccee454071

Parents:

7aa6edb86ac7c8b9cfbd1bcd3ba76d19a18ca978

Message:

experimental. Check Faugere RewCrit and pDivideM, postreducebymon

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (1 diff)
• kstd2.cc (modified) (3 diffs)
• kutil.cc (modified) (4 diffs)
• kutil.h (modified) (1 diff)

kernel/GBEngine/kstd1.cc

@@ -14 +14 @@
 #define MYTEST 0
 
-#define ADIDEBUG 1
+#define ADIDEBUG 0
 #define ADIDEBUG_NF 0
 

kernel/GBEngine/kstd2.cc

@@ -20 +20 @@
 #endif /* ifndef SING_NDEBUG */
 
-#define ADIDEBUG 0
+#define ADIDEBUG 1
 #define ADIDEBUG_COUNT 0
 #define REV_BLOCK_SBA 0
@@ -722 +722 @@
     if (j < 0)
     {
-      #ifdef HAVE_RINGS
-      if(rField_is_Ring(currRing))
-      {
-        //Check for sigdrop after reduction
-        if(pLtCmp(beforeredsig,h->sig) == 1)
-        {
-          #if ADIDEBUG
-          printf("\nSigDrop after reduce\n");pWrite(beforeredsig);pWrite(h->sig);
-          #endif
-          strat->sigdrop = TRUE;
-          //Reduce it as much as you can
-          int red_result = redRing(h,strat);
-          if(red_result == 0)
-          {
-            //It reduced to 0, cancel the sigdrop
-            #if ADIDEBUG
-            printf("\nReduced to 0 via redRing. Cancel sigdrop\n");
-            #endif
-            strat->sigdrop = FALSE;
-            p_Delete(&h->sig,currRing);h->sig = NULL;
-            return 0;
-          }
-          else
+      // over ZZ: cleanup coefficients by complete reduction with monomials
+      postReduceByMonSig(h, strat);
+      if(nIsZero(pGetCoeff(h->p))) return 2;
+      j = kFindDivisibleByInT(strat, h,start);
+      if(j < 0)
+      {
+        if(strat->tl >= 0)
+            h->i_r1 = strat->tl;
+        else
+            h->i_r1 = -1;
+        if (h->GetLmTailRing() == NULL)
+        {
+          if (h->lcm!=NULL) pLmDelete(h->lcm);
+          h->Clear();
+          return 0;
+        }
+        #ifdef HAVE_RINGS
+        if(rField_is_Ring(currRing))
+        {
+          //Check for sigdrop after reduction
+          if(pLtCmp(beforeredsig,h->sig) == 1)
           {
             #if ADIDEBUG
-            printf("\nReduced to this via redRing.SIGDROP\n");pWrite(h->p);
+            printf("\nSigDrop after reduce\n");pWrite(beforeredsig);pWrite(h->sig);
             #endif
-            //strat->enterS(*h, strat->sl+1, strat, strat->tl);
-            return 0;
+            strat->sigdrop = TRUE;
+            //Reduce it as much as you can
+            int red_result = redRing(h,strat);
+            if(red_result == 0)
+            {
+              //It reduced to 0, cancel the sigdrop
+              #if ADIDEBUG
+              printf("\nReduced to 0 via redRing. Cancel sigdrop\n");
+              #endif
+              strat->sigdrop = FALSE;
+              p_Delete(&h->sig,currRing);h->sig = NULL;
+              return 0;
+            }
+            else
+            {
+              #if ADIDEBUG
+              printf("\nReduced to this via redRing.SIGDROP\n");pWrite(h->p);
+              #endif
+              //strat->enterS(*h, strat->sl+1, strat, strat->tl);
+              return 0;
+            }
           }
-        }
-        p_Delete(&beforeredsig,currRing);
-      }
-      #endif
-      return 1;
+          p_Delete(&beforeredsig,currRing);
+        }
+        #endif
+        return 1;
+      }
     }
 
@@ -2157 +2174 @@
     printf("\n   list   L\n");
     int iii;
-    #if 0
+    #if 1
     for(iii = 0; iii<= strat->Ll; iii++)
     {

kernel/GBEngine/kutil.cc

@@ -12 +12 @@
 #define MYTEST 0
 
-#define ADIDEBUG 0
+#define ADIDEBUG 1
 
 #include <kernel/mod2.h>
@@ -6134 +6134 @@
 BOOLEAN faugereRewCriterion(poly sig, unsigned long not_sevSig, poly /*lm*/, kStrategy strat, int start=0)
 {
-  return FALSE;
+  //return FALSE;
   //printf("Faugere Rewritten Criterion\n");
 //#if 1
@@ -6159 +6159 @@
       PrintS("DELETE!\n");
 #endif
+printf("\nFaugere RewCrit: * divisible by *\n");pWrite(sig);pWrite(strat->sig[k]);
       return TRUE;
     }
@@ -9700 +9701 @@
         if(pLmDivisibleBy(strat->S[i], p))
         {
+          number dummy = n_IntMod(p->coef, strat->S[i]->coef, currRing->cf);
+          p_SetCoeff(p,dummy,currRing);
+        }
+        if(nIsZero(p->coef))
+        {
+          pLmDelete(&p);
+          deleted = TRUE;
+        }
+        else
+        {
+          ok = TRUE;
+        }
+      }
+      pp = pNext(p);
+      while(pp != NULL)
+      {
+        if(pLmDivisibleBy(strat->S[i], pp))
+        {
+          number dummy = n_IntMod(pp->coef, strat->S[i]->coef, currRing->cf);
+          p_SetCoeff(pp,dummy,currRing);
+          if(nIsZero(pp->coef))
+          {
+            pLmDelete(&pNext(p));
+            pp = pNext(p);
+            deleted = TRUE;
+          }
+          else
+          {
+            p = pp;
+            pp = pNext(p);
+          }
+        }
+        else
+        {
+          p = pp;
+          pp = pNext(p);
+        }
+      }
+    }
+  }
+  h->SetLmCurrRing();
+  if(deleted)
+    strat->initEcart(h);
+}
+
+void postReduceByMonSig(LObject* h, kStrategy strat)
+{
+  if(!nCoeff_is_Ring_Z(currRing->cf))
+      return;
+  printf("\npostreducebymon\n");
+  poly hSig = h->sig;
+  poly pH = h->GetP();
+  poly p,pp;
+  p = pH;
+  bool deleted = FALSE, ok = FALSE;
+  for(int i = 0; i<=strat->sl; i++)
+  {
+    p = pH;
+    if(pNext(strat->S[i]) == NULL)
+    {
+      printf("\n------------------\n");
+      pWrite(p);
+      pWrite(strat->S[i]);
+      while(ok == FALSE)
+      {
+        if(pLmDivisibleBy(strat->S[i], p))
+        {
+          poly dum = pDivideM(pHead(p),pHead(strat->S[i]));
+          pWrite(dum);getchar();
           number dummy = n_IntMod(p->coef, strat->S[i]->coef, currRing->cf);
           p_SetCoeff(p,dummy,currRing);

kernel/GBEngine/kutil.h

@@ -748 +748 @@
 poly preIntegerCheck(ideal F, ideal Q);
 void postReduceByMon(LObject* h, kStrategy strat);
+void postReduceByMonSig(LObject* h, kStrategy strat);
 void finalReduceByMon(kStrategy strat);
 #endif