===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -p -r1.2 -r1.9
--- OpenXM_contrib2/asir2000/engine/dist.c	2000/04/05 08:32:17	1.2
+++ OpenXM_contrib2/asir2000/engine/dist.c	2000/08/22 05:04:05	1.9
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/dist.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/dist.c,v 1.8 2000/08/21 08:31:27 noro Exp $ 
+*/
 #include "ca.h"
 
 #define NV(p) ((p)->nv)
@@ -315,6 +363,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 +462,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 +473,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 +529,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 +540,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 +564,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;
@@ -462,7 +603,8 @@ DP *pr;
 	P c,c0,c1,cc;
 	DL d,d0,d1;
 	int i,j,a,b,k,l,n2,s,min;
-	Q *tab;
+	static Q *tab;
+	static int tablen;
 
 	if ( !m0 || !m1 )
 		*pr = 0;
@@ -471,22 +613,46 @@ 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++ ) {
+		if ( n & 1 ) { 
+			/* homogenized computation; dx-xd=h^2 */
+			/* offset of h-degree */
+			NEWDL(d,n); 
+			d->td = d->d[n-1] = d0->d[n-1]+d1->d[n-1];
+			NEWMP(mr); mr->c = (P)ONE; mr->dl = d;
+			MKDP(n,mr,r); r->sugar = d->td;
+		} else
+			r = (DP)ONE;
+		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);
-			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 ( min+1 > tablen ) {
+				if ( tab ) GC_free(tab);
+				tab = (Q *)MALLOC((min+1)*sizeof(Q));
+				tablen = min+1;
 			}
+			mkwc(k,l,tab);
+			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->td = s;
+					d->d[n-1] = s-(d->d[i]+d->d[n2+i]); 
+					mr->c = (P)tab[j]; 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 */
+					s = MAX(s,d->td); /* XXX */
+					mr->c = (P)tab[j]; mr->dl = d;
+				}
+			bzero(tab,(min+1)*sizeof(Q));
 			if ( mr0 )
 				NEXT(mr) = 0;
 			MKDP(n,mr0,t);
@@ -631,12 +797,18 @@ int cmpdl_revgradlex(n,d1,d2)
 int n;
 DL d1,d2;
 {
+	register int i;
+	register int *p1,*p2;
+
 	if ( d1->td > d2->td )
 		return 1;
 	else if ( d1->td < d2->td )
 		return -1;
-	else
-		return cmpdl_revlex(n,d1,d2);
+	else {
+		for ( i= n - 1, p1 = d1->d+n-1, p2 = d2->d+n-1;
+			i >= 0 && *p1 == *p2; i--, p1--, p2-- );
+		return i < 0 ? 0 : (*p1 < *p2 ? 1 : -1);
+	}
 }
 
 int cmpdl_blex(n,d1,d2)