=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v retrieving revision 1.14 retrieving revision 1.16 diff -u -p -r1.14 -r1.16 --- OpenXM_contrib2/asir2000/builtin/array.c 2001/09/04 05:14:03 1.14 +++ OpenXM_contrib2/asir2000/builtin/array.c 2001/09/10 02:45:25 1.16 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.13 2001/06/07 05:14:48 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.15 2001/09/07 08:54:57 noro Exp $ */ #include "ca.h" #include "base.h" @@ -1303,7 +1303,7 @@ int md; ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1 } - for ( ; k >= 0; k-- ) { + for ( ; k > 0; k-- ) { if ( zzz = *s ) { DMAR(zzz,hc,*tj,md,*tj) } tj++; s++; } } @@ -1390,13 +1390,51 @@ int md; hc = md-hc; s = redmat[i]+j; tj = sp+j; - for ( k = col-j; k >= 0; k-- ) { + for ( k = col-j; k > 0; k-- ) { if ( zzz = *s ) { DMAR(zzz,hc,*tj,md,*tj) } tj++; s++; } } } } +/* + mat[i] : compressed reducers (i=0,...,nred-1) + mat[0] < mat[1] < ... < mat[nred-1] w.r.t the term order +*/ + +void reduce_sp_by_red_mod_compress (sp,redmat,ind,nred,col,md) +int *sp; +CDP *redmat; +int *ind; +int nred,col; +int md; +{ + int i,j,k,hc,c,len; + int *tj; + CDP ri; + + /* reduce the spolys by redmat */ + for ( i = nred-1; i >= 0; i-- ) { + /* reduce sp by redmat[i] */ + if ( hc = sp[ind[i]] ) { + /* sp = sp-hc*redmat[i] */ + hc = md-hc; + ri = redmat[i]; + len = ri->len; + for ( k = 0; k < len; k++ ) { + j = ri->body[k].index; + c = ri->body[k].c; + tj = sp+j; +#if 1 + DMAR(c,hc,*tj,md,*tj); +#else + *tj = ((hc*c)+(*tj))%md; +#endif + } + } + } +} + #define ONE_STEP2 if ( zzz = *pk ) { DMAR(zzz,a,*tk,md,*tk) } pk++; tk++; int generic_gauss_elim_mod(mat,row,col,md,colstat) @@ -1446,7 +1484,7 @@ int *colstat; ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 } - for ( ; k >= 0; k -- ) { + for ( ; k > 0; k -- ) { if ( zzz = *pk ) { DMAR(zzz,a,*tk,md,*tk) } pk++; tk++; } } @@ -1479,7 +1517,7 @@ int *colstat; ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2 } - for ( ; k >= 0; k -- ) { + for ( ; k > 0; k -- ) { if ( zzz = *pk ) { DMAR(zzz,a,*tk,md,*tk) } pk++; tk++; } }