=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/distm.c,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/asir2000/engine/distm.c 2000/05/29 08:54:46 1.2 +++ OpenXM_contrib2/asir2000/engine/distm.c 2000/08/22 05:04:05 1.6 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/distm.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * 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.5 2000/08/21 08:31:27 noro Exp $ +*/ #include "ca.h" #include "inline.h" @@ -366,7 +414,7 @@ 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,h; + int i,j,a,b,k,l,n2,s,min; static int *tab; static int tablen; @@ -380,71 +428,50 @@ DP *pr; 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)ONEM; mr->dl = d; - MKDP(n,mr,r); r->sugar = d->d[n-1]; + NEWDL(d,n); + d->td = d->d[n-1] = d0->d[n-1]+d1->d[n-1]; + NEWMP(mr); mr->c = (P)ONEM; mr->dl = d; NEXT(mr) = 0; + MKDP(n,mr,r); r->sugar = d->td; + } else + r = (DP)ONEM; + 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; + /* compute xi^a*(Di^k*xi^l)*Di^b */ + min = MIN(k,l); - 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 = (int *)MALLOC((min+1)*sizeof(int)); - tablen = min+1; - } - mkwcm(k,l,mod,tab); + if ( min+1 > tablen ) { + if ( tab ) GC_free(tab); + tab = (int *)MALLOC((min+1)*sizeof(int)); + tablen = min+1; + } + mkwcm(k,l,mod,tab); + if ( n & 1 ) for ( mr0 = 0, j = 0; j <= min; j++ ) { - NEXTMP(mr0,mr); - NEWDL(d,n); + 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]); - STOMQ(tab[j],mq); mr->c = (P)mq; - mr->dl = d; + d->td = s; + d->d[n-1] = s-(d->d[i]+d->d[n2+i]); + STOMQ(tab[j],mq); mr->c = (P)mq; mr->dl = d; } - bzero(tab,(min+1)*sizeof(int)); - if ( mr0 ) - NEXT(mr) = 0; - MKDP(n,mr0,t); - if ( t ) - t->sugar = h; - comm_mulmd(vl,mod,r,t,&t1); r = t1; - } - } else - for ( i = 0, r = (DP)ONEM; 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); - - if ( min+1 > tablen ) { - if ( tab ) GC_free(tab); - tab = (int *)MALLOC((min+1)*sizeof(int)); - tablen = min+1; - } - mkwcm(k,l,mod,tab); + else for ( mr0 = 0, s = 0, j = 0; j <= min; j++ ) { - NEXTMP(mr0,mr); - NEWDL(d,n); + 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 */ - STOMQ(tab[j],mq); mr->c = (P)mq; - mr->dl = d; + STOMQ(tab[j],mq); mr->c = (P)mq; mr->dl = d; } - bzero(tab,(min+1)*sizeof(int)); - if ( mr0 ) - NEXT(mr) = 0; - MKDP(n,mr0,t); - if ( t ) - t->sugar = s; - comm_mulmd(vl,mod,r,t,&t1); r = t1; - } + bzero(tab,(min+1)*sizeof(int)); + if ( mr0 ) + NEXT(mr) = 0; + MKDP(n,mr0,t); + if ( t ) + t->sugar = s; + comm_mulmd(vl,mod,r,t,&t1); r = t1; + } mulmdc(vl,mod,r,c,pr); } } @@ -501,8 +528,6 @@ DP *pr; } } -#define MKDPM(n,m,d) (NEWDP(d),(d)->nv=(n),BDY(d)=(m)) - void _mdtop(vl,mod,dvl,p,pr) VL vl,dvl; int mod; @@ -579,7 +604,7 @@ DP p1,p2,*pr; NEXT(mr) = m2; else NEXT(mr) = 0; - MKDPM(NV(p1),mr0,*pr); + MKDP(NV(p1),mr0,*pr); if ( *pr ) (*pr)->sugar = MAX(p1->sugar,p2->sugar); } @@ -611,7 +636,7 @@ DP p,*pr; for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { NEXTMP(mr0,mr); C(mr) = STOI(mod - ITOS(C(m))); mr->dl = m->dl; } - NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr); + NEXT(mr) = 0; MKDP(NV(p),mr0,*pr); if ( *pr ) (*pr)->sugar = p->sugar; } @@ -713,7 +738,7 @@ DP *pr; C(mr) = STOI(dmar(ITOS(C(m)),c,0,mod)); adddl(n,m->dl,d,&mr->dl); } - NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr); + NEXT(mr) = 0; MKDP(NV(p),mr0,*pr); if ( *pr ) (*pr)->sugar = p->sugar + m0->dl->td; } @@ -779,78 +804,53 @@ DP *pr; d0 = m0->dl; d1 = m1->dl; n2 = n>>1; - if ( n & 1 ) { + NEWDL(d,n); + if ( n & 1 ) /* 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 = STOI(c); mr->dl = d; - MKDPM(n,mr,r); r->sugar = d->d[n-1]; + d->td = d->d[n-1] = d0->d[n-1]+d1->d[n-1]; + else + d->td = 0; + NEWMP(mr); mr->c = STOI(c); mr->dl = d; NEXT(mr) = 0; + MKDP(n,mr,r); r->sugar = d->td; - /* homogenized computation; dx-xd=h^2 */ - 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); + /* homogenized computation; dx-xd=h^2 */ + 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; + /* compute xi^a*(Di^k*xi^l)*Di^b */ + min = MIN(k,l); - if ( min+1 > tablen ) { - if ( tab ) GC_free(tab); - tab = (int *)MALLOC((min+1)*sizeof(int)); - tablen = min+1; - } - mkwcm(k,l,mod,tab); + if ( min+1 > tablen ) { + if ( tab ) GC_free(tab); + tab = (int *)MALLOC((min+1)*sizeof(int)); + tablen = min+1; + } + mkwcm(k,l,mod,tab); + if ( n & 1 ) for ( mr0 = 0, j = 0; j <= min; j++ ) { - NEXTMP(mr0,mr); - NEWDL(d,n); + 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 = STOI(tab[j]); - mr->dl = d; + d->td = s; + d->d[n-1] = s-(d->d[i]+d->d[n2+i]); + mr->c = STOI(tab[j]); mr->dl = d; } - bzero(tab,(min+1)*sizeof(int)); - if ( mr0 ) - NEXT(mr) = 0; - MKDP(n,mr0,t); - if ( t ) - t->sugar = h; - _comm_mulmd(vl,mod,r,t,&t1); r = t1; - } - } else { - NEWDL(d,n); d->td = 0; - NEWMP(mr); mr->c = STOI(c); mr->dl = d; - MKDPM(n,mr,r); r->sugar = 0; - - for ( i = 0; 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); - - if ( min+1 > tablen ) { - if ( tab ) GC_free(tab); - tab = (int *)MALLOC((min+1)*sizeof(int)); - tablen = min+1; - } - mkwcm(k,l,mod,tab); + else for ( mr0 = 0, s = 0, j = 0; j <= min; j++ ) { - NEXTMP(mr0,mr); - NEWDL(d,n); + 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 = STOI(tab[j]); - mr->dl = d; + mr->c = STOI(tab[j]); mr->dl = d; } - bzero(tab,(min+1)*sizeof(int)); - if ( mr0 ) - NEXT(mr) = 0; - MKDP(n,mr0,t); - if ( t ) - t->sugar = s; - _comm_mulmd(vl,mod,r,t,&t1); r = t1; - } + bzero(tab,(min+1)*sizeof(int)); + if ( mr0 ) + NEXT(mr) = 0; + MKDP(n,mr0,t); + if ( t ) + t->sugar = s; + _comm_mulmd(vl,mod,r,t,&t1); r = t1; } *pr = r; }