=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.21 retrieving revision 1.28 diff -u -p -r1.21 -r1.28 --- OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/04 08:48:19 1.21 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/13 03:04:27 1.28 @@ -45,13 +45,21 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.20 2001/07/23 05:03:22 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.27 2001/09/11 08:56:47 noro Exp $ */ #include "ca.h" #include "parse.h" #include "base.h" #include "ox.h" +#if defined(__GNUC__) +#define INLINE inline +#elif defined(VISUAL) +#define INLINE __inline +#else +#define INLINE +#endif + #define ITOS(p) (((unsigned int)(p))&0x7fffffff) #define STOI(i) ((P)((unsigned int)(i)|0x80000000)) @@ -136,13 +144,15 @@ void printdl(DL); int DPPlength(DP_pairs); void dp_gr_mod_main(LIST,LIST,Num,int,struct order_spec *,LIST *); void dp_gr_main(LIST,LIST,Num,int,int,struct order_spec *,LIST *); -void dp_f4_main(LIST,LIST,int,struct order_spec *,LIST *); +void dp_f4_main(LIST,LIST,struct order_spec *,LIST *); void dp_f4_mod_main(LIST,LIST,int,struct order_spec *,LIST *); double get_rtime(); void _dpmod_to_vect(DP,DL *,int *); void dp_to_vect(DP,DL *,Q *); NODE dp_dllist(DP f); +DLBUCKET dp_dllist_bucket(DP f); NODE symb_merge(NODE,NODE,int),_symb_merge(NODE,NODE,int); +DLBUCKET symb_merge_bucket(DLBUCKET,DLBUCKET,int); extern int dp_nelim; extern int dp_fcoeffs; static DP *ps,*psm; @@ -180,8 +190,9 @@ static int PtozpRA = 0; int doing_f4; NODE TraceList; +NODE AllTraceList; -int eqdl(nv,dl1,dl2) +INLINE int eqdl(nv,dl1,dl2) int nv; DL dl1,dl2; { @@ -216,6 +227,54 @@ int *b; } } +/* create compressed poly */ + +void _dpmod_to_vect_compress(f,at,b) +DP f; +DL *at; +CDP *b; +{ + int i,j,nv,len; + MP m; + CDP r; + + nv = f->nv; + for ( m = BDY(f), len = 0; m; m = NEXT(m), len++ ); + r = (CDP)MALLOC(sizeof(struct oCDP)); + r->len = len; + r->body = (CM)MALLOC(sizeof(struct oCM)*len); + + for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) { + for ( ; !eqdl(nv,m->dl,at[i]); i++ ); + r->body[j].index = i; + r->body[j].c = ITOS(m->c); + } + *b = r; +} + +/* dense vector -> CDP */ +void compress_vect(a,n,rp) +int *a; +int n; +CDP *rp; +{ + int i,j,nz; + CDP r; + + for ( i = 0, nz = 0; i < n; i++ ) + if ( a[i] ) nz++; + *rp = r = (CDP)MALLOC(sizeof(struct oCDP)); + r->len = nz; + r->body = (CM)MALLOC(sizeof(struct oCM)*nz); + for ( i = 0, j = 0; i < n; i++ ) { + if ( a[i] ) { + r->body[j].index = i; + r->body[j].c = ITOS(a[i]); + j++; + } + } +} + void dp_to_vect(f,at,b) DP f; DL *at; @@ -247,6 +306,56 @@ DP f; return mp0; } +void print_dlbucket(d,nv) +DLBUCKET d; +int nv; +{ + int i; + NODE n; + + for ( ; d; d = NEXT(d) ) { + fprintf(stderr,"td = %d\n",d->td); + for ( n = BDY(d); n; n = NEXT(n) ) { + fprintf(stderr,"<"); + for ( i = 0; i < nv; i++ ) { + fprintf(stderr,"%d",((DL)BDY(n))->d[i]); + if ( i != nv-1 ) + fprintf(stderr," "); + } + fprintf(stderr,">"); + } + fprintf(stderr,"\n"); + } +} + +DLBUCKET dp_dllist_bucket(f) +DP f; +{ + MP m; + NODE n,n0; + DLBUCKET d,d0; + int td; + + if ( !f ) + return 0; + d0 = 0; + m = BDY(f); + do { + NEXTDLBUCKET(d0,d); + n0 = 0; + d->td = td = m->dl->td; + do { + NEXTNODE(n0,n); + BDY(n) = (pointer)m->dl; + m = NEXT(m); + } while ( m && m->dl->td == td ); + NEXT(n) = 0; + BDY(d) = n0; + } while ( m ); + NEXT(d) = 0; + return d0; +} + void pdl(f) NODE f; { @@ -266,8 +375,11 @@ LIST *rp; { int i,mindex,m,nochk; struct order_spec ord1; + Q q; VL fv,vv,vc; NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx; + NODE ind,ind0; + LIST trace,gbindex; mindex = 0; nochk = 0; dp_fcoeffs = field; get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc); @@ -333,12 +445,27 @@ LIST *rp; pss[i] = 0; psh[i] = 0; psc[i] = 0; ps[i] = 0; } } - for ( r0 = 0; x; x = NEXT(x) ) { + for ( r0 = 0, ind0 = 0; x; x = NEXT(x) ) { NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]); dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r)); + NEXTNODE(ind0,ind); + STOQ((int)BDY(x),q); BDY(ind) = q; } if ( r0 ) NEXT(r) = 0; + if ( ind0 ) NEXT(ind) = 0; MKLIST(*rp,r0); + MKLIST(gbindex,ind0); + + if ( GenTrace && OXCheck < 0 ) { + + x = AllTraceList; + for ( r = 0; x; x = NEXT(x) ) { + MKNODE(r0,BDY(x),r); r = r0; + } + MKLIST(trace,r); + r0 = mknode(3,*rp,gbindex,trace); + MKLIST(*rp,r0); + } print_stat(); if ( ShowMag ) fprintf(asir_out,"\nMax_mag=%d\n",Max_mag); @@ -414,31 +541,34 @@ extern struct oEGT eg_red_mod; MKLIST(*rp,r0); } -void dp_f4_main(f,v,field,ord,rp) +void dp_f4_main(f,v,ord,rp) LIST f,v; -int field; struct order_spec *ord; LIST *rp; { - int i,mindex,m,nochk; + int i,mindex,m,nochk,homogen; struct order_spec ord1; VL fv,vv,vc; NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx; - dp_fcoeffs = field; + dp_fcoeffs = 0; get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc); NVars = length((NODE)vv); PCoeffs = vc ? 1 : 0; VC = vc; CNVars = NVars; if ( ord->id && NVars != ord->nv ) error("dp_f4_main : invalid order specification"); initd(ord); - for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { + for ( fd0 = 0, t = BDY(f), homogen = 1; t; t = NEXT(t) ) { NEXTNODE(fd0,fd); ptod(CO,vv,(P)BDY(t),(DP *)&BDY(fd)); + if ( homogen ) + homogen = dp_homogeneous(BDY(fd)); } if ( fd0 ) NEXT(fd) = 0; setup_arrays(fd0,0,&s); x = gb_f4(s); - reduceall(x,&xx); x = xx; + if ( !homogen ) { + reduceall(x,&xx); x = xx; + } for ( r0 = 0; x; x = NEXT(x) ) { NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]); dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r)); @@ -453,7 +583,7 @@ int m; struct order_spec *ord; LIST *rp; { - int i; + int i,homogen; struct order_spec ord1; VL fv,vv,vc; DP b,c,c1; @@ -466,8 +596,10 @@ LIST *rp; if ( ord->id && NVars != ord->nv ) error("dp_f4_mod_main : invalid order specification"); initd(ord); - for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { + for ( fd0 = 0, t = BDY(f), homogen = 1; t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&b); + if ( homogen ) + homogen = dp_homogeneous(b); _dp_mod(b,m,0,&c); _dp_monic(c,m,&c1); if ( c ) { @@ -477,7 +609,9 @@ LIST *rp; if ( fd0 ) NEXT(fd) = 0; setup_arrays(fd0,m,&s); x = gb_f4_mod(s,m); - reduceall_mod(x,m,&xx); x = xx; + if ( !homogen ) { + reduceall_mod(x,m,&xx); x = xx; + } for ( r0 = 0; x; x = NEXT(x) ) { NEXTNODE(r0,r); _dtop_mod(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r)); } @@ -612,16 +746,19 @@ int m; { int i,j,k,nh,row,col,nv; NODE r,g,gall; - NODE s,s0; + NODE sb; + DLBUCKET s,s0,s1; DP_pairs d,dm,dr,t; DP h,nf,f1,f2,f21,f21r,sp,sp1,sd,sdm,tdp; MP mp,mp0; NODE blist,bt,nt; DL *ht,*at,*st; - int **spmat,**redmat; - int *colstat,*w; + int **spmat; + CDP *redmat; + int *colstat,*w,*w1; int rank,nred,nsp,nonzero,spcol; - int *indred,*isred,*ri; + int *indred,*isred; + CDP ri; struct oEGT tmp0,tmp1,tmp2,eg_split_symb,eg_split_elim1,eg_split_elim2; extern struct oEGT eg_symb,eg_elim1,eg_elim2; @@ -645,25 +782,60 @@ int m; _dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp); if ( sp ) { MKNODE(bt,sp,blist); blist = bt; - s0 = symb_merge(s0,dp_dllist(sp),nv); + s0 = symb_merge_bucket(s0,dp_dllist_bucket(sp),nv); +/* print_dlbucket(s0,nv); */ } } - /* s0 : all the terms appeared in symbolic redunction */ + /* s0 : all the terms appeared in symbolic reduction */ +#if 0 for ( s = s0, nred = 0; s; s = NEXT(s) ) { - for ( r = gall; r; r = NEXT(r) ) - if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(s),nv) ) - break; - if ( r ) { - dltod(BDY(s),nv,&tdp); - dp_subd(tdp,ps[(int)BDY(r)],&sd); - _dp_mod(sd,m,0,&sdm); - mulmd_dup(m,sdm,ps[(int)BDY(r)],&f2); - MKNODE(bt,f2,blist); blist = bt; - s = symb_merge(s,dp_dllist(f2),nv); - nred++; + sb = BDY(s); + for ( ; sb; sb = NEXT(sb) ) { + for ( j = psn-1; j >= 0; j-- ) + if ( _dl_redble(BDY(ps[j])->dl,BDY(sb),nv) ) + break; + if ( j >= 0 ) { + dltod(BDY(sb),nv,&tdp); + dp_subd(tdp,ps[j],&sd); + for ( k = 0, i = 0; k < nv; k++ ) + if ( BDY(sd)->dl->d[k] ) + i++; + fprintf(stderr,"%c ",i<=1 ? 'o' : 'x'); + _dp_mod(sd,m,0,&sdm); + mulmd_dup(m,sdm,ps[j],&f2); + MKNODE(bt,f2,blist); blist = bt; + /* merge the highest degree part into sb */ + s1 = dp_dllist_bucket(f2); + symb_merge(sb,BDY(s1),nv); + /* merge the rest into s */ + symb_merge_bucket(s,NEXT(s1),nv); + nred++; + } } } - +#else + for ( s = s0, nred = 0; s; s = NEXT(s) ) { + sb = BDY(s); + for ( ; sb; sb = NEXT(sb) ) { + for ( r = gall; r; r = NEXT(r) ) + if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(sb),nv) ) + break; + if ( r ) { + dltod(BDY(sb),nv,&tdp); + dp_subd(tdp,ps[(int)BDY(r)],&sd); + _dp_mod(sd,m,0,&sdm); + mulmd_dup(m,sdm,ps[(int)BDY(r)],&f2); + MKNODE(bt,f2,blist); blist = bt; + /* merge the highest degree part into sb */ + s1 = dp_dllist_bucket(f2); + symb_merge(sb,BDY(s1),nv); + /* merge the rest into s */ + symb_merge_bucket(s,NEXT(s1),nv); + nred++; + } + } + } +#endif get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); @@ -677,20 +849,31 @@ int m; ht[i] = BDY((DP)BDY(r))->dl; /* col = number of all terms */ - for ( s = s0, col = 0; s; s = NEXT(s), col++ ); + for ( s = s0, col = 0; s; s = NEXT(s) ) + for ( sb = BDY(s); sb; sb = NEXT(sb) ) + col++; /* head terms of all terms */ at = (DL *)MALLOC(col*sizeof(DL)); - for ( s = s0, i = 0; i < col; s = NEXT(s), i++ ) - at[i] = (DL)BDY(s); + for ( s = s0, i = 0; i < col; s = NEXT(s) ) + for ( sb = BDY(s); sb; sb = NEXT(sb), i++ ) + at[i] = (DL)BDY(sb); /* store coefficients separately in spmat and redmat */ nsp = row-nred; /* reducer matrix */ - redmat = (int **)almat(nred,col); + /* indred : register the position of the head term */ +#if 0 + reduce_reducers_mod_compress(blist,nred,at,col,m,&redmat,&indred); + isred = (int *)MALLOC(col*sizeof(int)); + bzero(isred,col*sizeof(int)); + for ( i = 0; i < nred; i++ ) + isred[indred[i]] = 1; +#else + redmat = (CDP *)MALLOC(nred*sizeof(CDP)); for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ) - _dpmod_to_vect(BDY(r),at,redmat[i]); + _dpmod_to_vect_compress(BDY(r),at,&redmat[i]); /* XXX */ /* reduce_reducers_mod(redmat,nred,col,m); */ /* register the position of the head term */ @@ -700,10 +883,10 @@ int m; bzero(isred,col*sizeof(int)); for ( i = 0; i < nred; i++ ) { ri = redmat[i]; - for ( j = 0; j < col && !ri[j]; j++ ); - indred[i] = j; - isred[j] = 1; + indred[i] = ri->body[0].index; + isred[indred[i]] = 1; } +#endif spcol = col-nred; /* head terms not in ht */ @@ -712,22 +895,37 @@ int m; if ( !isred[j] ) st[k++] = at[j]; + get_eg(&tmp1); /* spoly matrix; stored in reduced form; terms in ht[] are omitted */ - spmat = almat(nsp,spcol); + spmat = (int **)MALLOC(nsp*sizeof(int *)); w = (int *)MALLOC(col*sizeof(int)); - for ( ; i < row; r = NEXT(r), i++ ) { + + /* skip reducers in blist */ + for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ); + for ( i = 0; r; r = NEXT(r) ) { bzero(w,col*sizeof(int)); _dpmod_to_vect(BDY(r),at,w); - reduce_sp_by_red_mod(w,redmat,indred,nred,col,m); - for ( j = 0, k = 0; j < col; j++ ) - if ( !isred[j] ) - spmat[i-nred][k++] = w[j]; + reduce_sp_by_red_mod_compress(w,redmat,indred,nred,col,m); + for ( j = 0; j < col; j++ ) + if ( w[j] ) + break; + if ( j < col ) { + w1 = (int *)MALLOC_ATOMIC(spcol*sizeof(int)); + for ( j = 0, k = 0; j < col; j++ ) + if ( !isred[j] ) + w1[k++] = w[j]; + spmat[i] = w1; + i++; + } } + /* update nsp */ + nsp = i; get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0); init_eg(&eg_split_elim1); add_eg(&eg_split_elim1,&tmp1,&tmp0); colstat = (int *)MALLOC_ATOMIC(spcol*sizeof(int)); + bzero(colstat,spcol*sizeof(int)); for ( i = 0, nonzero=0; i < nsp; i++ ) for ( j = 0; j < spcol; j++ ) if ( spmat[i][j] ) @@ -749,6 +947,10 @@ int m; print_eg("Elim2",&eg_split_elim2); fprintf(asir_out,"\n"); } + + if ( !rank ) + continue; + for ( j = 0, i = 0; j < spcol; j++ ) if ( colstat[j] ) { mp0 = 0; @@ -921,18 +1123,28 @@ int m; pss[i] = ps[i]->sugar; psc[i] = BDY(ps[i])->c; } - if ( GenTrace && (OXCheck >= 0) ) { + if ( GenTrace ) { Q q; STRING fname; LIST input; - NODE arg; + NODE arg,t,t1; Obj dmy; + + t = 0; + for ( i = psn-1; i >= 0; i-- ) { + MKNODE(t1,ps[i],t); + t = t1; + } + MKLIST(input,t); - STOQ(OXCheck,q); - MKSTR(fname,"register_input"); - MKLIST(input,f0); - arg = mknode(3,q,fname,input); - Pox_cmo_rpc(arg,&dmy); + if ( OXCheck >= 0 ) { + STOQ(OXCheck,q); + MKSTR(fname,"register_input"); + arg = mknode(3,q,fname,input); + Pox_cmo_rpc(arg,&dmy); + } else if ( OXCheck < 0 ) { + MKNODE(AllTraceList,input,0); + } } for ( s0 = 0, i = 0; i < psn; i++ ) { NEXTNODE(s0,s); BDY(s) = (pointer)i; @@ -960,6 +1172,8 @@ int m; else dp_ptozp(f,r); if ( GenTrace && TraceList ) { + /* adust the denominator according to the final + content reduction */ divsp(CO,BDY(f)->c,BDY(*r)->c,&d); mulp(CO,(P)ARG3(BDY((LIST)BDY(TraceList))),d,&t); ARG3(BDY((LIST)BDY(TraceList))) = t; @@ -1167,7 +1381,11 @@ NODE subst; _dp_mod(a,m,subst,&psm[psn]); if ( GenTrace ) { NODE tn,tr,tr1; - LIST trace; + LIST trace,trace1; + NODE arg; + Q q1,q2; + STRING fname; + Obj dmy; /* reverse the TraceList */ tn = TraceList; @@ -1176,16 +1394,17 @@ NODE subst; } MKLIST(trace,tr); if ( OXCheck >= 0 ) { - NODE arg; - Q q1,q2; - STRING fname; - Obj dmy; - STOQ(OXCheck,q1); MKSTR(fname,"check_trace"); STOQ(psn,q2); arg = mknode(5,q1,fname,a,q2,trace); Pox_cmo_rpc(arg,&dmy); + } else if ( OXCheck < 0 ) { + STOQ(psn,q1); + tn = mknode(2,q1,trace); + MKLIST(trace1,tn); + MKNODE(tr,trace1,AllTraceList); + AllTraceList = tr; } else dp_save(psn,(Obj)trace,"t"); TraceList = 0;