Changeset c66a53 in git for kernel/GBEngine/kspoly.cc

Timestamp:

Jul 16, 2016, 9:42:28 AM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

b6f42a8c2492312d1dd4f0c4c917fcf054636416

Parents:

1798a00a38186e92d8d8d6dc786ccdf6aad508cd34183abab486cee38d70559e5cdcfbc307938f64

Message:

Merge branch 'spielwiese' of github.com:Singular/Sources into SigDrop

File:

• kernel/GBEngine/kspoly.cc (modified) (7 diffs)

kernel/GBEngine/kspoly.cc

@@ -22 +22 @@
 #include <kernel/polys.h>
 #endif
+
+#define ADIDEBUG 0
 
 #ifdef KDEBUG
@@ -180 +182 @@
                  kStrategy strat)
 {
+#if ADIDEBUG
+printf("\nksReducePolySig\n");
+pWrite(PR->p);pWrite(PR->sig);
+pWrite(PW->p);pWrite(PW->sig);
+#endif
 #ifdef KDEBUG
   red_count++;
@@ -235 +242 @@
 #endif
     p_ExpVectorAddSub(sigMult,PR->GetLmCurrRing(),PW->GetLmCurrRing(),currRing);
+    //I have also to set the leading coeficient for sigMult (in the case of rings)
+    if(rField_is_Ring(currRing))
+    {
+      pSetCoeff(sigMult,nMult(nDiv(pGetCoeff(PR->p),pGetCoeff(PW->p)), pGetCoeff(sigMult)));
+    }
 //#if 1
 #ifdef DEBUGF5
@@ -244 +256 @@
     printf("--------------\n");
 #endif
-    int sigSafe = p_LmCmp(PR->sig,sigMult,currRing);
+    int sigSafe;
+    if(!rField_is_Ring(currRing))
+      sigSafe = p_LmCmp(PR->sig,sigMult,currRing);
     // now we can delete the copied polynomial data used for checking for
     // sig-safeness of the reduction step
@@ -252 +266 @@
 
 #endif
+    if(rField_is_Ring(currRing))
+    {
+      // Set the sig
+      poly origsig = pCopy(PR->sig);
+      PR->sig = pHead(pSub(PR->sig, sigMult));
+      //The sigs have the same lm, have to substract
+      //It may happen that now the signature is 0 (drop)
+      if(PR->sig == NULL)
+      {
+        #if ADIDEBUG
+        printf("\nPossible sigdrop in ksreducepolysig (lost signature)\n");
+        #endif
+        strat->sigdrop=TRUE;
+      }
+      else
+      {
+        if(pLtCmp(PR->sig,origsig) == 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;
+          pDelete(&PR->sig);
+          PR->sig = origsig;
+          strat->blockred++;
+          return 3;
+        }
+        if(pLtCmp(PR->sig,origsig) == -1)
+        {
+          #if ADIDEBUG
+          printf("\nSigdrop in ksreducepolysig from * to *\n");pWrite(origsig);pWrite(PR->sig);
+          #endif
+          strat->sigdrop=TRUE;
+        }
+      }
+      pDelete(&origsig);
+    }
     //pDelete(&f1);
-    pDelete(&sigMult);
     // go on with the computations only if the signature of p2 is greater than the
     // signature of fm*p1
-    if(sigSafe != 1)
+    if(sigSafe != 1 && !rField_is_Ring(currRing))
     {
       PR->is_redundant = TRUE;
@@ -324 +373 @@
     }
   }
-
   // take care of coef buisness
-  if (! n_IsOne(pGetCoeff(p2), tailRing))
-  {
-    number bn = pGetCoeff(lm);
-    number an = pGetCoeff(p2);
-    int ct = ksCheckCoeff(&an, &bn, tailRing->cf);    // Calculate special LC
-    p_SetCoeff(lm, bn, tailRing);
-    if ((ct == 0) || (ct == 2))
-      PR->Tail_Mult_nn(an);
-    if (coef != NULL) *coef = an;
-    else n_Delete(&an, tailRing);
+  if(rField_is_Ring(currRing))
+  {
+    p_SetCoeff(lm, nDiv(pGetCoeff(lm),pGetCoeff(p2)), tailRing);
+    if (coef != NULL) *coef = n_Init(1, tailRing);
   }
   else
   {
-    if (coef != NULL) *coef = n_Init(1, tailRing);
-  }
-
+    if (! n_IsOne(pGetCoeff(p2), tailRing))
+    {
+      number bn = pGetCoeff(lm);
+      number an = pGetCoeff(p2);
+      int ct = ksCheckCoeff(&an, &bn, tailRing->cf);    // Calculate special LC
+      p_SetCoeff(lm, bn, tailRing);
+      if (((ct == 0) || (ct == 2)))
+        PR->Tail_Mult_nn(an);
+      if (coef != NULL) *coef = an;
+      else n_Delete(&an, tailRing);
+    }
+    else
+    {
+      if (coef != NULL) *coef = n_Init(1, tailRing);
+    }
+  }
 
   // and finally,
@@ -361 +416 @@
   }
 #endif
-
 #if defined(KDEBUG) && defined(TEST_OPT_DEBUG_RED)
   if (TEST_OPT_DEBUG)