=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v retrieving revision 1.35 retrieving revision 1.47 diff -u -p -r1.35 -r1.47 --- OpenXM_contrib2/asir2000/builtin/array.c 2004/06/30 20:01:36 1.35 +++ OpenXM_contrib2/asir2000/builtin/array.c 2005/11/27 00:07:05 1.47 @@ -45,13 +45,15 @@ * 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.34 2003/11/27 02:20:51 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.46 2005/02/08 18:06:05 saito Exp $ */ #include "ca.h" #include "base.h" #include "parse.h" #include "inline.h" +#define F4_INTRAT_PERIOD 8 + #if 0 #undef DMAR #define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d); @@ -87,6 +89,7 @@ void Pmat_swap_col_destructive(); void Pvect(); void Pmat(); void Pmatc(); +void Pnd_det(); struct ftab array_tab[] = { {"solve_by_lu_gfmmat",Psolve_by_lu_gfmmat,4}, @@ -111,6 +114,7 @@ struct ftab array_tab[] = { {"ltov",Pltov,1}, {"size",Psize,1}, {"det",Pdet,-2}, + {"nd_det",Pnd_det,-2}, {"invmat",Pinvmat,-2}, {"leqm",Pleqm,2}, {"leqm1",Pleqm1,2}, @@ -154,7 +158,7 @@ int generic_comp_obj(Obj *a,Obj *b) } -void Pqsort(NODE arg,VECT *rp) +void Pqsort(NODE arg,LIST *rp) { VECT vect; NODE n,n1; @@ -201,9 +205,9 @@ void Pqsort(NODE arg,VECT *rp) for ( i = len - 1, n = 0; i >= 0; i-- ) { MKNODE(n1,a[i],n); n = n1; } - MKLIST((LIST)*rp,n); + MKLIST(*rp,n); }else { - *rp = vect; + *rp = (LIST)vect; } } @@ -756,6 +760,10 @@ void Psize(NODE arg,LIST *rp) n = ((MAT)ARG0(arg))->row; m = ((MAT)ARG0(arg))->col; STOQ(m,q); MKNODE(s,q,0); STOQ(n,q); MKNODE(t,q,s); break; + case O_IMAT: + n = ((IMAT)ARG0(arg))->row; m = ((IMAT)ARG0(arg))->col; + STOQ(m,q); MKNODE(s,q,0); STOQ(n,q); MKNODE(t,q,s); + break; default: error("size : invalid argument"); break; } @@ -824,11 +832,12 @@ void Pinvmat(NODE arg,LIST *rp) input : a row x col matrix A A[I] <-> A[I][0]*x_0+A[I][1]*x_1+... - output : [B,R,C] + output : [B,D,R,C] B : a rank(A) x col-rank(A) matrix + D : the denominator R : a vector of length rank(A) C : a vector of length col-rank(A) - B[I] <-> x_{R[I]}+B[I][0]x_{C[0]}+B[I][1]x_{C[1]}+... + B[I] <-> D*x_{R[I]}+B[I][0]x_{C[0]}+B[I][1]x_{C[1]}+... */ void Pgeneric_gauss_elim(NODE arg,LIST *rp) @@ -867,6 +876,8 @@ void Pgeneric_gauss_elim(NODE arg,LIST *rp) B : a rank(A) x col-rank(A) matrix R : a vector of length rank(A) C : a vector of length col-rank(A) + RN : a vector of length rank(A) indicating useful rows + B[I] <-> x_{R[I]}+B[I][0]x_{C[0]}+B[I][1]x_{C[1]}+... */ @@ -874,11 +885,11 @@ void Pgeneric_gauss_elim_mod(NODE arg,LIST *rp) { NODE n0; MAT m,mat; - VECT rind,cind; + VECT rind,cind,rnum; Q **tmat; - int **wmat; - Q *rib,*cib; - int *colstat; + int **wmat,**row0; + Q *rib,*cib,*rnb; + int *colstat,*p; Q q; int md,i,j,k,l,row,col,t,rank; @@ -887,6 +898,10 @@ void Pgeneric_gauss_elim_mod(NODE arg,LIST *rp) m = (MAT)ARG0(arg); md = QTOS((Q)ARG1(arg)); row = m->row; col = m->col; tmat = (Q **)m->body; wmat = (int **)almat(row,col); + + row0 = (int **)ALLOCA(row*sizeof(int *)); + for ( i = 0; i < row; i++ ) row0[i] = wmat[i]; + colstat = (int *)MALLOC_ATOMIC(col*sizeof(int)); for ( i = 0; i < row; i++ ) for ( j = 0; j < col; j++ ) @@ -899,6 +914,13 @@ void Pgeneric_gauss_elim_mod(NODE arg,LIST *rp) wmat[i][j] = 0; rank = generic_gauss_elim_mod(wmat,row,col,md,colstat); + MKVECT(rnum,rank); + rnb = (Q *)rnum->body; + for ( i = 0; i < rank; i++ ) + for ( j = 0, p = wmat[i]; j < row; j++ ) + if ( p == row0[j] ) + STOQ(j,rnb[i]); + MKMAT(mat,rank,col-rank); tmat = (Q **)mat->body; for ( i = 0; i < rank; i++ ) @@ -916,7 +938,7 @@ void Pgeneric_gauss_elim_mod(NODE arg,LIST *rp) } else { STOQ(j,cib[l]); l++; } - n0 = mknode(3,mat,rind,cind); + n0 = mknode(4,mat,rind,cind,rnum); MKLIST(*rp,n0); } @@ -1116,7 +1138,7 @@ RESET: add_eg(&eg_chrem_split,&tmp0,&tmp1); get_eg(&tmp0); - if ( ind % 16 ) + if ( ind % F4_INTRAT_PERIOD ) ret = 0; else ret = intmtoratm(crmat,m1,*nm,dn); @@ -1167,7 +1189,13 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn int *cinfo,*rinfo; int *rind,*cind; int count; - struct oEGT eg_mul,eg_inv,tmp0,tmp1; + int ret; + struct oEGT eg_mul,eg_inv,eg_intrat,eg_check,tmp0,tmp1; + int period; + int *wx,*ptr; + int wxsize,nsize; + N wn; + Q wq; a0 = (Q **)mat->body; row = mat->row; col = mat->col; @@ -1215,9 +1243,17 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn *cindp = cind = (int *)MALLOC_ATOMIC((ri)*sizeof(int)); init_eg(&eg_mul); init_eg(&eg_inv); - for ( q = ONE, count = 0; ; count++ ) { - fprintf(stderr,"."); + init_eg(&eg_check); init_eg(&eg_intrat); + period = F4_INTRAT_PERIOD; + nsize = period; + wxsize = rank*ri*nsize; + wx = (int *)MALLOC_ATOMIC(wxsize*sizeof(int)); + for ( i = 0; i < wxsize; i++ ) wx[i] = 0; + for ( q = ONE, count = 0; ; ) { + if ( DP_Print > 3 ) + fprintf(stderr,"o"); /* wc = -b mod md */ + get_eg(&tmp0); for ( i = 0; i < rank; i++ ) for ( j = 0, bi = b[i], wi = wc[i]; j < ri; j++ ) if ( u = (Q)bi[j] ) { @@ -1227,17 +1263,19 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn wi[j] = t; } else wi[j] = 0; - /* wc = A^(-1)wc; wc is normalized */ - get_eg(&tmp0); - solve_by_lu_mod(w,rank,md,wc,ri); - get_eg(&tmp1); - add_eg(&eg_inv,&tmp0,&tmp1); - /* x = x-q*wc */ + /* wc = A^(-1)wc; wc is not normalized */ + solve_by_lu_mod(w,rank,md,wc,ri,0); + /* wx += q*wc */ + ptr = wx; for ( i = 0; i < rank; i++ ) - for ( j = 0, xi = x[i], wi = wc[i]; j < ri; j++ ) { - STOQ(wi[j],u); mulq(q,u,&s); - subq(xi[j],s,&u); xi[j] = u; + for ( j = 0, wi = wc[i]; j < ri; j++ ) { + if ( wi[j] ) + muln_1(BD(NM(q)),PL(NM(q)),wi[j],ptr); + ptr += nsize; } + count++; + get_eg(&tmp1); + add_eg(&eg_inv,&tmp0,&tmp1); get_eg(&tmp0); for ( i = 0; i < rank; i++ ) for ( j = 0; j < ri; j++ ) { @@ -1255,18 +1293,50 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn add_eg(&eg_mul,&tmp0,&tmp1); /* q = q*md */ mulq(q,mdq,&u); q = u; - if ( !(count % 16) && intmtoratm_q(xmat,NM(q),*nmmat,dn) ) { - for ( j = k = l = 0; j < col; j++ ) - if ( cinfo[j] ) - rind[k++] = j; - else - cind[l++] = j; - if ( gensolve_check(mat,*nmmat,*dn,rind,cind) ) { - fprintf(stderr,"\n"); - print_eg("INV",&eg_inv); - print_eg("MUL",&eg_mul); - fflush(asir_out); - return rank; + if ( count == period ) { + get_eg(&tmp0); + ptr = wx; + for ( i = 0; i < rank; i++ ) + for ( j = 0, xi = x[i]; j < ri; + j++, ptr += nsize ) { + for ( k = nsize-1; k >= 0 && !ptr[k]; k-- ); + if ( k >= 0 ) { + wn = NALLOC(k+1); + PL(wn) = k+1; + for ( l = 0; l <= k; l++ ) BD(wn)[l] = (unsigned int)ptr[l]; + NTOQ(wn,1,wq); + subq(xi[j],wq,&u); xi[j] = u; + } + } + ret = intmtoratm_q(xmat,NM(q),*nmmat,dn); + get_eg(&tmp1); add_eg(&eg_intrat,&tmp0,&tmp1); + if ( ret ) { + for ( j = k = l = 0; j < col; j++ ) + if ( cinfo[j] ) + rind[k++] = j; + else + cind[l++] = j; + get_eg(&tmp0); + ret = gensolve_check(mat,*nmmat,*dn,rind,cind); + get_eg(&tmp1); add_eg(&eg_check,&tmp0,&tmp1); + if ( ret ) { + if ( DP_Print > 3 ) { + fprintf(stderr,"\n"); + print_eg("INV",&eg_inv); + print_eg("MUL",&eg_mul); + print_eg("INTRAT",&eg_intrat); + print_eg("CHECK",&eg_check); + fflush(asir_out); + } + return rank; + } + } else { + period = period*3/2; + count = 0; + nsize += period; + wxsize += rank*ri*nsize; + wx = (int *)REALLOC(wx,wxsize*sizeof(int)); + for ( i = 0; i < wxsize; i++ ) wx[i] = 0; } } } @@ -1868,7 +1938,7 @@ int find_lhs_and_lu_mod(unsigned int **a,int row,int c b = a^(-1)b */ -void solve_by_lu_mod(int **a,int n,int md,int **b,int l) +void solve_by_lu_mod(int **a,int n,int md,int **b,int l,int normalize) { unsigned int *y,*c; int i,j,k; @@ -1901,8 +1971,12 @@ void solve_by_lu_mod(int **a,int n,int md,int **b,int DMAR(t,a[i][i],0,md,c[i]) } /* copy c to b[.][k] with normalization */ - for ( i = 0; i < n; i++ ) - b[i][k] = (int)(c[i]>m2 ? c[i]-md : c[i]); + if ( normalize ) + for ( i = 0; i < n; i++ ) + b[i][k] = (int)(c[i]>m2 ? c[i]-md : c[i]); + else + for ( i = 0; i < n; i++ ) + b[i][k] = c[i]; } } @@ -2913,4 +2987,12 @@ void printimat(int **mat,int row,int col) } printf("\n"); } +} + +void Pnd_det(NODE arg,P *rp) +{ + if ( argc(arg) == 1 ) + nd_det(0,ARG0(arg),rp); + else + nd_det(QTOS((Q)ARG1(arg)),ARG0(arg),rp); }