- Timestamp:
- Mar 18, 2015, 12:25:24 PM (9 years ago)
- Branches:
- (u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')
- Children:
- efb09679f464982644f48e648b0d4a8c20f4f5ca
- Parents:
- 45d2e45fd4ec2a9209f724d4ccfaff36d3f61c92
- Location:
- libpolys/polys
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
libpolys/polys/ext_fields/transext.cc
r45d2e45 rf3f0ad 1322 1322 /* here we assume: NUM(f), DEN(f) !=NULL, in Z_a reqp. Z/p_a */ 1323 1323 poly pGcd = singclap_gcd_and_divide(NUM(f), DEN(f), ntRing); 1324 //PrintS("gcd= ");p_wrp(pGcd,ntRing);PrintLn(); 1324 1325 if (p_IsConstant(pGcd, ntRing) 1325 1326 && n_IsOne(p_GetCoeff(pGcd, ntRing), ntCoeffs) … … 1457 1458 if ( /*(*/ a!=NULL /*)*/ ) 1458 1459 { 1460 //PrintS("num=");p_wrp(NUM(a),ntRing); 1461 //PrintS(" den=");p_wrp(DEN(a),ntRing);PrintLn(); 1459 1462 definiteGcdCancellation(a, cf, FALSE); 1460 1463 if ((DEN(a)!=NULL) -
libpolys/polys/monomials/ring.cc
r45d2e45 rf3f0ad 1318 1318 res->CanShortOut=r->CanShortOut; 1319 1319 res->LexOrder=r->LexOrder; // TRUE if the monomial ordering has polynomial and power series blocks 1320 res->MixedOrder=r->MixedOrder; // ?? 1 for lex ordering (except ls), -1 otherwise 1320 res->MixedOrder=r->MixedOrder; // TRUE for mixed (global/local) ordering, FALSE otherwise, 1321 // 2 for diffenerent signs within one block 1321 1322 res->ComponentOrder=r->ComponentOrder; 1322 1323 … … 1460 1461 res->CanShortOut=r->CanShortOut; 1461 1462 res->LexOrder=r->LexOrder; // TRUE if the monomial ordering has polynomial and power series blocks 1462 res->MixedOrder=r->MixedOrder; // ?? 1 for lex ordering (except ls), -1 otherwise 1463 res->MixedOrder=r->MixedOrder; // TRUE for mixed (global/local) ordering, FALSE otherwise, 1464 // 2 for diffenerent signs within one block 1463 1465 res->ComponentOrder=r->ComponentOrder; 1464 1466 … … 3015 3017 int i; 3016 3018 for(i=r->block1[o]-r->block0[o];i>=0;i--) 3017 if (r->wvhdl[o][i]<0) { r->MixedOrder= TRUE; break; }3019 if (r->wvhdl[o][i]<0) { r->MixedOrder=2; break; } 3018 3020 } 3019 3021 break; … … 3023 3025 case ringorder_C: 3024 3026 case ringorder_S: 3025 r->ComponentOrder= -1;3027 r->ComponentOrder=TRUE; 3026 3028 break; 3027 3029 case ringorder_M: … … 3130 3132 r->MixedOrder = FALSE; 3131 3133 for(int ii=block0[0];ii<=block1[0];ii++) 3132 if (wvhdl[0][ii-1]<0) { r->MixedOrder= TRUE;break;}3134 if (wvhdl[0][ii-1]<0) { r->MixedOrder=2;break;} 3133 3135 r->LexOrder=FALSE; 3134 3136 for(int ii=block0[0];ii<=block1[0];ii++) … … 5628 5630 return 0; 5629 5631 } 5630 -
libpolys/polys/monomials/ring.h
r45d2e45 rf3f0ad 741 741 inline BOOLEAN rHasGlobalOrdering(const ring r){ return (r->OrdSgn==1); } 742 742 inline BOOLEAN rHasLocalOrMixedOrdering(const ring r){ return (r->OrdSgn==-1); } 743 inline BOOLEAN rHasMixedOrdering(const ring r) { return (r->MixedOrder==1); } 743 744 744 745 // #define rHasGlobalOrdering(R) ((R)->OrdSgn==1)
Note: See TracChangeset
for help on using the changeset viewer.