Changeset b4fbb8 in git for kernel/GBEngine/kutil.cc

Timestamp:

Oct 7, 2015, 2:03:45 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', 'e7cc1ebecb61be8b9ca6c18016352af89940b21a')

Children:

8a14df4e24d2bd82a168c3ed70f92659b0bd2442

Parents:

c1c2ccdce7a50ab28491ceb066ea5faa1f7e6e87

Message:

Anne's idea solved - now trying Yue's Bug

File:

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

kernel/GBEngine/kutil.cc

@@ -77 +77 @@
 #endif
 
-#define ADIDEBUG 1
+#define ADIDEBUG 0
 
 denominator_list DENOMINATOR_LIST=NULL;
@@ -1636 +1636 @@
   //p_Test(m1,strat->tailRing);
   //p_Test(m2,strat->tailRing);
-  if(!redMoraNF)
+  /*if(!redMoraNF)
   {
     while (! kCheckStrongCreation(atR, m1, i, m2, strat) )
@@ -1648 +1648 @@
       k_GetStrongLeadTerms(p, si, currRing, m1, m2, gcd, strat->tailRing);
     }
-  }
+  }*/
   pSetCoeff0(m1, s);
   pSetCoeff0(m2, t);
@@ -1719 +1719 @@
   else
   {
-    enterT(h, strat);
+    enterT(h, strat,strat->tl+1);
   }
   //#if 1
@@ -4074 +4074 @@
   PrintS("\nEnter superenterpairs\n");
   int iii = strat->Ll;
+  printf("\nstrat->tl = %i\n",strat->tl);
 #endif
   assume (rField_is_Ring(currRing));
@@ -4095 +4096 @@
     }
   }
+  printf("\nstrat->tl = %i\n",strat->tl);
   iii = strat->Ll;
 #endif
@@ -4114 +4116 @@
     }
   }
+  printf("\nstrat->tl = %i\n",strat->tl);
   iii = strat->Ll;
 #endif
@@ -4133 +4136 @@
     }
   }
+  printf("\nstrat->tl = %i\n",strat->tl);
   PrintS("\nEnd of superenterpairs\n");
 #endif
   clearSbatch(h, k, pos, strat);
+#if ADIDEBUG
+  printf("\nstrat->tl = %i\n",strat->tl);
+#endif
 }
 #endif
@@ -7973 +7980 @@
   }
 #endif
-#ifdef HAVE_RINGS
-  if(rField_is_Ring(currRing) && !n_IsUnit(p.p->coef, currRing->cf))
-  {
-    #if ADIDEBUG_NF
-    printf("\nDas ist p:\n");pWrite(p.p);
-    #endif
-    for(i=strat->tl;i>=0;i--)
-    {
-      if(strat->T[i].ecart <= p.ecart && pLmDivisibleBy(strat->T[i].p,p.p))
-      {
-        #if ADIDEBUG_NF
-        printf("\nFound one: %i\n",i);pWrite(strat->T[i].p);
-        #endif
-        enterOneStrongPoly(i,p.p,p.ecart,0,strat,0 , TRUE);
-      }
-    }
-  }
-  /*
-  printf("\nThis is T:\n");
-  for(i=strat->tl;i>=0;i--)
-  {
-    pWrite(strat->T[i].p);
-  }
-  //getchar();*/
-#endif
+
 #ifdef HAVE_TAIL_RING
   if (currRing!=strat->tailRing)
@@ -8036 +8019 @@
   }
   strat->T[atT] = (TObject) p;
+  #if ADIDEBUG
+  printf("\nenterT: add in position %i\n",atT);
+  pWrite(p.p);
+  #endif
+  printf("\nenterT: neue hingefÌgt: lÀnge = %i, ecart = %i\n",p.length,p.ecart);
 
   if (strat->tailRing != currRing && pNext(p.p) != NULL)
@@ -8047 +8035 @@
   assume(p.sev == 0 || pGetShortExpVector(p.p) == p.sev);
   strat->sevT[atT] = (p.sev == 0 ? pGetShortExpVector(p.p) : p.sev);
+  #ifdef HAVE_RINGS
+  if(rField_is_Ring(currRing) && !n_IsUnit(p.p->coef, currRing->cf))
+  {
+    #if ADIDEBUG_NF
+    printf("\nDas ist p:\n");pWrite(p.p);
+    #endif
+    for(i=strat->tl;i>=0;i--)
+    {
+      if(strat->T[i].ecart <= p.ecart && pLmDivisibleBy(strat->T[i].p,p.p))
+      {
+        #if ADIDEBUG_NF
+        printf("\nFound one: %i\n",i);pWrite(strat->T[i].p);
+        #endif
+        enterOneStrongPoly(i,p.p,p.ecart,0,strat,0 , TRUE);
+      }
+    }
+  }
+  /*
+  printf("\nThis is T:\n");
+  for(i=strat->tl;i>=0;i--)
+  {
+    pWrite(strat->T[i].p);
+  }
+  //getchar();*/
+#endif
   kTest_T(&(strat->T[atT]));
 }