=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.28 retrieving revision 1.31 diff -u -p -r1.28 -r1.31 --- OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/13 03:04:27 1.28 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/17 02:47:07 1.31 @@ -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/gr.c,v 1.27 2001/09/11 08:56:47 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.30 2001/09/17 01:18:34 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -93,6 +93,8 @@ extern int do_weyl; extern DP_Print; +void _tf_to_vect_compress(NODE,DL *,CDP *); +NODE mul_dllist(DL,DP); void dp_imul_d(DP,Q,DP *); void print_stat(void); void init_stat(void); @@ -150,9 +152,7 @@ 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; @@ -242,7 +242,7 @@ CDP *b; 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); + r->body = (CM)MALLOC_ATOMIC(sizeof(struct oCM)*len); for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) { for ( ; !eqdl(nv,m->dl,at[i]); i++ ); @@ -252,6 +252,41 @@ CDP *b; *b = r; } +/* [t,findex] -> tf -> compressed vector */ + +void _tf_to_vect_compress(tf,at,b) +NODE tf; +DL *at; +CDP *b; +{ + int i,j,k,nv,len; + DL t,s,d1; + DP f; + MP m; + CDP r; + + t = (DL)BDY(tf); + f = ps[(int)BDY(NEXT(tf))]; + + 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_ATOMIC(sizeof(struct oCM)*len); + + NEWDL(s,nv); + for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) { + d1 = m->dl; + s->td = t->td+d1->td; + for ( k = 0; k < nv; k++ ) + s->d[k] = t->d[k]+d1->d[k]; + for ( ; !eqdl(nv,s,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; @@ -306,54 +341,30 @@ 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) +NODE mul_dllist(d,f) +DL d; DP f; { MP m; - NODE n,n0; - DLBUCKET d,d0; - int td; + NODE mp,mp0; + DL t,d1; + int i,nv; 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; + nv = NV(f); + mp0 = 0; + for ( m = BDY(f); m; m = NEXT(m) ) { + NEXTNODE(mp0,mp); + NEWDL(t,nv); + d1 = m->dl; + t->td = d->td+d1->td; + for ( i = 0; i < nv; i++ ) + t->d[i] = d->d[i]+d1->d[i]; + BDY(mp) = (pointer)t; + } + NEXT(mp) = 0; + return mp0; } void pdl(f) @@ -746,12 +757,11 @@ int m; { int i,j,k,nh,row,col,nv; NODE r,g,gall; - NODE sb; - DLBUCKET s,s0,s1; + NODE s,s0; 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; + NODE blist,bt,nt,bt1,dt,rhtlist; DL *ht,*at,*st; int **spmat; CDP *redmat; @@ -782,111 +792,58 @@ int m; _dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp); if ( sp ) { MKNODE(bt,sp,blist); blist = bt; - s0 = symb_merge_bucket(s0,dp_dllist_bucket(sp),nv); -/* print_dlbucket(s0,nv); */ + s0 = symb_merge(s0,dp_dllist(sp),nv); } } /* s0 : all the terms appeared in symbolic reduction */ -#if 0 for ( s = s0, nred = 0; s; s = NEXT(s) ) { - 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++; - } + 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); + dt = mul_dllist(BDY(sd)->dl,ps[(int)BDY(r)]); + /* list of [t,f] */ + bt1 = mknode(2,BDY(sd)->dl,BDY(r)); + MKNODE(bt,bt1,blist); blist = bt; + symb_merge(s,dt,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); /* the first nred polys in blist are reducers */ /* row = the number of all the polys */ for ( r = blist, row = 0; r; r = NEXT(r), row++ ); - /* head terms of reducers */ - ht = (DL *)MALLOC(nred*sizeof(DL)); - for ( r = blist, i = 0; i < nred; r = NEXT(r), i++ ) - ht[i] = BDY((DP)BDY(r))->dl; - /* col = number of all terms */ - for ( s = s0, col = 0; s; s = NEXT(s) ) - for ( sb = BDY(s); sb; sb = NEXT(sb) ) - col++; + for ( s = s0, col = 0; s; s = NEXT(s), col++ ); /* head terms of all terms */ at = (DL *)MALLOC(col*sizeof(DL)); - for ( s = s0, i = 0; i < col; s = NEXT(s) ) - for ( sb = BDY(s); sb; sb = NEXT(sb), i++ ) - at[i] = (DL)BDY(sb); + for ( s = s0, i = 0; i < col; s = NEXT(s), i++ ) + at[i] = (DL)BDY(s); /* store coefficients separately in spmat and redmat */ nsp = row-nred; /* reducer matrix */ /* 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_compress(BDY(r),at,&redmat[i]); + _tf_to_vect_compress(BDY(r),at,&redmat[i]); /* XXX */ /* reduce_reducers_mod(redmat,nred,col,m); */ /* register the position of the head term */ - indred = (int *)MALLOC(nred*sizeof(int)); + indred = (int *)MALLOC_ATOMIC(nred*sizeof(int)); bzero(indred,nred*sizeof(int)); - isred = (int *)MALLOC(col*sizeof(int)); + isred = (int *)MALLOC_ATOMIC(col*sizeof(int)); bzero(isred,col*sizeof(int)); for ( i = 0; i < nred; i++ ) { ri = redmat[i]; indred[i] = ri->body[0].index; isred[indred[i]] = 1; } -#endif spcol = col-nred; /* head terms not in ht */ @@ -894,11 +851,13 @@ int m; for ( j = 0, k = 0; j < col; j++ ) if ( !isred[j] ) st[k++] = at[j]; + get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); + init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); get_eg(&tmp1); /* spoly matrix; stored in reduced form; terms in ht[] are omitted */ spmat = (int **)MALLOC(nsp*sizeof(int *)); - w = (int *)MALLOC(col*sizeof(int)); + w = (int *)MALLOC_ATOMIC(col*sizeof(int)); /* skip reducers in blist */ for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ); @@ -921,6 +880,12 @@ int m; /* update nsp */ nsp = i; + /* XXX free redmat explicitly */ + for ( k = 0; k < nred; k++ ) { + GC_free(BDY(redmat[k])); + GC_free(redmat[k]); + } + get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0); init_eg(&eg_split_elim1); add_eg(&eg_split_elim1,&tmp1,&tmp0); @@ -968,6 +933,11 @@ int m; gall = append_one(gall,nh); i++; } + + /* XXX free spmat[] explicitly */ + for ( j = 0; j < nsp; j++ ) { + GC_free(spmat[j]); + } } if ( DP_Print ) { print_eg("Symb",&eg_symb);