Changeset 802336 in git

Timestamp:

Jul 7, 2015, 2:38:28 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f32df145228a0829ff9b0de419b7da256166126e

Parents:

5ce55117cb44e8329794e5d1774b323ef206c8c5

Message:

fix: kFindDivisibleByInS,
updated: kPosInLDependsOnLength
add: debug ouput in enterpairs

File:

• kernel/GBEngine/kutil.cc (modified) (9 diffs)

kernel/GBEngine/kutil.cc

@@ -3350 +3350 @@
           for (i=strat->Bl; i>=0; i--)
           {
-            if (pDivisibleBy(strat->S[j],strat->B[i].lcm))
+            if (pDivisibleBy(strat->S[j],strat->B[i].lcm) && n_DivBy(strat->B[i].lcm->coef, strat->S[j]->coef,currRing))
             {
 #ifdef KDEBUG
@@ -4124 +4124 @@
   assume (!rField_is_Ring(currRing));
 #endif
+  #if ADIDEBUG
+        Print("\n    Vor initenterpairs: The new pair list L -- after superenterpairs in loop\n");
+        for(int iii=0;iii<=strat->Ll;iii++)
+        {
+          printf("\n    L[%d]:\n",iii);
+          PrintS("         ");p_Write(strat->L[iii].p,strat->tailRing);
+          PrintS("         ");p_Write(strat->L[iii].p1,strat->tailRing);
+          PrintS("         ");p_Write(strat->L[iii].p2,strat->tailRing);
+        }
+        #endif
 
   initenterpairs(h,k,ecart,0,strat, atR);
+
+      #if ADIDEBUG
+        Print("\n    Nach initenterpairs: The new pair list L -- after superenterpairs in loop \n");
+        for(int iii=0;iii<=strat->Ll;iii++)
+        {
+          printf("\n    L[%d]:\n",iii);
+          PrintS("         ");p_Write(strat->L[iii].p,strat->tailRing);
+          PrintS("         ");p_Write(strat->L[iii].p1,strat->tailRing);
+          PrintS("         ");p_Write(strat->L[iii].p2,strat->tailRing);
+        }
+        #endif
+
   if ( (!strat->fromT)
   && ((strat->syzComp==0)
@@ -5981 +6003 @@
       if (j > pos) return NULL;
 #if defined(PDEBUG) || defined(PDIV_DEBUG)
-      if (p_LmShortDivisibleBy(strat->S[j], sev[j], p, not_sev, r) &&
+      if (strat->S[j]!= NULL && p_LmShortDivisibleBy(strat->S[j], sev[j], p, not_sev, r) &&
           (ecart== LONG_MAX || ecart>= strat->ecartS[j]))
-        break;
+        {
+#ifdef HAVE_RINGS
+            if(rField_is_Ring(r))
+                {if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), r))
+                     break;}
+            else
+#endif
+            break;
+        }
 #else
       if (!(sev[j] & not_sev) &&
           (ecart== LONG_MAX || ecart>= strat->ecartS[j]) &&
           p_LmDivisibleBy(strat->S[j], p, r))
-        break;
+        {
+#ifdef HAVE_RINGS
+            if(rField_is_Ring(r))
+                {if(n_DivBy(pGetCoeff(p), pGetCoeff(strat->S[j]), r))
+                    break;}
+            else
+#endif
+            break;
+        }
 
 #endif
@@ -6019 +6057 @@
       if (p_LmShortDivisibleBy(t->t_p, sev[j], p, not_sev, r) &&
           (ecart== LONG_MAX || ecart>= strat->ecartS[j]))
-        return t;
+        {
+#ifdef HAVE_RINGS
+            if(rField_is_Ring(r))
+                {if(n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r))
+                    return t;}
+            else
+#endif
+            return t;
+        }
 #else
       if (! (sev[j] & not_sev) && (ecart== LONG_MAX || ecart>= strat->ecartS[j]))
@@ -6025 +6071 @@
         t = strat->S_2_T(j);
         assume(t != NULL && t->t_p != NULL && t->tailRing == r && t->p == strat->S[j]);
-        if (p_LmDivisibleBy(t->t_p, p, r)) return t;
+        if (p_LmDivisibleBy(t->t_p, p, r))
+        {
+#ifdef HAVE_RINGS
+            if(rField_is_Ring(r))
+                {if(n_DivBy(pGetCoeff(p), pGetCoeff(t->t_p), r))
+                    return t;}
+            else
+#endif
+            return t;
+        }
       }
 #endif
@@ -8176 +8231 @@
 {
   if (pos_in_l == posInL110 ||
-      pos_in_l == posInL10)
+      pos_in_l == posInL10  ||
+      pos_in_l == posInLRing)
     return TRUE;
 
@@ -8341 +8397 @@
   }
   strat->fromT = FALSE;
+  strat->noTailReduction = !TEST_OPT_REDTAIL;
   if ((!TEST_OPT_SB_1)
   #ifdef HAVE_RINGS
@@ -8456 +8513 @@
   if (rField_is_Ring(currRing))
   {
-    strat->posInL = posInL11;
+    strat->posInL = posInL11Ring;
     strat->posInT = posInT11;
   }
@@ -8541 +8598 @@
     updateS(TRUE,strat);
   }
-  if (strat->fromQ!=NULL) omFreeSize(strat->fromQ,IDELEMS(strat->Shdl)*sizeof(int));
-  strat->fromQ=NULL;
+  //if (strat->fromQ!=NULL) omFreeSize(strat->fromQ,IDELEMS(strat->Shdl)*sizeof(int));
+  //strat->fromQ=NULL;
+  assume(kTest_TS(strat));
 }