Changeset 4d56fe in git
- Timestamp:
- Mar 24, 2015, 5:08:27 PM (9 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 9b240710d9ea423c1b2f46292d3623feeb39a4b3
- Parents:
- a94825bccfd22b15bed688d4960beff0c826c021853606b08213635f36b832787aa660894c0a3cce
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/dyn_modules/singmathic/singmathic.cc
r853606 r4d56fe 464 464 } 465 465 466 BOOLEAN setRingGlobal(leftv result, leftv arg) {467 currRing->OrdSgn = 1;468 result->rtyp=NONE;469 return FALSE;470 }471 472 466 BOOLEAN mathicgb(leftv result, leftv arg) 473 467 { 474 468 result->rtyp=NONE; 475 469 476 if (arg == NULL || arg->next != NULL || arg->Typ() != IDEAL_CMD) { 477 WerrorS("Syntax: mathicgb(<ideal>)"); 470 if (arg == NULL || arg->next != NULL || 471 ((arg->Typ() != IDEAL_CMD) &&(arg->Typ() != MODUL_CMD))){ 472 WerrorS("Syntax: mathicgb(<ideal>/<module>)"); 478 473 return TRUE; 479 474 } … … 518 513 mgb::computeGroebnerBasis(toMathic, fromMathic); 519 514 520 result->rtyp =IDEAL_CMD;515 result->rtyp = arg->Typ(); 521 516 result->data = fromMathic.takeIdeal(); 522 517 return FALSE; … … 542 537 prOrderX 543 538 ); 544 psModulFunctions->iiAddCproc(545 (currPack->libname ? currPack->libname : ""),546 "mathicgb_setRingGlobal",547 FALSE,548 setRingGlobal549 );550 539 return MAX_TOK; 551 540 } -
Singular/iparith.cc
ra94825 r4d56fe 3056 3056 static BOOLEAN jjREDUCE_P(leftv res, leftv u, leftv v) 3057 3057 { 3058 assumeStdFlag(v); 3059 res->data = (char *)kNF((ideal)v->Data(),currRing->qideal,(poly)u->Data()); 3058 ideal vi=(ideal)v->Data(); 3059 if (currRing->qideal!=NULL || vi->ncols>1) 3060 assumeStdFlag(v); 3061 res->data = (char *)kNF(vi,currRing->qideal,(poly)u->Data()); 3060 3062 return FALSE; 3061 3063 } 3062 3064 static BOOLEAN jjREDUCE_ID(leftv res, leftv u, leftv v) 3063 3065 { 3064 assumeStdFlag(v);3065 3066 ideal ui=(ideal)u->Data(); 3066 3067 ideal vi=(ideal)v->Data(); 3068 if (currRing->qideal!=NULL || vi->ncols>1) 3069 assumeStdFlag(v); 3067 3070 res->data = (char *)kNF(vi,currRing->qideal,ui); 3068 3071 return FALSE; -
kernel/GBEngine/kstd1.cc
r853606 r4d56fe 2701 2701 } 2702 2702 2703 poly kNF (ideal F, ideal Q, poly p,int syzComp, int lazyReduce, const ring _currRing) 2704 { 2705 const ring save = currRing; if( currRing != _currRing ) rChangeCurrRing(_currRing); 2703 poly k_NF (ideal F, ideal Q, poly p,int syzComp, int lazyReduce, const ring _currRing) 2704 { 2705 const ring save = currRing; 2706 if( currRing != _currRing ) rChangeCurrRing(_currRing); 2706 2707 poly ret = kNF(F, Q, p, syzComp, lazyReduce); 2707 2708 if( currRing != save ) rChangeCurrRing(save); -
kernel/GBEngine/kstd1.h
r853606 r4d56fe 27 27 28 28 /// NOTE: this is just a wrapper which sets currRing for the actual kNF call 29 poly k NF (ideal F, ideal Q, poly p,int syzComp, int lazyReduce, const ring _currRing);29 poly k_NF (ideal F, ideal Q, poly p,int syzComp, int lazyReduce, const ring _currRing); 30 30 ideal kSba(ideal F,ideal Q, tHomog h, intvec ** mw, int incremental=0, int arri=0, intvec *hilb=NULL, 31 31 int syzComp=0,int newIdeal=0, intvec *vw=NULL); -
kernel/GBEngine/kstd2.cc
r853606 r4d56fe 1609 1609 #endif 1610 1610 { 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1611 int k=1; 1612 int j; 1613 while(k<=strat->sl) 1614 { 1615 j=0; 1616 loop 1617 { 1618 if (j>=k) break; 1619 clearS(strat->S[j],strat->sevS[j],&k,&j,strat); 1620 j++; 1621 } 1622 k++; 1623 } 1624 1624 } 1625 1625 } -
libpolys/polys/nc/gb_hack.h
r853606 r4d56fe 28 28 ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing); 29 29 30 poly k NF(ideal, ideal, poly, int, int, const ring _currRing);30 poly k_NF(ideal, ideal, poly, int, int, const ring _currRing); 31 31 32 32 -
libpolys/polys/nc/sca.cc
r853606 r4d56fe 1118 1118 // square = NF( var(i)^2 | Q ) 1119 1119 // NOTE: there is no better way to check this in general! 1120 square = k NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!1120 square = k_NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG! 1121 1121 1122 1122 if( square != NULL ) // var(i)^2 is not in Q?
Note: See TracChangeset
for help on using the changeset viewer.