Changeset c4279b in git for kernel/kutil.cc
 Timestamp:
 Dec 13, 2013, 10:03:59 AM (10 years ago)
 Branches:
 (u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')
 Children:
 55233bec0f99f7b6752ebfe613d9ada501e0d441
 Parents:
 d11734c14946aacc7d00348d000a1bb22c618823
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/kutil.cc
rd11734 rc4279b 8303 8303 return r; 8304 8304 } 8305 ring res = rCopy0(r, FALSE, TRUE); 8306 for (int i=1; i<n1; i++) 8307 { 8308 res>order[i] = res>order[i1]; 8309 res>block0[i] = res>block0[i1]; 8310 res>block1[i] = res>block1[i1]; 8311 res>wvhdl[i] = res>wvhdl[i1]; 8305 ring res = rCopy0(r, TRUE, FALSE); 8306 res>order = (int *)omAlloc0((n+1)*sizeof(int)); 8307 res>block0 = (int *)omAlloc0((n+1)*sizeof(int)); 8308 res>block1 = (int *)omAlloc0((n+1)*sizeof(int)); 8309 int **wvhdl = (int **)omAlloc0((n+1)*sizeof(int*)); 8310 res>wvhdl = wvhdl; 8311 for (int i=1; i<n; i++) 8312 { 8313 res>order[i] = r>order[i1]; 8314 res>block0[i] = r>block0[i1]; 8315 res>block1[i] = r>block1[i1]; 8316 res>wvhdl[i] = r>wvhdl[i1]; 8312 8317 } 8313 8318 8314 8319 // new 1st block 8315 8320 res>order[0] = ringorder_C; // Prefix 8316 //res>block0[0] = 1; 8317 //res>block1[0] = res>N; 8318 //res>wvhdl[j] = NULL; 8319 // res>order [j] = 0; // The End! 8321 // removes useless secondary component order if defined in old ring 8322 for (int i=rBlocks(res); i>0; i) { 8323 if (res>order[i] == ringorder_C  res>order[i] == ringorder_c) { 8324 res>order[i] = 0; 8325 break; 8326 } 8327 } 8320 8328 rComplete(res, 1); 8321 8329 #ifdef HAVE_PLURAL … … 8342 8350 if (strat>sbaOrder == 3) 8343 8351 { 8344 printf("hh\n"); 8345 ring res = rCopy0(r, FALSE, TRUE); 8346 for (int i=2; i<n; i++) 8347 { 8348 printf("i %d\n",i); 8349 res>order[i] = res>order[i2]; 8350 res>block0[i] = res>block0[i2]; 8351 res>block1[i] = res>block1[i2]; 8352 res>wvhdl[i] = res>wvhdl[i2]; 8353 } 8354 printf("hh2\n"); 8352 ring res = rCopy0(r, TRUE, FALSE); 8353 res>order = (int *)omAlloc0((n+2)*sizeof(int)); 8354 res>block0 = (int *)omAlloc0((n+2)*sizeof(int)); 8355 res>block1 = (int *)omAlloc0((n+2)*sizeof(int)); 8356 int **wvhdl = (int **)omAlloc0((n+2)*sizeof(int*)); 8357 res>wvhdl = wvhdl; 8358 for (int i=2; i<n+2; i++) 8359 { 8360 res>order[i] = r>order[i2]; 8361 res>block0[i] = r>block0[i2]; 8362 res>block1[i] = r>block1[i2]; 8363 res>wvhdl[i] = r>wvhdl[i2]; 8364 } 8355 8365 8356 8366 // new 1st block … … 8360 8370 for (int i=0; i<res>N; ++i) 8361 8371 res>wvhdl[0][i] = 1; 8362 res>block1[0] = si_min(1+res>N, rVar(res)); 8363 8372 res>block1[0] = si_min(res>N, rVar(res)); 8364 8373 // new 2nd block 8365 8374 res>order[1] = ringorder_C; // Prefix 8366 res>block0[1] = 1; 8367 res>block1[1] = res>N; 8368 //res>wvhdl[j] = NULL; 8369 // res>order [j] = 0; // The End! 8375 res>wvhdl[1] = NULL; 8376 // removes useless secondary component order if defined in old ring 8377 for (int i=rBlocks(res); i>0; i) { 8378 if (res>order[i] == ringorder_C  res>order[i] == ringorder_c) { 8379 res>order[i] = 0; 8380 break; 8381 } 8382 } 8370 8383 rComplete(res, 1); 8371 8384 #ifdef HAVE_PLURAL
Note: See TracChangeset
for help on using the changeset viewer.