Changeset 7b25fe in git for kernel/ideals.cc
 Timestamp:
 Jul 25, 2011, 5:40:41 PM (12 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
 Children:
 1558d57b639351ad0ad10d1e5e337419bfcf21fb
 Parents:
 630dad1a4f9f6b630b4dcfa05851a5869b7fe25b
 gitauthor:
 Hans Schoenemann <hannes@mathematik.unikl.de>20110725 17:40:41+02:00
 gitcommitter:
 Mohamed Barakat <mohamed.barakat@rwthaachen.de>20111109 12:53:33+01:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/ideals.cc
r630dad r7b25fe 285 285 assume(!idIs0(h2)); 286 286 assume(IDELEMS(h1)<=IDELEMS(h2)); 287 assume(id RankFreeModule(h1)==0);288 assume(id RankFreeModule(h2)==0);287 assume(id_RankFreeModule(h1,currRing)==0); 288 assume(id_RankFreeModule(h2,currRing)==0); 289 289 // add a new variable: 290 290 int j; … … 351 351 { 352 352 int i,j,k,length; 353 int flength = id RankFreeModule(h1);354 int slength = id RankFreeModule(h2);353 int flength = id_RankFreeModule(h1,currRing); 354 int slength = id_RankFreeModule(h2,currRing); 355 355 int rank=si_min(flength,slength); 356 356 if ((idIs0(h1))  (idIs0(h2))) return idInit(1,rank); … … 500 500 if (!idIs0(arg[i])) 501 501 { 502 realrki=id RankFreeModule(arg[i]);502 realrki=id_RankFreeModule(arg[i],currRing); 503 503 k++; 504 504 j += IDELEMS(arg[i]); … … 610 610 611 611 if (idIs0(h1)) return NULL; 612 k = id RankFreeModule(h1);612 k = id_RankFreeModule(h1,currRing); 613 613 h2=idCopy(h1); 614 614 i = IDELEMS(h2)1; … … 724 724 return result; 725 725 } 726 int slength=(int)id RankFreeModule(h1);727 k=si_max(1,slength /*id RankFreeModule(h1)*/);726 int slength=(int)id_RankFreeModule(h1,currRing); 727 k=si_max(1,slength /*id_RankFreeModule(h1)*/); 728 728 729 729 assume(currRing != NULL); … … 893 893 ideal idLiftStd (ideal h1, matrix* ma, tHomog hi, ideal * syz) 894 894 { 895 int i, j, k, t, inputIsIdeal=id RankFreeModule(h1);895 int i, j, k, t, inputIsIdeal=id_RankFreeModule(h1,currRing); 896 896 poly p=NULL, q, qq; 897 897 intvec *w=NULL; … … 919 919 BITSET save_verbose=verbose; 920 920 921 k=si_max(1,(int)id RankFreeModule(h1));921 k=si_max(1,(int)id_RankFreeModule(h1,currRing)); 922 922 923 923 if ((k==1) && (!lift3)) verbose =Sy_bit(V_IDLIFT); … … 1047 1047 static void idPrepareStd(ideal s_temp, int k) 1048 1048 { 1049 int j,rk=id RankFreeModule(s_temp);1049 int j,rk=id_RankFreeModule(s_temp,currRing); 1050 1050 poly p,q; 1051 1051 … … 1081 1081 BOOLEAN isSB, BOOLEAN divide, matrix *unit) 1082 1082 { 1083 int lsmod =id RankFreeModule(submod), i, j, k;1083 int lsmod =id_RankFreeModule(submod,currRing), i, j, k; 1084 1084 int comps_to_add=0; 1085 1085 poly p; … … 1125 1125 comps_to_add; 1126 1126 } 1127 k=si_max(id RankFreeModule(mod),idRankFreeModule(submod));1127 k=si_max(id_RankFreeModule(mod,currRing),id_RankFreeModule(submod,currRing)); 1128 1128 if ((k!=0) && (lsmod==0)) lsmod=1; 1129 1129 k=si_max(k,(int)mod>rank); … … 1364 1364 int i,l,ll,k,kkk,kmax; 1365 1365 int j = 0; 1366 int k1 = id RankFreeModule(h1);1367 int k2 = id RankFreeModule(h2);1366 int k1 = id_RankFreeModule(h1,currRing); 1367 int k2 = id_RankFreeModule(h2,currRing); 1368 1368 tHomog hom=isNotHomog; 1369 1369 … … 2198 2198 return idFreeModule(si_max(1,h2>ncols)); 2199 2199 if (!idIs0(h1)) 2200 flength = id RankFreeModule(h1);2201 slength = id RankFreeModule(h2);2200 flength = id_RankFreeModule(h1,currRing); 2201 slength = id_RankFreeModule(h2,currRing); 2202 2202 length = si_max(flength,slength); 2203 2203 if (length==0) … … 2509 2509 ideal res=arg; 2510 2510 if (!inPlace) res = idCopy(arg); 2511 res>rank=si_max(res>rank,id RankFreeModule(res));2511 res>rank=si_max(res>rank,id_RankFreeModule(res,currRing)); 2512 2512 int *red_comp=(int*)omAlloc((res>rank+1)*sizeof(int)); 2513 2513 for (i=res>rank;i>=0;i) red_comp[i]=i;
Note: See TracChangeset
for help on using the changeset viewer.