=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v retrieving revision 1.2 retrieving revision 1.5 diff -u -p -r1.2 -r1.5 --- OpenXM_contrib2/asir2000/engine/dist.c 2000/04/05 08:32:17 1.2 +++ OpenXM_contrib2/asir2000/engine/dist.c 2000/05/29 08:54:46 1.5 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.4 2000/04/25 04:07:59 noro Exp $ */ #include "ca.h" #define NV(p) ((p)->nv) @@ -315,6 +315,59 @@ DP p1,p2,*pr; } } +/* + * destructive merge of two list + * + * p1, p2 : list of DL + * return : a merged list + */ + +NODE symb_merge(m1,m2,n) +NODE m1,m2; +int n; +{ + NODE top,prev,cur,m,t; + + if ( !m1 ) + return m2; + else if ( !m2 ) + return m1; + else { + switch ( (*cmpdl)(n,(DL)BDY(m1),(DL)BDY(m2)) ) { + case 0: + top = m1; m = NEXT(m2); + break; + case 1: + top = m1; m = m2; + break; + case -1: + top = m2; m = m1; + break; + } + prev = top; cur = NEXT(top); + /* BDY(prev) > BDY(m) always holds */ + while ( cur && m ) { + switch ( (*cmpdl)(n,(DL)BDY(cur),(DL)BDY(m)) ) { + case 0: + m = NEXT(m); + prev = cur; cur = NEXT(cur); + break; + case 1: + t = NEXT(cur); NEXT(cur) = m; m = t; + prev = cur; cur = NEXT(cur); + break; + case -1: + NEXT(prev) = m; m = cur; + prev = NEXT(prev); cur = NEXT(prev); + break; + } + } + if ( !cur ) + NEXT(prev) = m; + return top; + } +} + void subd(vl,p1,p2,pr) VL vl; DP p1,p2,*pr; @@ -361,6 +414,9 @@ DP p1,p2,*pr; { MP m; DP s,t,u; + int i,l,l1; + static MP *w; + static int wlen; if ( !p1 || !p2 ) *pr = 0; @@ -369,9 +425,23 @@ DP p1,p2,*pr; else if ( OID(p2) <= O_P ) muldc(vl,p1,(P)p2,pr); else { - for ( m = BDY(p2), s = 0; m; m = NEXT(m) ) { - muldm(vl,p1,m,&t); addd(vl,s,t,&u); s = u; + for ( m = BDY(p1), l1 = 0; m; m = NEXT(m), l1++ ); + for ( m = BDY(p2), l = 0; m; m = NEXT(m), l++ ); + if ( l1 < l ) { + t = p1; p1 = p2; p2 = t; + l = l1; } + if ( l > wlen ) { + if ( w ) GC_free(w); + w = (MP *)MALLOC(l*sizeof(MP)); + wlen = l; + } + for ( m = BDY(p2), i = 0; i < l; m = NEXT(m), i++ ) + w[i] = m; + for ( s = 0, i = l-1; i >= 0; i-- ) { + muldm(vl,p1,w[i],&t); addd(vl,s,t,&u); s = u; + } + bzero(w,l*sizeof(MP)); *pr = s; } } @@ -411,6 +481,9 @@ DP p1,p2,*pr; { MP m; DP s,t,u; + int i,l; + static MP *w; + static int wlen; if ( !p1 || !p2 ) *pr = 0; @@ -419,9 +492,18 @@ DP p1,p2,*pr; else if ( OID(p2) <= O_P ) muldc(vl,p1,(P)p2,pr); else { - for ( m = BDY(p2), s = 0; m; m = NEXT(m) ) { - weyl_muldm(vl,p1,m,&t); addd(vl,s,t,&u); s = u; + for ( m = BDY(p2), l = 0; m; m = NEXT(m), l++ ); + if ( l > wlen ) { + if ( w ) GC_free(w); + w = (MP *)MALLOC(l*sizeof(MP)); + wlen = l; } + for ( m = BDY(p2), i = 0; i < l; m = NEXT(m), i++ ) + w[i] = m; + for ( s = 0, i = l-1; i >= 0; i-- ) { + weyl_muldm(vl,p1,w[i],&t); addd(vl,s,t,&u); s = u; + } + bzero(w,l*sizeof(MP)); *pr = s; } } @@ -434,15 +516,26 @@ DP *pr; { DP r,t,t1; MP m; - int n; + int n,l,i; + static MP *w; + static int wlen; if ( !p ) *pr = 0; else { - for ( r = 0, m = BDY(p), n = NV(p); m; m = NEXT(m) ) { - weyl_mulmm(vl,m,m0,n,&t); + for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ ); + if ( l > wlen ) { + if ( w ) GC_free(w); + w = (MP *)MALLOC(l*sizeof(MP)); + wlen = l; + } + for ( m = BDY(p), i = 0; i < l; m = NEXT(m), i++ ) + w[i] = m; + for ( r = 0, i = l-1, n = NV(p); i >= 0; i-- ) { + weyl_mulmm(vl,w[i],m0,n,&t); addd(vl,r,t,&t1); r = t1; } + bzero(w,l*sizeof(MP)); if ( r ) r->sugar = p->sugar + m0->dl->td; *pr = r; @@ -461,8 +554,9 @@ DP *pr; DP r,t,t1; P c,c0,c1,cc; DL d,d0,d1; - int i,j,a,b,k,l,n2,s,min; - Q *tab; + int i,j,a,b,k,l,n2,s,min,h; + static Q *tab; + static int tablen; if ( !m0 || !m1 ) *pr = 0; @@ -471,29 +565,68 @@ DP *pr; mulp(vl,c0,c1,&c); d0 = m0->dl; d1 = m1->dl; n2 = n>>1; - for ( i = 0, r = (DP)ONE; i < n2; i++ ) { - a = d0->d[i]; b = d1->d[n2+i]; - k = d0->d[n2+i]; l = d1->d[i]; - /* compute xi^a*(Di^k*xi^l)*Di^b */ - min = MIN(k,l); - tab = (Q *)ALLOCA((min+1)*sizeof(Q)); - mkwc(k,l,tab); - for ( mr0 = 0, s = 0, j = 0; j <= min; j++ ) { - NEXTMP(mr0,mr); - NEWDL(d,n); - d->d[i] = l-j+a; d->d[n2+i] = k-j+b; - d->td = d->d[i]+d->d[n2+i]; /* XXX */ - s = MAX(s,d->td); /* XXX */ - mr->c = (P)tab[j]; - mr->dl = d; + if ( n & 1 ) { + /* homogenized computation; dx-xd=h^2 */ + /* offset of h-degree */ + NEWDL(d,n); d->d[n-1] = d0->d[n-1]+d1->d[n-1]; d->td = d->d[n-1]; + NEWMP(mr); mr->c = (P)ONE; mr->dl = d; + MKDP(n,mr,r); r->sugar = d->d[n-1]; + + for ( i = 0; i < n2; i++ ) { + a = d0->d[i]; b = d1->d[n2+i]; + k = d0->d[n2+i]; l = d1->d[i]; + /* degree of xi^a*(Di^k*xi^l)*Di^b */ + h = a+k+l+b; + /* compute xi^a*(Di^k*xi^l)*Di^b */ + min = MIN(k,l); + + if ( min+1 > tablen ) { + if ( tab ) GC_free(tab); + tab = (Q *)MALLOC((min+1)*sizeof(Q)); + tablen = min+1; + } + mkwc(k,l,tab); + for ( mr0 = 0, j = 0; j <= min; j++ ) { + NEXTMP(mr0,mr); + NEWDL(d,n); + d->d[i] = l-j+a; d->d[n2+i] = k-j+b; + d->td = h; + d->d[n-1] = h-(d->d[i]+d->d[n2+i]); + mr->c = (P)tab[j]; + mr->dl = d; + } + bzero(tab,(min+1)*sizeof(Q)); + if ( mr0 ) + NEXT(mr) = 0; + MKDP(n,mr0,t); + if ( t ) + t->sugar = h; + comm_muld(vl,r,t,&t1); r = t1; } - if ( mr0 ) - NEXT(mr) = 0; - MKDP(n,mr0,t); - if ( t ) - t->sugar = s; - comm_muld(vl,r,t,&t1); r = t1; - } + } else + for ( i = 0, r = (DP)ONE; i < n2; i++ ) { + a = d0->d[i]; b = d1->d[n2+i]; + k = d0->d[n2+i]; l = d1->d[i]; + /* compute xi^a*(Di^k*xi^l)*Di^b */ + min = MIN(k,l); + tab = (Q *)ALLOCA((min+1)*sizeof(Q)); + mkwc(k,l,tab); + for ( mr0 = 0, s = 0, j = 0; j <= min; j++ ) { + NEXTMP(mr0,mr); + NEWDL(d,n); + d->d[i] = l-j+a; d->d[n2+i] = k-j+b; + d->td = d->d[i]+d->d[n2+i]; /* XXX */ + s = MAX(s,d->td); /* XXX */ + mr->c = (P)tab[j]; + mr->dl = d; + } + if ( mr0 ) + NEXT(mr) = 0; + MKDP(n,mr0,t); + if ( t ) + t->sugar = s; + comm_muld(vl,r,t,&t1); r = t1; + } muldc(vl,r,c,pr); } }