=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v retrieving revision 1.1.1.1 retrieving revision 1.4 diff -u -p -r1.1.1.1 -r1.4 --- OpenXM_contrib2/asir2000/engine/dist.c 1999/12/03 07:39:08 1.1.1.1 +++ OpenXM_contrib2/asir2000/engine/dist.c 2000/04/25 04:07:59 1.4 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM/src/asir99/engine/dist.c,v 1.1.1.1 1999/11/10 08:12:26 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.3 2000/04/13 06:01:02 noro Exp $ */ #include "ca.h" #define NV(p) ((p)->nv) @@ -18,6 +18,14 @@ int (*cmpdl)()=cmpdl_revgradlex; int (*primitive_cmpdl[3])() = {cmpdl_revgradlex,cmpdl_gradlex,cmpdl_lex}; +void comm_muld(VL,DP,DP,DP *); +void weyl_muld(VL,DP,DP,DP *); +void weyl_muldm(VL,DP,MP,DP *); +void weyl_mulmm(VL,MP,MP,int,DP *); +void mkwc(int,int,Q *); + +int do_weyl; + int dp_nelim,dp_fcoeffs; struct order_spec dp_current_spec; int *dp_dl_work; @@ -130,7 +138,7 @@ DP *pr; ptod(vl,dvl,COEF(dc),&t); NEWDL(d,n); d->td = QTOS(DEG(dc)); d->d[i] = d->td; NEWMP(m); m->dl = d; C(m) = (P)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td; - muld(vl,t,u,&r); addd(vl,r,s,&t); s = t; + comm_muld(vl,t,u,&r); addd(vl,r,s,&t); s = t; } *pr = s; } @@ -307,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; @@ -341,8 +402,20 @@ void muld(vl,p1,p2,pr) VL vl; DP p1,p2,*pr; { + if ( ! do_weyl ) + comm_muld(vl,p1,p2,pr); + else + weyl_muld(vl,p1,p2,pr); +} + +void comm_muld(vl,p1,p2,pr) +VL vl; +DP p1,p2,*pr; +{ MP m; DP s,t,u; + int i,l; + MP *w; if ( !p1 || !p2 ) *pr = 0; @@ -351,8 +424,12 @@ 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(p2), l = 0; m; m = NEXT(m), l++ ); + w = ALLOCA(l*sizeof(MP)); + 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; } *pr = s; } @@ -384,6 +461,110 @@ DP *pr; NEXT(mr) = 0; MKDP(NV(p),mr0,*pr); if ( *pr ) (*pr)->sugar = p->sugar + m0->dl->td; + } +} + +void weyl_muld(vl,p1,p2,pr) +VL vl; +DP p1,p2,*pr; +{ + MP m; + DP s,t,u; + int i,l; + MP *w; + + if ( !p1 || !p2 ) + *pr = 0; + else if ( OID(p1) <= O_P ) + muldc(vl,p2,(P)p1,pr); + else if ( OID(p2) <= O_P ) + muldc(vl,p1,(P)p2,pr); + else { + for ( m = BDY(p2), l = 0; m; m = NEXT(m), l++ ); + w = ALLOCA(l*sizeof(MP)); + 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; + } + *pr = s; + } +} + +void weyl_muldm(vl,p,m0,pr) +VL vl; +DP p; +MP m0; +DP *pr; +{ + DP r,t,t1; + MP m; + int n,l,i; + MP *w; + + if ( !p ) + *pr = 0; + else { + for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ ); + w = ALLOCA(l*sizeof(MP)); + 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; + } + if ( r ) + r->sugar = p->sugar + m0->dl->td; + *pr = r; + } +} + +/* m0 = x0^d0*x1^d1*... * dx0^d(n/2)*dx1^d(n/2+1)*... */ + +void weyl_mulmm(vl,m0,m1,n,pr) +VL vl; +MP m0,m1; +int n; +DP *pr; +{ + MP m,mr,mr0; + 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; + + if ( !m0 || !m1 ) + *pr = 0; + else { + c0 = C(m0); c1 = C(m1); + 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 ( 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); } }