Changeset fb87b82 in git

Timestamp:

Oct 19, 2015, 7:00:58 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f6db0d20f2a2a1e61303f9831ef6201e89faad2f

Parents:

a07db8714e0495d86b2f4758df4475f17535d842

Message:

partially fixed chainCrit over Rings

File:

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

kernel/GBEngine/kutil.cc

@@ -1393 +1393 @@
       }
       strat->initEcartPair(&Lp,strat->S[i],p,strat->ecartS[i],ecart);
-      l = strat->posInL(strat->L,strat->Ll,&Lp,strat);
-      enterL(&strat->L,&strat->Ll,&strat->Lmax,Lp,l);
+      l = strat->posInL(strat->B,strat->Bl,&Lp,strat);
+      enterL(&strat->B,&strat->Bl,&strat->Bmax,Lp,l);
     }
   #else
@@ -1449 +1449 @@
               pWrite(strat->B[j].p1);
               pWrite(strat->B[j].p2);
+              pWrite(strat->B[j].lcm);
               printf("\nh - neue Paar\n");
               pWrite(h.p);
@@ -1455 +1456 @@
               pWrite(h.lcm);
               #endif
-        if ((n_DivBy(strat->B[j].lcm->coef, h.lcm->coef, currRing->cf)) && ((strat->fromQ==NULL) || (isFromQ==0) || (strat->fromQ[i]==0)))
-        {
+        if ((n_DivBy(h.lcm->coef, strat->B[j].lcm->coef,  currRing->cf)) && ((strat->fromQ==NULL) || (isFromQ==0) || (strat->fromQ[i]==0)))
+        {
+          #if ADIDEBUG
+          printf("\nGelöscht neue h\n");
+          #endif
           strat->c3++;
           pLmDelete(h.lcm);
@@ -1471 +1475 @@
               pWrite(strat->B[j].p1);
               pWrite(strat->B[j].p2);
+              pWrite(strat->B[j].lcm);
               printf("\nh - neue Paar\n");
               pWrite(h.p);
@@ -1477 +1482 @@
               pWrite(h.lcm);
               #endif
-          if(n_DivBy( h.lcm->coef, strat->B[j].lcm->coef, currRing->cf))
-          {
+          //Ist schon im coeffCompare
+          //if(n_DivBy( h.lcm->coef, strat->B[j].lcm->coef, currRing->cf))
+          //{
           #if ADIDEBUG
                         printf("\nGelöscht: B[j]\n");
@@ -1484 +1490 @@
             deleteInL(strat->B,&strat->Bl,j,strat);
             strat->c3++;
-          }
+          //}
       }
     }
@@ -1497 +1503 @@
               pWrite(strat->B[j].p1);
               pWrite(strat->B[j].p2);
+              pWrite(strat->B[j].lcm);
               printf("\nh - neue Paar\n");
               pWrite(h.p);
@@ -1530 +1537 @@
               pWrite(h.lcm);
               #endif
-        if(n_DivBy( h.lcm->coef, strat->B[j].lcm->coef,currRing->cf))
-        {
+        //if(n_DivBy( h.lcm->coef, strat->B[j].lcm->coef,currRing->cf))
+        //{
           #if ADIDEBUG
           printf("\nGelöscht B[j]\n");
@@ -1537 +1544 @@
           deleteInL(strat->B,&strat->Bl,j,strat);
           strat->c3++;
-        }
+        //}
       }
     }
@@ -1569 +1576 @@
         pDelete(&h.lcm);
       h.Clear();
+      if (strat->pairtest==NULL) initPairtest(strat);
+      strat->pairtest[i] = TRUE;
+      strat->pairtest[strat->sl+1] = TRUE;
       return;
     }
@@ -1600 +1610 @@
   h.i_r = -1;
   if(h.p == NULL)
+  {  
+    if (strat->pairtest==NULL) initPairtest(strat);
+    strat->pairtest[i] = TRUE;
+    strat->pairtest[strat->sl+1] = TRUE;
     return;
+  }
   h.tailRing = strat->tailRing;
   int posx;
-  h.pCleardenom();
-  if(h.p == NULL)
-    return;
-  pSetm(h.p);
+  //h.pCleardenom();
+  //pSetm(h.p);
   #if ADIDEBUG
   printf("\nThis is afterwards:\n");
@@ -1749 +1762 @@
       h.i_r2 = -1;
     }
-    if (strat->Ll==-1)
+    if (strat->Bl==-1)
       posx =0;
     else
-      posx = strat->posInL(strat->L,strat->Ll,&h,strat);
-    enterL(&strat->L,&strat->Ll,&strat->Lmax,h,posx);
+      posx = strat->posInL(strat->B,strat->Bl,&h,strat);
+    enterL(&strat->B,&strat->Bl,&strat->Bmax,h,posx);
   }
   else
@@ -3434 +3447 @@
                 wrp(strat->S[j]);
                 PrintS("  strat->B[i].lcm:");
+                wrp(strat->B[i].lcm);PrintLn();
+                pWrite(strat->B[i].p);
+                pWrite(strat->B[i].p1);
+                pWrite(strat->B[i].p2);
                 wrp(strat->B[i].lcm);
                 PrintLn();