=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/distm.c,v retrieving revision 1.9 retrieving revision 1.19 diff -u -p -r1.9 -r1.19 --- OpenXM_contrib2/asir2000/engine/distm.c 2001/10/09 01:36:11 1.9 +++ OpenXM_contrib2/asir2000/engine/distm.c 2012/12/17 07:20:44 1.19 @@ -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/engine/distm.c,v 1.8 2000/12/05 08:29:44 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/distm.c,v 1.18 2003/12/26 02:38:10 noro Exp $ */ #include "ca.h" #include "inline.h" @@ -91,7 +91,8 @@ void mptomd(VL vl,int mod,VL dvl,P p,DP *pr) } else { for ( dc = DC(p), s = 0; dc; dc = NEXT(dc) ) { mptomd(vl,mod,dvl,COEF(dc),&t); - NEWDL(d,n); d->td = QTOS(DEG(dc)); d->d[i] = d->td; + NEWDL(d,n); d->d[i] = QTOS(DEG(dc)); + d->td = MUL_WEIGHT(d->d[i],i); NEWMP(m); m->dl = d; C(m) = (P)ONEM; NEXT(m) = 0; MKDP(n,m,u); comm_mulmd(vl,mod,t,u,&r); addmd(vl,mod,r,s,&t); s = t; } @@ -101,6 +102,42 @@ void mptomd(VL vl,int mod,VL dvl,P p,DP *pr) } } +void mdtodp(DP p,DP *pr) +{ + MP m,mr0,mr; + + if ( !p ) + *pr = 0; + else { + for ( m = BDY(p), mr0 = 0; m; m = NEXT(m) ) { + NEXTMP(mr0,mr); mr->dl = m->dl; + mptop(C(m),&C(mr)); + } + NEXT(mr) = 0; + MKDP(NV(p),mr0,*pr); + (*pr)->sugar = p->sugar; + } +} + +void _mdtodp(DP p,DP *pr) +{ + MP m,mr0,mr; + int i; + Q q; + + if ( !p ) + *pr = 0; + else { + for ( m = BDY(p), mr0 = 0; m; m = NEXT(m) ) { + NEXTMP(mr0,mr); mr->dl = m->dl; + i = ITOS(m->c); STOQ(i,q); C(mr) = (P)q; + } + NEXT(mr) = 0; + MKDP(NV(p),mr0,*pr); + (*pr)->sugar = p->sugar; + } +} + void mdtop(VL vl,int mod,VL dvl,DP p,P *pr) { int n,i; @@ -240,7 +277,7 @@ void comm_mulmd(VL vl,int mod,DP p1,DP p2,DP *pr) l = l1; } if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -271,7 +308,7 @@ void weyl_mulmd(VL vl,int mod,DP p1,DP p2,DP *pr) else { for ( m = BDY(p2), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -325,7 +362,7 @@ void weyl_mulmdm(VL vl,int mod,DP p,MP m0,DP *pr) else { for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -374,13 +411,17 @@ void weyl_mulmmm(VL vl,int mod,MP m0,MP m1,int n,DP *p 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 */ - s = a+k+l+b; + a += l; + b += k; + s = MUL_WEIGHT(a,i)+MUL_WEIGHT(b,n2+i); + /* compute xi^a*(Di^k*xi^l)*Di^b */ min = MIN(k,l); if ( min+1 > tablen ) { - if ( tab ) GC_free(tab); + if ( tab ) GCFREE(tab); tab = (int *)MALLOC((min+1)*sizeof(int)); tablen = min+1; } @@ -388,16 +429,16 @@ void weyl_mulmmm(VL vl,int mod,MP m0,MP m1,int n,DP *p if ( n & 1 ) 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->d[i] = a-j; d->d[n2+i] = b-j; d->td = s; - d->d[n-1] = s-(d->d[i]+d->d[n2+i]); + d->d[n-1] = s-(MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i)); STOMQ(tab[j],mq); mr->c = (P)mq; mr->dl = d; } else 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 */ + d->d[i] = a-j; d->d[n2+i] = b-j; + d->td = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i); /* XXX */ s = MAX(s,d->td); /* XXX */ STOMQ(tab[j],mq); mr->c = (P)mq; mr->dl = d; } @@ -622,7 +663,7 @@ void comm_mulmd_dup(int mod,DP p1,DP p2,DP *pr) l = l1; } if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -649,7 +690,7 @@ void weyl_mulmd_dup(int mod,DP p1,DP p2,DP *pr) else { for ( m = BDY(p1), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -705,7 +746,7 @@ void weyl_mulmdm_dup(int mod,MP m0,DP p,DP *pr) else { for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ ); if ( l > wlen ) { - if ( w ) GC_free(w); + if ( w ) GCFREE(w); w = (MP *)MALLOC(l*sizeof(MP)); wlen = l; } @@ -717,8 +758,8 @@ void weyl_mulmdm_dup(int mod,MP m0,DP p,DP *pr) for ( i = 0, tlen = 1; i < n2; i++ ) tlen *= d0->d[n2+i]+1; if ( tlen > rtlen ) { - if ( tab ) GC_free(tab); - if ( psum ) GC_free(psum); + if ( tab ) GCFREE(tab); + if ( psum ) GCFREE(psum); rtlen = tlen; tab = (struct cdlm *)MALLOC(rtlen*sizeof(struct cdlm)); psum = (MP *)MALLOC(rtlen*sizeof(MP)); @@ -780,7 +821,7 @@ void weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct rtab[0].d = d; if ( rtablen > tmptablen ) { - if ( tmptab ) GC_free(tmptab); + if ( tmptab ) GCFREE(tmptab); tmptab = (struct cdlm *)MALLOC(rtablen*sizeof(struct cdlm)); tmptablen = rtablen; } @@ -788,10 +829,13 @@ void weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct 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 */ + a += l; + b += k; + s = MUL_WEIGHT(a,i)+MUL_WEIGHT(b,n2+i); + if ( !k || !l ) { - a += l; - b += k; - s = a+b; for ( j = 0, p = rtab; j < curlen; j++, p++ ) { if ( p->c ) { dt = p->d; @@ -804,14 +848,12 @@ void weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct continue; } if ( k+1 > tablen ) { - if ( tab ) GC_free(tab); - if ( ctab ) GC_free(ctab); + if ( tab ) GCFREE(tab); + if ( ctab ) GCFREE(ctab); tablen = k+1; tab = (struct cdlm *)MALLOC(tablen*sizeof(struct cdlm)); ctab = (int *)MALLOC(tablen*sizeof(int)); } - /* degree of xi^a*(Di^k*xi^l)*Di^b */ - s = a+k+l+b; /* compute xi^a*(Di^k*xi^l)*Di^b */ min = MIN(k,l); mkwcm(k,l,mod,ctab); @@ -820,17 +862,17 @@ void weyl_mulmmm_dup(int mod,MP m0,MP m1,int n,struct if ( n & 1 ) for ( j = 0; j <= min; j++ ) { NEWDL(d,n); - d->d[i] = l-j+a; d->d[n2+i] = k-j+b; + d->d[i] = a-j; d->d[n2+i] = b-j; d->td = s; - d->d[n-1] = s-(d->d[i]+d->d[n2+i]); + d->d[n-1] = s-(MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i)); tab[j].d = d; tab[j].c = ctab[j]; } else for ( j = 0; j <= min; j++ ) { 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 */ + d->d[i] = a-j; d->d[n2+i] = b-j; + d->td = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i); /* XXX */ tab[j].d = d; tab[j].c = ctab[j]; }