===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/distm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- OpenXM_contrib2/asir2000/engine/distm.c	2000/08/22 05:04:05	1.6
+++ OpenXM_contrib2/asir2000/engine/distm.c	2000/12/05 06:59:16	1.7
@@ -45,21 +45,11 @@
  * 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 $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/distm.c,v 1.6 2000/08/22 05:04:05 noro Exp $ 
 */
 #include "ca.h"
 #include "inline.h"
 
-#define NV(p) ((p)->nv)
-#define C(p) ((p)->c)
-#if 0
-#define ITOS(p) (((unsigned int)(p))>>1)
-#define STOI(i) ((P)((((unsigned int)(i))<<1)|1))
-#else
-#define ITOS(p) (((unsigned int)(p))&0x7fffffff)
-#define STOI(i) ((P)((unsigned int)(i)|0x80000000))
-#endif
-
 extern int (*cmpdl)();
 extern int do_weyl;
 
@@ -528,334 +518,6 @@ DP *pr;
 	}
 }
 
-void _mdtop(vl,mod,dvl,p,pr)
-VL vl,dvl;
-int mod;
-DP p;
-P *pr;
-{
-	int n,i;
-	DL d;
-	MP m;
-	P r,s,t,u,w;
-	Q q;
-	MQ tq;
-	VL tvl;
-
-	if ( !p )
-		*pr = 0;
-	else {
-		for ( n = p->nv, m = BDY(p), s = 0; m; m = NEXT(m) ) {
-			STOMQ(ITOS(C(m)),tq); t = (P)tq;
-			for ( i = 0, d = m->dl, tvl = dvl;
-				i < n; tvl = NEXT(tvl), i++ ) {
-				MKV(tvl->v,r); STOQ(d->d[i],q); pwrmp(vl,mod,r,q,&u);
-				mulmp(vl,mod,t,u,&w); t = w;
-			}
-			addmp(vl,mod,s,t,&u); s = u;
-		}
-		mptop(s,pr);
-	}
-}
-
-void _addmd(vl,mod,p1,p2,pr)
-VL vl;
-int mod;
-DP p1,p2,*pr;
-{
-	int n;
-	MP m1,m2,mr,mr0;
-	int t;
-
-	if ( !p1 )
-		*pr = p2;
-	else if ( !p2 )
-		*pr = p1;
-	else {
-		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; )
-			switch ( (*cmpdl)(n,m1->dl,m2->dl) ) {
-				case 0:
-					t = (ITOS(C(m1))+ITOS(C(m2))) - mod;
-					if ( t < 0 )
-						t += mod;
-					if ( t ) {
-						NEXTMP(mr0,mr); mr->dl = m1->dl; C(mr) = STOI(t);
-					}
-					m1 = NEXT(m1); m2 = NEXT(m2); break;
-				case 1:
-					NEXTMP(mr0,mr); mr->dl = m1->dl; C(mr) = C(m1);
-					m1 = NEXT(m1); break;
-				case -1:
-					NEXTMP(mr0,mr); mr->dl = m2->dl; C(mr) = C(m2);
-					m2 = NEXT(m2); break;
-			}
-		if ( !mr0 )
-			if ( m1 )
-				mr0 = m1;
-			else if ( m2 )
-				mr0 = m2;
-			else {
-				*pr = 0;
-				return;
-			}
-		else if ( m1 )
-			NEXT(mr) = m1;
-		else if ( m2 )
-			NEXT(mr) = m2;
-		else
-			NEXT(mr) = 0;
-		MKDP(NV(p1),mr0,*pr);
-		if ( *pr )
-			(*pr)->sugar = MAX(p1->sugar,p2->sugar);
-	}
-}
-
-void _submd(vl,mod,p1,p2,pr)
-VL vl;
-int mod;
-DP p1,p2,*pr;
-{
-	DP t;
-
-	if ( !p2 )
-		*pr = p1;
-	else {
-		_chsgnmd(mod,p2,&t); _addmd(vl,mod,p1,t,pr);
-	}
-}
-
-void _chsgnmd(mod,p,pr)
-int mod;
-DP p,*pr;
-{
-	MP m,mr,mr0;
-
-	if ( !p )
-		*pr = 0;
-	else {
-		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; MKDP(NV(p),mr0,*pr);
-		if ( *pr )
-			(*pr)->sugar = p->sugar;
-	}
-}
-
-void _mulmd(vl,mod,p1,p2,pr)
-VL vl;
-int mod;
-DP p1,p2,*pr;
-{
-	if ( !do_weyl )
-		_comm_mulmd(vl,mod,p1,p2,pr);
-	else
-		_weyl_mulmd(vl,mod,p1,p2,pr);
-}
-
-void _comm_mulmd(vl,mod,p1,p2,pr)
-VL vl;
-int mod;
-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;
-	else {
-		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-- ) {
-			_mulmdm(vl,mod,p1,w[i],&t); _addmd(vl,mod,s,t,&u); s = u;
-		}
-		bzero(w,l*sizeof(MP));
-		*pr = s;
-	}
-}
-
-void _weyl_mulmd(vl,mod,p1,p2,pr)
-VL vl;
-int mod;
-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;
-	else {
-		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_mulmdm(vl,mod,p1,w[i],&t); _addmd(vl,mod,s,t,&u); s = u;
-		}
-		bzero(w,l*sizeof(MP));
-		*pr = s;
-	}
-}
-
-void _mulmdm(vl,mod,p,m0,pr)
-VL vl;
-int mod;
-DP p;
-MP m0;
-DP *pr;
-{
-	MP m,mr,mr0;
-	DL d;
-	int c,n,r;
-
-	if ( !p )
-		*pr = 0;
-	else {
-		for ( mr0 = 0, m = BDY(p), c = ITOS(C(m0)), d = m0->dl, n = NV(p); 
-			m; m = NEXT(m) ) {
-			NEXTMP(mr0,mr);
-			C(mr) = STOI(dmar(ITOS(C(m)),c,0,mod));
-			adddl(n,m->dl,d,&mr->dl);
-		}
-		NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
-		if ( *pr )
-			(*pr)->sugar = p->sugar + m0->dl->td;
-	}
-}
-
-void _weyl_mulmdm(vl,mod,p,m0,pr)
-VL vl;
-int mod;
-DP p;
-MP m0;
-DP *pr;
-{
-	DP r,t,t1;
-	MP m;
-	int n,l,i;
-	static MP *w;
-	static int wlen;
-
-	if ( !p )
-		*pr = 0;
-	else {
-		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_mulmmm(vl,mod,w[i],m0,n,&t);
-			_addmd(vl,mod,r,t,&t1); r = t1;
-		}
-		bzero(w,l*sizeof(MP));
-		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_mulmmm(vl,mod,m0,m1,n,pr)
-VL vl;
-int mod;
-MP m0,m1;
-int n;
-DP *pr;
-{
-	MP m,mr,mr0;
-	DP r,t,t1;
-	int c,c0,c1,cc;
-	DL d,d0,d1;
-	int i,j,a,b,k,l,n2,s,min,h;
-	static int *tab;
-	static int tablen;
-
-	if ( !m0 || !m1 )
-		*pr = 0;
-	else {
-		c0 = ITOS(C(m0)); c1 = ITOS(C(m1));
-		c = dmar(c0,c1,0,mod);
-		d0 = m0->dl; d1 = m1->dl;
-		n2 = n>>1;
-
-		NEWDL(d,n);
-		if ( n & 1 )
-			/* offset of h-degree */
-			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 */
-			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 ( 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 = STOI(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 = 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;
-		}
-		*pr = r;
-	}
-}
-
 void _dtop_mod(vl,dvl,p,pr)
 VL vl,dvl;
 DP p;
@@ -884,27 +546,6 @@ P *pr;
 	}
 }
 
-void _dp_red_mod(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
-{
-	int i,n;
-	DL d1,d2,d;
-	MP m;
-	DP t,s;
-	int c,c1;
-
-	n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl;
-	NEWDL(d,n); d->td = d1->td - d2->td;
-	for ( i = 0; i < n; i++ )
-		d->d[i] = d1->d[i]-d2->d[i];
-	c = invm(ITOS(BDY(p2)->c),mod); c1 = dmar(c,ITOS(BDY(p1)->c),0,mod);
-	NEWMP(m); m->dl = d; m->c = STOI(mod-c1); NEXT(m) = 0;
-	MKDP(n,m,s); s->sugar = d->td;
-	_mulmd(CO,mod,s,p2,&t); _addmd(CO,mod,p1,t,rp);
-}
-
 void _dp_mod(p,mod,subst,rp)
 DP p;
 int mod;
@@ -954,63 +595,6 @@ DP *rp;
 		}
 		NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar;
 	}
-}
-
-void _dp_sp_mod(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
-{
-	int i,n,td;
-	int *w;
-	DL d1,d2,d;
-	MP m;
-	DP t,s,u;
-
-	n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl;
-	w = (int *)ALLOCA(n*sizeof(int));
-	for ( i = 0, td = 0; i < n; i++ ) {
-		w[i] = MAX(d1->d[i],d2->d[i]); td += w[i];
-	}
-	NEWDL(d,n); d->td = td - d1->td;
-	for ( i = 0; i < n; i++ )
-		d->d[i] = w[i] - d1->d[i];
-	NEWMP(m); m->dl = d; m->c = BDY(p2)->c; NEXT(m) = 0;
-	MKDP(n,m,s); s->sugar = d->td; _mulmd(CO,mod,s,p1,&t);
-	NEWDL(d,n); d->td = td - d2->td;
-	for ( i = 0; i < n; i++ )
-		d->d[i] = w[i] - d2->d[i];
-	NEWMP(m); m->dl = d; m->c = STOI(mod - ITOS(BDY(p1)->c)); NEXT(m) = 0;
-	MKDP(n,m,s); s->sugar = d->td; _mulmd(CO,mod,s,p2,&u);
-	_addmd(CO,mod,t,u,rp);
-}
-
-void _dp_sp_component_mod(p1,p2,mod,f1,f2)
-DP p1,p2;
-int mod;
-DP *f1,*f2;
-{
-	int i,n,td;
-	int *w;
-	DL d1,d2,d;
-	MP m;
-	DP t,s,u;
-
-	n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl;
-	w = (int *)ALLOCA(n*sizeof(int));
-	for ( i = 0, td = 0; i < n; i++ ) {
-		w[i] = MAX(d1->d[i],d2->d[i]); td += w[i];
-	}
-	NEWDL(d,n); d->td = td - d1->td;
-	for ( i = 0; i < n; i++ )
-		d->d[i] = w[i] - d1->d[i];
-	NEWMP(m); m->dl = d; m->c = BDY(p2)->c; NEXT(m) = 0;
-	MKDP(n,m,s); s->sugar = d->td; _mulmd(CO,mod,s,p1,f1);
-	NEWDL(d,n); d->td = td - d2->td;
-	for ( i = 0; i < n; i++ )
-		d->d[i] = w[i] - d2->d[i];
-	NEWMP(m); m->dl = d; m->c = BDY(p1)->c; NEXT(m) = 0;
-	MKDP(n,m,s); s->sugar = d->td; _mulmd(CO,mod,s,p2,f2);
 }
 
 void _printdp(d)