Changeset b9e18a3 in git
 Timestamp:
 Apr 21, 2010, 5:37:49 PM (13 years ago)
 Branches:
 (u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
 Children:
 b372c66b93132cf385d57ad259bf341460fa9575
 Parents:
 c11951e6cc1b26a68bd26f0429981f14de14a185
 Location:
 Singular
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

Singular/ipshell.cc
rc11951 rb9e18a3 4409 4409 else last += (*iv)[0]; 4410 4410 R>block1[n] = last; 4411 if (R>block0[n]>R>block1[n]) return TRUE; 4411 //if ((R>block0[n]>R>block1[n]) 4412 // (R>block1[n]>rVar(R))) 4413 //{ 4414 // R>block1[n]=rVar(R); 4415 // //WerrorS("ordering larger than number of variables"); 4416 // break; 4417 //} 4412 4418 if (rCheckIV(iv)) return TRUE; 4413 for(i= R>block0[n];i<=R>block1[n];i++)4419 for(i=si_min(rVar(R),R>block1[n]);i>=R>block0[n];i) 4414 4420 { 4415 4421 if (weights[i]==0) weights[i]=typ; … … 4424 4430 case ringorder_a: 4425 4431 R>block0[n] = last+1; 4426 R>block1[n] = si_min(last+iv>length()2 , R>N);4432 R>block1[n] = si_min(last+iv>length()2 , rVar(R)); 4427 4433 R>wvhdl[n] = (int*)omAlloc((iv>length()1)*sizeof(int)); 4428 4434 for (i=2; i<iv>length(); i++) … … 4437 4443 { 4438 4444 R>block0[n] = last+1; 4439 R>block1[n] = si_min(last+iv>length()2 , R>N);4445 R>block1[n] = si_min(last+iv>length()2 , rVar(R)); 4440 4446 R>wvhdl[n] = (int*)omAlloc((iv>length()1)*sizeof(int64)); 4441 4447 int64 *w=(int64 *)R>wvhdl[n]; … … 4462 4468 last += (int)sqrt((double)(iv>length()2)); 4463 4469 R>block1[n] = last; 4464 for(i= R>block0[n];i<=R>block1[n];i++)4470 for(i=si_min(rVar(R),R>block1[n]);i>=R>block0[n];i) 4465 4471 { 4466 4472 if (weights[i]==0) weights[i]=typ; 
Singular/subexpr.cc
rc11951 rb9e18a3 1313 1313 } 1314 1314 /* 4. local ring: ringvar */ 1315 if ((currRingHdl!=NULL) && (IDLEV(currRingHdl)==myynest)) 1315 if ((currRingHdl!=NULL) && (IDLEV(currRingHdl)==myynest) 1316 && (!yyInRingConstruction)) 1316 1317 { 1317 1318 int vnr;
Note: See TracChangeset
for help on using the changeset viewer.