=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.25 retrieving revision 1.28 diff -u -p -r1.25 -r1.28 --- OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/10 05:55:14 1.25 +++ 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.24 2001/09/07 08:54:57 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)) @@ -142,7 +150,9 @@ 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; @@ -182,7 +192,7 @@ int doing_f4; NODE TraceList; NODE AllTraceList; -int eqdl(nv,dl1,dl2) +INLINE int eqdl(nv,dl1,dl2) int nv; DL dl1,dl2; { @@ -232,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 = (CMP)MALLOC(sizeof(struct oCMP)*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++ ); @@ -255,7 +265,7 @@ CDP *rp; if ( a[i] ) nz++; *rp = r = (CDP)MALLOC(sizeof(struct oCDP)); r->len = nz; - r->body = (CMP)MALLOC(sizeof(struct oCMP)*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; @@ -296,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; { @@ -486,7 +546,7 @@ LIST f,v; 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; @@ -498,13 +558,17 @@ LIST *rp; 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)); @@ -519,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; @@ -532,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 ) { @@ -543,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)); } @@ -678,7 +746,8 @@ 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; @@ -713,47 +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 reduction */ #if 0 for ( s = s0, nred = 0; s; s = NEXT(s) ) { - for ( j = psn-1; j >= 0; j-- ) - if ( _dl_redble(BDY(ps[j])->dl,BDY(s),nv) ) - break; - if ( j >= 0 ) { - dltod(BDY(s),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; - 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) ) { - 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 ( 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 - fprintf(stderr,"\n"); - get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); @@ -767,12 +849,15 @@ 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;