Changeset c796c8 in git
- Timestamp:
- Aug 28, 2017, 2:30:24 PM (7 years ago)
- Branches:
- (u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
- Children:
- d3af5563dd6158320fbcab1e881015c48a28ceb7
- Parents:
- 5f259212712c8e1493fc47614d46271a11127586
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/GBEngine/f5gb.cc
r5f2592 rc796c8 332 332 poly u1 = pOne(); 333 333 poly u2 = pOne(); 334 u1 = p Divide(lcm,pHead(temp->getPoly()));334 u1 = pMDivide(lcm,temp->getPoly()); 335 335 pSetCoeff(u1,nOne); 336 u2 = p Divide(lcm,pHead(temp2->getPoly()));336 u2 = pMDivide(lcm,temp2->getPoly()); 337 337 pSetCoeff(u2,nOne); 338 338 sp = ksOldSpolyRedNew(ppMult_qq(u1,temp->getPoly()), … … 349 349 if(pDivisibleBy(reducer,pHead(sp))) { 350 350 poly uReducer = pOne(); 351 uReducer = p Divide(lcm,pHead(reducer));351 uReducer = pMDivide(lcm,reducer); 352 352 pSetCoeff(uReducer,nOne); 353 353 sp = ksOldSpolyRedNew(sp,ppMult_qq(uReducer,reducer)); … … 465 465 pSetCoeff(lcm,nOne); 466 466 // computing factors u2 for new labels 467 u1 = p Divide(lcm,t);467 u1 = pMDivide(lcm,t); 468 468 if(NULL == u1) { 469 469 break; 470 470 } 471 471 pSetCoeff(u1,nOne); 472 u2 = p Divide(lcm,pHead(temp->getPoly()));472 u2 = pMDivide(lcm,temp->getPoly()); 473 473 pSetCoeff(u2,nOne); 474 474 int degree = pDeg(ppMult_qq(u2,pHead(temp->getPoly()))); … … 571 571 pSetCoeff(lcm,nOne); 572 572 // computing factors u2 for new labels 573 u1 = p Divide(lcm,t);573 u1 = pMDivide(lcm,t); 574 574 if(NULL == u1) { 575 575 break; 576 576 } 577 577 pSetCoeff(u1,nOne); 578 u2 = p Divide(lcm,pHead(temp->getPoly()));578 u2 = pMDivide(lcm,temp->getPoly()); 579 579 pSetCoeff(u2,nOne); 580 580 // testing both new labels by the F5 Criterion … … 1236 1236 //pWrite(tempRed->getPoly()); 1237 1237 if(pLmDivisibleByNoComp(tempRed->getPoly(),tempPoly)) { 1238 u = p DivideM(pHead(tempPoly),pHead(tempRed->getPoly()));1238 u = pMDivideM(tempPoly,tempRed->getPoly()); 1239 1239 //Print("U: "); 1240 1240 //pWrite(u); … … 1390 1390 if(pLmDivisibleByNoComp(tempRed->getPoly(),tempPoly)) { 1391 1391 //Print("A\n"); 1392 u = p DivideM(pHead(tempPoly),pHead(tempRed->getPoly()));1392 u = pMDivideM(tempPoly,tempRed->getPoly()); 1393 1393 //Print("U: "); 1394 1394 //pWrite(u); … … 1588 1588 //pWrite(l->getPoly()); 1589 1589 //pWrite(tempBad->getPoly()); 1590 u = p Divide(pHead(l->getPoly()),pHead(tempBad->getPoly()));1590 u = pMDivide(l->getPoly(),tempBad->getPoly()); 1591 1591 //Print("MULTIPLIER: "); 1592 1592 //pWrite(u); … … 1835 1835 // get all the information needed for the following tests 1836 1836 // of the criteria 1837 u = p Divide(t,pHead(temp->getPoly()));1837 u = pMDivide(t,temp->getPoly()); 1838 1838 pSetCoeff(u,nOne); 1839 1839 red = ppMult_qq(u,temp->getPoly()); -
kernel/GBEngine/janet.cc
r5f2592 rc796c8 78 78 return 0; 79 79 80 /* poly b1=p Divide(x->root,y->root);80 /* poly b1=pMDivide(x->root,y->root); 81 81 82 82 number gcd=n_Gcd(pGetCoeff(x->root),pGetCoeff(y->root),currRing->cf); … … 124 124 return 0; 125 125 126 /* poly b1=p Divide(from,y->root);126 /* poly b1=pMDivide(from,y->root); 127 127 128 128 number gcd=n_Gcd(pGetCoeff(from),pGetCoeff(y->root),currRing->cf); … … 309 309 if (!g) return 0; //if not - kill him ! 310 310 311 poly lmX=p Divide(x->lead,g->root);312 p GetCoeff(lmX)=nInit(1);311 poly lmX=pMDivide(x->lead,g->root); 312 pSetCoeff0(lmX,nInit(1)); 313 313 314 314 /* if ((f=is_div_(F,lmX)) != NULL) -
kernel/GBEngine/syz0.cc
r5f2592 rc796c8 591 591 syz->coef = nInpNeg(syz->coef); 592 592 lastmonom = syz; 593 multWith = p Divide(syz,F[j]);593 multWith = pMDivide(syz,F[j]); 594 594 multWith->coef = nCopy(currRing->qideal->m[k-Fl]->coef); 595 595 } -
kernel/GBEngine/syz2.cc
r5f2592 rc796c8 145 145 poly p1,p2; 146 146 int ip= currRing->N; 147 p1 = p Divide(p,(syzstr->resPairs[index])[i].p);148 p2 = p Divide(nP->m[j],(syzstr->resPairs[index])[j].p);147 p1 = pMDivide(p,(syzstr->resPairs[index])[i].p); 148 p2 = pMDivide(nP->m[j],(syzstr->resPairs[index])[j].p); 149 149 while ((ip>0) && (pGetExp(p1,ip)*pGetExp(p2,ip)==0)) ip--; 150 150 if (ip==0) … … 231 231 n_SubringGcd(pGetCoeff(tso.p1),pGetCoeff(tso.p2),currRing->cf); 232 232 tso.syz = pCopy((syzstr->resPairs[index])[i].syz); 233 poly tt = p Divide(tso.lcm,tso.p1);233 poly tt = pMDivide(tso.lcm,tso.p1); 234 234 pSetCoeff(tt,nDiv(pGetCoeff(tso.p1),coefgcd)); 235 235 tso.syz = pMult_mm(tso.syz,tt); … … 237 237 coefgcd = nInpNeg(coefgcd); 238 238 pp = pCopy((syzstr->resPairs[index])[r1].syz); 239 tt = p Divide(tso.lcm,tso.p2);239 tt = pMDivide(tso.lcm,tso.p2); 240 240 pSetCoeff(tt,nDiv(pGetCoeff(tso.p2),coefgcd)); 241 241 pp = pMult_mm(pp,tt); … … 394 394 inline void sySPRedSyz(syStrategy syzstr,sSObject redWith,poly q=NULL) 395 395 { 396 poly p=p Divide(q,redWith.p);396 poly p=pMDivide(q,redWith.p); 397 397 pSetCoeff(p,nDiv(pGetCoeff(q),pGetCoeff(redWith.p))); 398 398 int il=-1; -
kernel/GBEngine/syz3.cc
r5f2592 rc796c8 390 390 poly p1,p2; 391 391 int ip=(currRing->N); 392 p1 = p Divide(p,old_generators->m[jj]);393 p2 = p Divide(prs[j1],old_generators->m[j1]);392 p1 = pMDivide(p,old_generators->m[jj]); 393 p2 = pMDivide(prs[j1],old_generators->m[j1]); 394 394 while ((ip>0) && (pGetExp(p1,ip)*pGetExp(p2,ip)==0)) ip--; 395 395 if (ip==0) … … 474 474 inline void sySPRedSyz_Kosz(syStrategy syzstr,poly redWith,poly syz,poly q=NULL,int l_syz=-1) 475 475 { 476 poly p=p Divide(q,redWith);476 poly p=pMDivide(q,redWith); 477 477 pSetCoeff(p,nDiv(pGetCoeff(q),pGetCoeff(redWith))); 478 478 kBucket_Minus_m_Mult_p(syzstr->syz_bucket,p,syz,&l_syz,NULL); … … 739 739 assume (old_repr->m[tso.ind1]!=NULL); 740 740 tso.syz = pCopy(old_repr->m[tso.ind1]); 741 poly tt = p Divide(tso.lcm,tso.p1);741 poly tt = pMDivide(tso.lcm,tso.p1); 742 742 pSetComp(tt,0); 743 743 pSetmComp(tt); … … 748 748 assume (old_repr->m[tso.ind2]!=NULL); 749 749 p = pCopy(old_repr->m[tso.ind2]); 750 tt = p Divide(tso.lcm,tso.p2);750 tt = pMDivide(tso.lcm,tso.p2); 751 751 pSetComp(tt,0); 752 752 pSetmComp(tt); … … 1094 1094 poly p1,p2; 1095 1095 int ip=(currRing->N); 1096 p1 = p Divide(p,add_generators->m[j]);1097 p2 = p Divide(prs[j1],add_generators->m[j1]);1096 p1 = pMDivide(p,add_generators->m[j]); 1097 p2 = pMDivide(prs[j1],add_generators->m[j1]); 1098 1098 while ((ip>0) && (pGetExp(p1,ip)*pGetExp(p2,ip)==0)) ip--; 1099 1099 if (ip==0) … … 1262 1262 assume (add_repr->m[tso.ind1]!=NULL); 1263 1263 tso.syz = pCopy(add_repr->m[tso.ind1]); 1264 poly tt = p Divide(tso.lcm,tso.p1);1264 poly tt = pMDivide(tso.lcm,tso.p1); 1265 1265 pSetComp(tt,0); 1266 1266 pSetmComp(tt); … … 1271 1271 assume (add_repr->m[tso.ind2]!=NULL); 1272 1272 p = pCopy(add_repr->m[tso.ind2]); 1273 tt = p Divide(tso.lcm,tso.p2);1273 tt = pMDivide(tso.lcm,tso.p2); 1274 1274 pSetComp(tt,0); 1275 1275 pSetmComp(tt); -
kernel/GBEngine/tgb.cc
r5f2592 rc796c8 118 118 if(changed) 119 119 { 120 poly div_by = p Divide (copy, got);120 poly div_by = pMDivide (copy, got); 121 121 poly iter = h; 122 122 while(iter) … … 1437 1437 if(changed) 1438 1438 { 1439 poly div_by = p Divide (copy, got);1439 poly div_by = pMDivide (copy, got); 1440 1440 poly iter = h; 1441 1441 while(iter) -
kernel/combinatorics/hilb.cc
r5f2592 rc796c8 1770 1770 * p and w remain unchanged 1771 1771 * the new polys for Jwi are constructed by sub-routines 1772 * deleteInMon, shiftInMon, p_ Divide,1772 * deleteInMon, shiftInMon, p_MDivide, 1773 1773 * places the result in Jwi and deletes the new polys 1774 1774 * coming in dw, smon, qmon … … 1808 1808 { 1809 1809 del = FALSE; 1810 qmonp = p_ Divide(smon, dw, currRing);1810 qmonp = p_MDivide(smon, dw, currRing); 1811 1811 idInsertMonomials(Jwi, shiftInMon(qmonp, -d, lV, currRing)); 1812 1812 -
kernel/polys.h
r5f2592 rc796c8 273 273 /* ----------------- define to enable new p_procs -----*/ 274 274 275 #define p Divide(a,b) p_Divide(a,b,currRing)275 #define pMDivide(a,b) p_MDivide(a,b,currRing) 276 276 #define pDivideM(a,b) p_DivideM(a,b,currRing) 277 277 #define pLcm(a,b,m) p_Lcm(a,b,m,currRing) -
kernel/spectrum/spectrum.cc
r5f2592 rc796c8 356 356 // -------------------------- 357 357 358 poly multiplicant = p_ Divide( m,stdJ->m[k],r );358 poly multiplicant = p_MDivide( m,stdJ->m[k],r ); 359 359 pGetCoeff( multiplicant ) = n_Init(1,r->cf); 360 360 -
libpolys/polys/monomials/p_polys.cc
r5f2592 rc796c8 1454 1454 * leaves a and b unmodified 1455 1455 */ 1456 poly p_ Divide(poly a, poly b, const ring r)1456 poly p_MDivide(poly a, poly b, const ring r) 1457 1457 { 1458 1458 assume((p_GetComp(a,r)==p_GetComp(b,r)) || (p_GetComp(b,r)==0)); -
libpolys/polys/monomials/p_polys.h
r5f2592 rc796c8 1926 1926 poly p_mInit(const char *s, BOOLEAN &ok, const ring r); /* monom s -> poly, interpreter */ 1927 1927 const char * p_Read(const char *s, poly &p,const ring r); /* monom -> poly */ 1928 poly p_ Divide(poly a, poly b, const ring r);1928 poly p_MDivide(poly a, poly b, const ring r); 1929 1929 poly p_DivideM(poly a, poly b, const ring r); 1930 1930 poly p_Div_nn(poly p, const number n, const ring r);
Note: See TracChangeset
for help on using the changeset viewer.