Changeset cb72d2 in git
- Timestamp:
- Oct 10, 2018, 5:04:09 PM (6 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
- Children:
- f190196e27fa6d66bc5230d2587b99527ba5fa1e
- Parents:
- 744abff418696fe730a23e8b601f9625084b50ca
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r744abf rcb72d2 2213 2213 c_par_names=currRing->cf->extRing->names; 2214 2214 } 2215 #ifdef HAVE_SHIFTBBA 2216 if (r->isLPring==0) 2217 #endif 2215 if (!rIsLPRing(r)) 2218 2216 { 2219 2217 maFindPerm(r->names, r->N, r_par_names, r_par, … … 4440 4438 int isLetterplace=(int)(long)atGet(v,"isLetterplaceRing",INT_CMD); 4441 4439 ring r=rCompose(l,TRUE,mm,isLetterplace); 4440 #ifdef HAVE_SHIFTBBA 4442 4441 if (isLetterplace) 4443 4442 { … … 4446 4445 r->isLPring=TRUE; 4447 4446 } 4447 #endif 4448 4448 res->data=(char *)r; 4449 4449 return (r==NULL); … … 9290 9290 /* else, ALLOW_PLURAL */ 9291 9291 } 9292 else if (currRing->isLPring) 9292 #ifdef HAVE_SHIFTBBA 9293 else if (rIsLPRing(currRing)) 9293 9294 { 9294 9295 if ((p & ALLOW_LP)==0) … … 9298 9299 } 9299 9300 } 9301 #endif 9300 9302 #endif 9301 9303 #ifdef HAVE_RINGS -
Singular/ipshell.cc
r744abf rcb72d2 2895 2895 2896 2896 if (!isLetterplace) rRenameVars(R); 2897 #ifdef HAVE_SHIFTBBA 2897 2898 else R->isLPring=isLetterplace; 2899 #endif 2898 2900 if (bitmask!=0x7fff) R->bitmask=bitmask*2; 2899 2901 rComplete(R); -
kernel/GBEngine/kutil.cc
r744abf rcb72d2 7839 7839 Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3); 7840 7840 if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount); 7841 #ifdef HAVE_SHIFTBBA 7841 7842 /* in usual case strat->cv is 0, it gets changed only in shift routines */ 7842 7843 if (strat->cv!=0) Print("shift V criterion:%d\n",strat->cv); 7843 /*mflush();*/7844 #endif 7844 7845 } 7845 7846 … … 7852 7853 //Print("product criterion:%d chain criterion:%d\n",strat->cp,strat->c3); 7853 7854 if (hilbcount!=0) Print("hilbert series criterion:%d\n",hilbcount); 7855 #ifdef HAVE_SHIFTBBA 7854 7856 /* in usual case strat->cv is 0, it gets changed only in shift routines */ 7855 7857 if (strat->cv!=0) Print("shift V criterion:%d\n",strat->cv); 7856 /*mflush();*/7858 #endif 7857 7859 } 7858 7860 -
libpolys/polys/monomials/ring.cc
r744abf rcb72d2 417 417 #endif 418 418 } 419 if (r ->isLPring)419 if (rIsLPRing(r)) 420 420 { 421 421 PrintS("\n// letterplace ring"); -
libpolys/polys/monomials/ring.h
r744abf rcb72d2 397 397 static inline BOOLEAN rIsPluralRing(const ring r) 398 398 { 399 assume(r != NULL); assume(r->cf != NULL);399 assume(r != NULL); 400 400 #ifdef HAVE_PLURAL 401 401 nc_struct *n; … … 406 406 } 407 407 408 static inline BOOLEAN rIs NCRing(const ring r)409 { 410 assume(r != NULL); assume(r->cf != NULL);411 #ifdef HAVE_ PLURAL412 return (r->isLPring!=0) || rIsPluralRing(r);408 static inline BOOLEAN rIsLPRing(const ring r) 409 { 410 assume(r != NULL); 411 #ifdef HAVE_SHIFTBBA 412 return (r->isLPring!=0); 413 413 #else 414 414 return FALSE; 415 415 #endif 416 } 417 418 static inline BOOLEAN rIsNCRing(const ring r) 419 { 420 return rIsLPRing(r) || rIsPluralRing(r); 416 421 } 417 422
Note: See TracChangeset
for help on using the changeset viewer.