Changeset af66d6 in git
 Timestamp:
 Aug 3, 2011, 7:36:56 PM (13 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
 Children:
 1e872a8ed7451934142b28236ec124f6235b5679
 Parents:
 f218a7daf5f60792a940256fb8358b13d4d85ef3
 gitauthor:
 Oleksandr Motsak <motsak@mathematik.unikl.de>20110803 19:36:56+02:00
 gitcommitter:
 Mohamed Barakat <mohamed.barakat@rwthaachen.de>20111109 13:14:22+01:00
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

kernel/syz0.cc
rf218a7 raf66d6 208 208 /*construction of the new ordering*/ 209 209 if (rkF>0) 210 rSetSyzComp(rkF );210 rSetSyzComp(rkF, currRing); 211 211 else 212 rSetSyzComp(1 );212 rSetSyzComp(1, currRing); 213 213 /*creating S*/ 214 214 for(j=0;j<Fl;j++) … … 840 840 static void idShift(ideal arg,int index) 841 841 { 842 int i,j=rGetMaxSyzComp(index );842 int i,j=rGetMaxSyzComp(index, currRing); 843 843 for (i=0;i<IDELEMS(arg);i++) 844 844 { 
kernel/syz1.cc
rf218a7 raf66d6 421 421 int* prev_c; 422 422 int p_length; 423 rGetSComps(&prev_c, &prev_s, &p_length );423 rGetSComps(&prev_c, &prev_s, &p_length, currRing); 424 424 currcomponents = syzstr>truecomponents[index1]; 425 425 currShiftedComponents = syzstr>ShiftedComponents[index1]; 426 426 rChangeSComps(currcomponents, 427 427 currShiftedComponents, 428 IDELEMS(syzstr>res[index1]) );428 IDELEMS(syzstr>res[index1]), currRing); 429 429 if (hilb==0) 430 430 { … … 456 456 currcomponents = prev_c; 457 457 currShiftedComponents = prev_s; 458 rChangeSComps(prev_c, prev_s, p_length );458 rChangeSComps(prev_c, prev_s, p_length, currRing); 459 459 } 460 460 } … … 1645 1645 { 1646 1646 if(syzstr>syRing>typ[1].ord_typ == ro_syzcomp) 1647 r NChangeSComps(NULL, NULL, syzstr>syRing);1647 rChangeSComps(NULL, NULL, 0, syzstr>syRing); 1648 1648 1649 1649 rKill(syzstr>syRing); … … 2357 2357 currShiftedComponents = syzstr>ShiftedComponents[index]; 2358 2358 rChangeSComps(currcomponents, currShiftedComponents, 2359 IDELEMS(syzstr>res[index]) );2359 IDELEMS(syzstr>res[index]), currRing); 2360 2360 sPairs = syzstr>resPairs[index]; 2361 2361 Strip = syToStrip(syzstr,index); … … 2382 2382 currShiftedComponents = syzstr>ShiftedComponents[0]; 2383 2383 rChangeSComps( currcomponents, currShiftedComponents, 2384 IDELEMS(syzstr>res[0]) );2384 IDELEMS(syzstr>res[0]), currRing); 2385 2385 tres[1] = idInit(IDELEMS(syzstr>res[1]),syzstr>res[1]>rank); 2386 2386 sPairs = syzstr>resPairs[0]; … … 2479 2479 currcomponents[i] = i; 2480 2480 } 2481 rChangeSComps(currcomponents, currShiftedComponents, arg>rank );2481 rChangeSComps(currcomponents, currShiftedComponents, arg>rank, syzstr>syRing); 2482 2482 /* initializes the data structures*/ 2483 2483 syzstr>Tl = new intvec(*length); … … 2525 2525 currShiftedComponents = syzstr>ShiftedComponents[si_max(index1,0)]; 2526 2526 rChangeSComps(currcomponents, currShiftedComponents, 2527 IDELEMS(syzstr>res[si_max(index1,0)]) );2527 IDELEMS(syzstr>res[si_max(index1,0)]), currRing); 2528 2528 j = syInitSyzMod(syzstr,index+1); 2529 2529 if (index>0) … … 2621 2621 currcomponents[i] = i; 2622 2622 } 2623 rChangeSComps(currcomponents, currShiftedComponents, arg>rank );2623 rChangeSComps(currcomponents, currShiftedComponents, arg>rank, currRing); 2624 2624 /* initializes the data structures*/ 2625 2625 syzstr>Tl = new intvec(maxlength); … … 2673 2673 currShiftedComponents = syzstr>ShiftedComponents[si_max(index1,0)]; 2674 2674 rChangeSComps(currcomponents, currShiftedComponents, 2675 IDELEMS(syzstr>res[si_max(index1,0)]) );2675 IDELEMS(syzstr>res[si_max(index1,0)]), currRing); 2676 2676 j = syInitSyzMod(syzstr,index+1); 2677 2677 if (index>0) 
libpolys/polys/monomials/ring.cc
rf218a7 raf66d6 4204 4204 * change the block to reflect the sequence given by appending v 4205 4205 */ 4206 4206 static inline void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r) 4207 { 4208 assume(r>typ[1].ord_typ == ro_syzcomp); 4209 4210 r>typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents; 4211 r>typ[1].data.syzcomp.Components = currComponents; 4212 } 4213 4214 static inline void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r) 4215 { 4216 assume(r>typ[1].ord_typ == ro_syzcomp); 4217 4218 *currShiftedComponents = r>typ[1].data.syzcomp.ShiftedComponents; 4219 *currComponents = r>typ[1].data.syzcomp.Components; 4220 } 4207 4221 #ifdef PDEBUG 4208 void rDBChangeSComps(int* currComponents,4222 static inline void rDBChangeSComps(int* currComponents, 4209 4223 long* currShiftedComponents, 4210 4224 int length, … … 4216 4230 rNChangeSComps( currComponents, currShiftedComponents, r); 4217 4231 } 4218 void rDBGetSComps(int** currComponents,4232 static inline void rDBGetSComps(int** currComponents, 4219 4233 long** currShiftedComponents, 4220 4234 int *length, … … 4228 4242 #endif 4229 4243 4230 void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r) 4231 { 4232 assume(r>typ[1].ord_typ == ro_syzcomp); 4233 4234 r>typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents; 4235 r>typ[1].data.syzcomp.Components = currComponents; 4236 } 4237 4238 void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r) 4239 { 4240 assume(r>typ[1].ord_typ == ro_syzcomp); 4241 4242 *currShiftedComponents = r>typ[1].data.syzcomp.ShiftedComponents; 4243 *currComponents = r>typ[1].data.syzcomp.Components; 4244 } 4244 void rChangeSComps(int* currComponents, long* currShiftedComponents, int length, ring r) 4245 { 4246 #ifdef PDEBUG 4247 rDBChangeSComps(currComponents, currShiftedComponents, length, r); 4248 #else 4249 rNChangeSComps(currComponents, currShiftedComponents, r); 4250 #endif 4251 } 4252 4253 void rGetSComps(int** currComponents, long** currShiftedComponents, int *length, ring r) 4254 { 4255 #ifdef PDEBUG 4256 rDBGetSComps(currComponents, currShiftedComponents, length, r); 4257 #else 4258 rNGetSComps(currComponents, currShiftedComponents, r); 4259 #endif 4260 } 4261 4245 4262 4246 4263 ///////////////////////////////////////////////////////////////////////////// 
libpolys/polys/monomials/ring.h
rf218a7 raf66d6 380 380 381 381 // The following are for LaScala3 only! 382 #ifdef PDEBUG 383 #define rChangeSComps(c,s,l) rDBChangeSComps(c,s,l) 384 #define rGetSComps(c,s,l) rDBGetSComps(c,s,l) 385 void rDBChangeSComps(int* currComponents, 386 long* currShiftedComponents, 387 int length, 388 ring r); 389 void rDBGetSComps(int** currComponents, 390 long** currShiftedComponents, 391 int *length, 392 ring r); 393 #else 394 #define rChangeSComps(c,s,l) rNChangeSComps(c,s) 395 #define rGetSComps(c,s,l) rNGetSComps(c,s) 396 #endif 397 398 void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r); 399 void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r); 382 void rChangeSComps(int* currComponents, long* currShiftedComponents, int length, ring r); 383 void rGetSComps(int** currComponents, long** currShiftedComponents, int *length, ring r); 384 385 400 386 401 387 //idhdl rFindHdl(ring r, idhdl n, idhdl w);
Note: See TracChangeset
for help on using the changeset viewer.