=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v retrieving revision 1.7 retrieving revision 1.17 diff -u -p -r1.7 -r1.17 --- OpenXM_contrib2/asir2000/builtin/array.c 2000/08/22 05:03:56 1.7 +++ OpenXM_contrib2/asir2000/builtin/array.c 2001/09/10 05:55:13 1.17 @@ -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.6 2000/08/21 08:31:18 noro Exp $ + * $OpenXM$ */ #include "ca.h" #include "base.h" @@ -57,7 +57,7 @@ #define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d); #endif -extern int Print; /* XXX */ +extern int DP_Print; /* XXX */ void inner_product_mat_int_mod(Q **,int **,int,int,int,Q *); void solve_by_lu_mod(int **,int,int,int **,int); @@ -67,12 +67,14 @@ void mat_to_gfmmat(MAT,unsigned int,GFMMAT *); int generic_gauss_elim_mod(int **,int,int,int,int *); int generic_gauss_elim(MAT ,MAT *,Q *,int **,int **); +void reduce_sp_by_red_mod_compress (int *,CDP *,int *,int,int,int); int gauss_elim_mod(int **,int,int,int); int gauss_elim_mod1(int **,int,int,int); int gauss_elim_geninv_mod(unsigned int **,int,int,int); int gauss_elim_geninv_mod_swap(unsigned int **,int,int,unsigned int,unsigned int ***,int **); void Pnewvect(), Pnewmat(), Psepvect(), Psize(), Pdet(), Pleqm(), Pleqm1(), Pgeninvm(); +void Pnewbytearray(); void Pgeneric_gauss_elim_mod(); @@ -89,6 +91,7 @@ void Px962_irredpoly_up2(); void Pirredpoly_up2(); void Pnbpoly_up2(); void Pqsort(); +void Pexponent_vector(); struct ftab array_tab[] = { {"solve_by_lu_gfmmat",Psolve_by_lu_gfmmat,4}, @@ -96,7 +99,11 @@ struct ftab array_tab[] = { {"mat_to_gfmmat",Pmat_to_gfmmat,2}, {"generic_gauss_elim_mod",Pgeneric_gauss_elim_mod,2}, {"newvect",Pnewvect,-2}, + {"vector",Pnewvect,-2}, + {"exponent_vector",Pexponent_vector,-99999999}, {"newmat",Pnewmat,-3}, + {"matrix",Pnewmat,-3}, + {"newbytearray",Pnewbytearray,-2}, {"sepmat_destructive",Psepmat_destructive,2}, {"sepvect",Psepvect,2}, {"qsort",Pqsort,-2}, @@ -374,6 +381,57 @@ VECT *rp; *rp = vect; } +void Pexponent_vector(arg,rp) +NODE arg; +DP *rp; +{ + nodetod(arg,rp); +} + +void Pnewbytearray(arg,rp) +NODE arg; +BYTEARRAY *rp; +{ + int len,i,r; + BYTEARRAY array; + unsigned char *vb; + char *str; + LIST list; + NODE tn; + + asir_assert(ARG0(arg),O_N,"newbytearray"); + len = QTOS((Q)ARG0(arg)); + if ( len < 0 ) + error("newbytearray : invalid size"); + MKBYTEARRAY(array,len); + if ( argc(arg) == 2 ) { + if ( !ARG1(arg) ) + error("newbytearray : invalid initialization"); + switch ( OID((Obj)ARG1(arg)) ) { + case O_LIST: + list = (LIST)ARG1(arg); + asir_assert(list,O_LIST,"newbytearray"); + for ( r = 0, tn = BDY(list); tn; r++, tn = NEXT(tn) ); + if ( r <= len ) { + for ( i = 0, tn = BDY(list), vb = BDY(array); tn; + i++, tn = NEXT(tn) ) + vb[i] = (unsigned char)QTOS((Q)BDY(tn)); + } + break; + case O_STR: + str = BDY((STRING)ARG1(arg)); + r = strlen(str); + if ( r <= len ) + bcopy(str,BDY(array),r); + break; + default: + if ( !ARG1(arg) ) + error("newbytearray : invalid initialization"); + } + } + *rp = array; +} + void Pnewmat(arg,rp) NODE arg; MAT *rp; @@ -712,8 +770,10 @@ int row,col,md; t = mat[i]; if ( i != j && (a = t[j]) ) for ( k = j, a = md - a; k <= n; k++ ) { + unsigned int tk; /* t[k] = dmar(pivot[k],a,t[k],md); */ - DMAR(pivot[k],a,t[k],md,t[k]) + DMAR(pivot[k],a,t[k],md,tk) + t[k] = tk; } } } @@ -757,10 +817,10 @@ int **rindp,**cindp; colstat = (int *)MALLOC_ATOMIC(col*sizeof(int)); wcolstat = (int *)MALLOC_ATOMIC(col*sizeof(int)); for ( ind = 0; ; ind++ ) { - if ( Print ) { + if ( DP_Print ) { fprintf(asir_out,"."); fflush(asir_out); } - md = lprime[ind]; + md = get_lprime(ind); get_eg(&tmp0); for ( i = 0; i < row; i++ ) for ( j = 0, bmi = bmat[i], wmi = wmat[i]; j < col; j++ ) @@ -794,13 +854,13 @@ RESET: } } else { if ( rank < rank0 ) { - if ( Print ) { + if ( DP_Print ) { fprintf(asir_out,"lower rank matrix; continuing...\n"); fflush(asir_out); } continue; } else if ( rank > rank0 ) { - if ( Print ) { + if ( DP_Print ) { fprintf(asir_out,"higher rank matrix; resetting...\n"); fflush(asir_out); } @@ -808,7 +868,7 @@ RESET: } else { for ( j = 0; (jrow; col = mat->col; w = (int **)almat(row,col); for ( ind = 0; ; ind++ ) { - md = lprime[ind]; + md = get_lprime(ind); STOQ(md,mdq); for ( i = 0; i < row; i++ ) for ( j = 0, ai = a0[i], wi = w[i]; j < col; j++ ) @@ -987,7 +1050,7 @@ int **rindp,**cindp; add_eg(&eg_mul,&tmp0,&tmp1); /* q = q*md */ mulq(q,mdq,&u); q = u; - if ( !(count % 2) && intmtoratm_q(xmat,NM(q),*nmmat,dn) ) { + if ( !(count % 16) && intmtoratm_q(xmat,NM(q),*nmmat,dn) ) { for ( j = k = l = 0; j < col; j++ ) if ( cinfo[j] ) rind[k++] = j; @@ -1241,7 +1304,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++; } } @@ -1328,13 +1391,86 @@ 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++; } } } } +/* + rlist : reducers list + ht(BDY(rlist)) < ht(BDY(NEXT(rlist)) < ... w.r.t. the term order +*/ + +void reduce_reducers_mod_compress(rlist,nred,at,col,md,redmatp,indredp) +NODE rlist; +int nred; +DL *at; +int col,md; +CDP **redmatp; +int **indredp; +{ + CDP *redmat; + CDP t; + int *indred,*w; + int i,k; + NODE r; + + *redmatp = redmat = (CDP *)CALLOC(nred,sizeof(CDP)); + *indredp = indred = (int *)CALLOC(nred,sizeof(int)); + w = (int *)CALLOC(col,sizeof(int)); + + _dpmod_to_vect_compress(BDY(rlist),at,&redmat[0]); + indred[0] = redmat[0]->body[0].index; + + for ( i = 1, r = NEXT(rlist); i < nred; i++, r = NEXT(r) ) { + bzero(w,col*sizeof(int)); + _dpmod_to_vect(BDY(r),at,w); + reduce_sp_by_red_mod_compress(w,redmat,indred,i,col,md); + compress_vect(w,col,&redmat[i]); + indred[i] = redmat[i]->body[0].index; + } +} + +/* + 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) @@ -1384,7 +1520,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++; } } @@ -1417,7 +1553,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++; } } @@ -1462,7 +1598,10 @@ int *perm; DMAR(inv,m,0,md,t[k]) for ( j = k+1, m = md - t[k]; j < col; j++ ) if ( pivot[j] ) { - DMAR(m,pivot[j],t[j],md,t[j]) + unsigned int tj; + + DMAR(m,pivot[j],t[j],md,tj) + t[j] = tj; } } } @@ -1517,7 +1656,9 @@ int **rinfo,**cinfo; DMAR(inv,m,0,md,t[k]) for ( j = k+1, m = md - t[k]; j < col; j++ ) if ( pivot[j] ) { - DMAR(m,pivot[j],t[j],md,t[j]) + unsigned int tj; + DMAR(m,pivot[j],t[j],md,tj) + t[j] = tj; } } } @@ -2466,7 +2607,7 @@ int row,col; for ( i = 0; i < row; i++ ) { for ( j = 0; j < col; j++ ) { - printnum(mat[i][j]); printf(" "); + printnum((Num)mat[i][j]); printf(" "); } printf("\n"); }