Changeset 3d3ab7 in git
 Timestamp:
 Jul 7, 2015, 1:48:23 PM (8 years ago)
 Branches:
 (u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
 Children:
 41aecf0b6da407ff436939ad6d3daa64856a3da0
 Parents:
 6d11d24961ab342e357f6f0a5ffaea867ce8d7a3
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/GBEngine/kutil.cc
r6d11d2 r3d3ab7 1172 1172 int l,j,compare,compareCoeff; 1173 1173 LObject Lp; 1174 omTestMemory(1);1175 1174 if (strat>interred_flag) return; 1176 1175 #ifdef KDEBUG … … 1199 1198 return; 1200 1199 } 1201 omTestMemory(1);1202 1200 // basic product criterion 1203 1201 pLcm(p,strat>S[i],Lp.lcm); … … 1224 1222 } 1225 1223 assume(!strat>fromT); 1226 omTestMemory(1);1227 1224 /* 1228 1225 *the set B collects the pairs of type (S[j],p) … … 1319 1316 } 1320 1317 } 1321 omTestMemory(1);1322 1318 /* 1323 1319 *the pair (S[i],p) enters B if the spoly != 0 … … 1346 1342 Lp.p = ksCreateShortSpoly(strat>S[i], p, strat>tailRing); 1347 1343 } 1348 omTestMemory(1);1349 1344 if (Lp.p == NULL) 1350 1345 { … … 1370 1365 */ 1371 1366 pLmDelete(Lp.lcm); 1372 printf("\nsdkjhggh\n");1373 1367 } 1374 1368 else … … 1385 1379 Lp.i_r1 = strat>S_2_R[i]; 1386 1380 } 1387 omTestMemory(1);1388 1381 strat>initEcartPair(&Lp,strat>S[i],p,strat>ecartS[i],ecart); 1389 omTestMemory(1);1390 1382 l = strat>posInL(strat>L,strat>Ll,&Lp,strat); 1391 omTestMemory(1);1392 1383 enterL(&strat>L,&strat>Ll,&strat>Lmax,Lp,l); 1393 omTestMemory(1);1394 printf("\nJust printed and retuirned:\n");1395 1384 } 1396 1385 #else 1397 number s, t;1398 1386 assume(i<=strat>sl); 1399 1387 assume(atR >= 0); … … 1415 1403 return; 1416 1404 } 1405 //This is commented out since it is buggy over ZZ 1406 //(check theory with Gerhard, Anne and Christian) 1417 1407 #if 0 1418 1408 // basic chain criterion … … 1425 1415 *if the leading term of r devides lcm(s,p) then (s,p) will not enter B 1426 1416 */ 1427 #if 0 1417 1418 #if ADIDEBUG 1428 1419 idPrint(strat>Shdl); 1429 1420 for(int ii=0; ii<=strat>Ll; ii++) … … 1432 1423 {printf("\nB[%i]\n",ii);pWrite(strat>B[ii].p);pWrite(strat>B[ii].p1);pWrite(strat>B[ii].p2);pWrite(strat>B[ii].lcm);} 1433 1424 #endif 1425 1434 1426 for(j = strat>Bl;j>=0;j) 1435 1427 { … … 1508 1500 } 1509 1501 #endif 1502 number s, t; 1510 1503 poly m1, m2, gcd; 1511 //#if 11512 1504 #if ADIDEBUG 1513 1505 printf("\nTrying to add spair S[%i] und p\n",i);pWrite(strat>S[i]);pWrite(p); … … 1525 1517 poly pm1 = pp_Mult_mm(pNext(p), m1, strat>tailRing); 1526 1518 poly sim2 = pp_Mult_mm(pNext(si), m2, strat>tailRing); 1519 pDelete(&si); 1527 1520 if(sim2 == NULL) 1528 1521 { 1529 1522 if(pm1 == NULL) 1530 1523 { 1524 pDelete(&sim2); 1525 pDelete(&pm1); 1526 pDelete(&gcd); 1527 pDelete(&m1); 1528 pDelete(&m2); 1531 1529 return; 1532 1530 } … … 1534 1532 { 1535 1533 gcd = pCopy(pm1); 1534 pDelete(&pm1); 1535 pDelete(&sim2); 1536 pDelete(&m1); 1537 pDelete(&m2); 1536 1538 } 1537 1539 } … … 1564 1566 int posx; 1565 1567 h.pCleardenom(); 1566 //printf("\nThis is our new achieved polynomial:\n");pWrite(gcd);1567 1568 if(h.p == NULL) 1568 1569 return; 1569 1570 pSetm(h.p); 1570 //#if 11571 1571 #if ADIDEBUG 1572 1572 printf("\nThis is afterwards:\n"); … … 1594 1594 h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat>tailRing); 1595 1595 #if ADIDEBUG 1596 printf("\nThis spoly was added to L:\n");pWrite(h.p);pWrite(h.p1);pWrite(h.p2);printf("\ni_r1 = %i, i_r2 = %i\n",h.i_r1, h.i_r2);pWrite(strat>T[h.i_r1].p);pWrite(strat>T[h.i_r2].p);1596 printf("\nThis spoly was added to B:\n");pWrite(h.p);pWrite(h.p1);pWrite(h.p2);printf("\ni_r1 = %i, i_r2 = %i\n",h.i_r1, h.i_r2);pWrite(strat>T[h.i_r1].p);pWrite(strat>T[h.i_r2].p); 1597 1597 #endif 1598 1598 enterL(&strat>B,&strat>Bl,&strat>Bmax,h,posx); 1599 #if 01600 for(int i=0; i<=strat>Bl; i++)1601 {1602 printf("\n B[%i]\n",i);1603 p_Write(strat>B[i].p, strat>B[i].tailRing);1604 p_Write(strat>B[i].p1, strat>B[i].tailRing);1605 p_Write(strat>B[i].p2, strat>B[i].tailRing);1606 }1607 #endif1608 1599 kTest_TS(strat); 1609 1600 }
Note: See TracChangeset
for help on using the changeset viewer.