===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.8
retrieving revision 1.21
diff -u -p -r1.8 -r1.21
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2000/12/08 06:43:09	1.8
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2002/01/28 00:54:41	1.21
@@ -45,10 +45,11 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.7 2000/12/08 02:39:04 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.20 2001/10/09 01:36:05 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
+#include "inline.h"
 #include "parse.h"
 #include "ox.h"
 
@@ -66,8 +67,7 @@ extern NODE TraceList;
  *
  */
 
-void dp_ptozp(p,rp)
-DP p,*rp;
+void dp_ptozp(DP p,DP *rp)
 {
 	MP m,mr,mr0;
 	int i,n;
@@ -94,9 +94,7 @@ DP p,*rp;
 	}
 }
 
-void dp_ptozp2(p0,p1,hp,rp)
-DP p0,p1;
-DP *hp,*rp;
+void dp_ptozp2(DP p0,DP p1,DP *hp,DP *rp)
 {
 	DP t,s,h,r;
 	MP m,mr,mr0,m0;
@@ -120,10 +118,7 @@ DP *hp,*rp;
 	*hp = h; *rp = r;
 }
 
-void dp_idiv(p,c,rp)
-DP p;
-Q c;
-DP *rp;
+void dp_idiv(DP p,Q c,DP *rp)
 {
 	Q t;
 	N nm,q;
@@ -153,9 +148,7 @@ DP *rp;
 	}
 }
 
-void dp_mbase(hlist,mbase)
-NODE hlist;
-NODE *mbase;
+void dp_mbase(NODE hlist,NODE *mbase)
 {
 	DL *dl;
 	DL d;
@@ -169,7 +162,8 @@ NODE *mbase;
 	while ( 1 ) {
 		insert_to_node(d,mbase,nvar);
 		for ( i = nvar-1; i >= 0; ) {
-			d->d[i]++; d->td++;
+			d->d[i]++;
+			d->td += MUL_WEIGHT(1,i);
 			for ( j = 0; j < n; j++ ) {
 				if ( _dl_redble(dl[j],d,nvar) )
 					break;
@@ -178,7 +172,7 @@ NODE *mbase;
 				for ( j = nvar-1; j >= i; j-- )
 					d->d[j] = 0;
 				for ( j = 0, td = 0; j < i; j++ )
-					td += d->d[j];
+					td += MUL_WEIGHT(d->d[j],j);
 				d->td = td;
 				i--;
 			} else
@@ -189,9 +183,7 @@ NODE *mbase;
 	}
 }
 
-int _dl_redble(d1,d2,nvar)
-DL d1,d2;
-int nvar;
+int _dl_redble(DL d1,DL d2,int nvar)
 {
 	int i;
 
@@ -206,10 +198,7 @@ int nvar;
 		return 1;
 }
 
-void insert_to_node(d,n,nvar)
-DL d;
-NODE *n;
-int nvar;
+void insert_to_node(DL d,NODE *n,int nvar)
 {
 	DL d1;
 	MP m;
@@ -238,10 +227,7 @@ int nvar;
 	}
 }
 
-void dp_vtod(c,p,rp)
-Q *c;
-DP p;
-DP *rp;
+void dp_vtod(Q *c,DP p,DP *rp)
 {
 	MP mr0,m,mr;
 	int i;
@@ -260,8 +246,7 @@ DP *rp;
 extern int mpi_mag;
 extern int PCoeffs;
 
-void dp_ptozp_d(p,rp)
-DP p,*rp;
+void dp_ptozp_d(DP p,DP *rp)
 {
 	int i,j,k,l,n,nsep;
 	MP m;
@@ -270,7 +255,6 @@ DP p,*rp;
 	VECT c,cs;
 	VECT qi,ri;
 	LIST *qr;
-	int s,id;
 	Obj dmy;
 	Q d0,d1,gcd,a,u,u1;
 	Q *q,*r;
@@ -285,6 +269,8 @@ DP p,*rp;
 	double t_e,t_d,t_d1,t_c;
 	extern int DP_NFStat;
 	extern LIST Dist;
+	void Pox_rpc();
+	void Pox_pop_local();
 
 	if ( !p )
 		*rp = 0;
@@ -292,7 +278,7 @@ DP p,*rp;
 		if ( PCoeffs ) {
 			dp_ptozp(p,rp); return;
 		}	
-		if ( !dist || p_mag(BDY(p)->c) <= mpi_mag ) {
+		if ( !Dist || p_mag(BDY(p)->c) <= mpi_mag ) {
 			dist = 0; ndist = 0;
 			if ( DP_NFStat ) fprintf(asir_out,"L");
 		} else {
@@ -361,9 +347,7 @@ DP p,*rp;
 	}
 }
 
-void dp_ptozp2_d(p0,p1,hp,rp)
-DP p0,p1;
-DP *hp,*rp;
+void dp_ptozp2_d(DP p0,DP p1,DP *hp,DP *rp)
 {
 	DP t,s,h,r;
 	MP m,mr,mr0,m0;
@@ -387,8 +371,7 @@ DP *hp,*rp;
 	*hp = h; *rp = r;
 }
 
-void dp_prim(p,rp)
-DP p,*rp;
+void dp_prim(DP p,DP *rp)
 {
 	P t,g;
 	DP p1;
@@ -432,10 +415,7 @@ DP p,*rp;
 	}
 }
 
-void heu_nezgcdnpz(vl,pl,m,pr)
-VL vl;
-P *pl,*pr;
-int m;
+void heu_nezgcdnpz(VL vl,P *pl,int m,P *pr)
 {
 	int i,r;
 	P gcd,t,s1,s2,u;
@@ -461,9 +441,7 @@ int m;
 	*pr = gcd;
 }
 
-void dp_prim_mod(p,mod,rp)
-int mod;
-DP p,*rp;
+void dp_prim_mod(DP p,int mod,DP *rp)
 {
 	P t,g;
 	MP m,mr,mr0;
@@ -483,18 +461,14 @@ DP p,*rp;
 	}
 }
 
-void dp_cont(p,rp)
-DP p;
-Q *rp;
+void dp_cont(DP p,Q *rp)
 {
 	VECT v;
 
 	dp_dtov(p,&v); igcdv(v,rp);
 }
 
-void dp_dtov(dp,rp)
-DP dp;
-VECT *rp;
+void dp_dtov(DP dp,VECT *rp)
 {
 	MP m,t;
 	int i,n;
@@ -514,9 +488,7 @@ VECT *rp;
  *
  */
 
-void dp_sp(p1,p2,rp)
-DP p1,p2;
-DP *rp;
+void dp_sp(DP p1,DP p2,DP *rp)
 {
 	int i,n,td;
 	int *w;
@@ -529,7 +501,7 @@ DP *rp;
 	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];
+		w[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(w[i],i);
 	}
 
 	NEWDL(d,n); d->td = td - d1->td;
@@ -569,28 +541,78 @@ DP *rp;
 	}
 }
 
-void dp_sp_mod(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
+void _dp_sp_dup(DP p1,DP p2,DP *rp)
 {
 	int i,n,td;
 	int *w;
 	DL d1,d2,d;
 	MP m;
+	DP t,s1,s2,u;
+	Q c,c1,c2;
+	N gn,tn;
+
+	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 += MUL_WEIGHT(w[i],i);
+	}
+
+	_NEWDL(d,n); d->td = td - d1->td;
+	for ( i = 0; i < n; i++ )
+		d->d[i] = w[i] - d1->d[i];
+	c1 = (Q)BDY(p1)->c; c2 = (Q)BDY(p2)->c;
+	if ( INT(c1) && INT(c2) ) {
+		gcdn(NM(c1),NM(c2),&gn);
+		if ( !UNIN(gn) ) {
+			divsn(NM(c1),gn,&tn); NTOQ(tn,SGN(c1),c); c1 = c;
+			divsn(NM(c2),gn,&tn); NTOQ(tn,SGN(c2),c); c2 = c;
+		}
+	}
+
+	_NEWMP(m); m->dl = d; m->c = (P)c2; NEXT(m) = 0;
+	_MKDP(n,m,s1); s1->sugar = d->td; _muld_dup(CO,s1,p1,&t); _free_dp(s1);
+
+	_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; chsgnp((P)c1,&m->c); NEXT(m) = 0;
+	_MKDP(n,m,s2); s2->sugar = d->td; _muld_dup(CO,s2,p2,&u); _free_dp(s2);
+
+	_addd_destructive(CO,t,u,rp);
+	if ( GenTrace ) {
+		LIST hist;
+		NODE node;
+
+		node = mknode(4,ONE,0,s1,ONE);
+		MKLIST(hist,node);
+		MKNODE(TraceList,hist,0);
+
+		node = mknode(4,ONE,0,0,ONE);
+		chsgnd(s2,(DP *)&ARG2(node));
+		MKLIST(hist,node);
+		MKNODE(node,hist,TraceList); TraceList = node;
+	}
+}
+
+void dp_sp_mod(DP p1,DP 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];
+		w[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(w[i],i);
 	}
-	NEWDL(d,n); d->td = td - d1->td;
+	NEWDL_NOINIT(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 = (P)BDY(p2)->c; NEXT(m) = 0;
 	MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p1,s,&t);
-	NEWDL(d,n); d->td = td - d2->td;
+	NEWDL_NOINIT(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 = (P)BDY(p1)->c; NEXT(m) = 0;
@@ -598,10 +620,7 @@ DP *rp;
 	submd(CO,mod,t,u,rp);
 }
 
-void _dp_sp_mod_dup(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
+void _dp_sp_mod_dup(DP p1,DP p2,int mod,DP *rp)
 {
 	int i,n,td;
 	int *w;
@@ -612,7 +631,7 @@ DP *rp;
 	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];
+		w[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(w[i],i);
 	}
 	_NEWDL(d,n); d->td = td - d1->td;
 	for ( i = 0; i < n; i++ )
@@ -627,10 +646,7 @@ DP *rp;
 	_addmd_destructive(mod,t,u,rp);
 }
 
-void _dp_sp_mod(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
+void _dp_sp_mod(DP p1,DP p2,int mod,DP *rp)
 {
 	int i,n,td;
 	int *w;
@@ -641,7 +657,7 @@ DP *rp;
 	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];
+		w[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(w[i],i);
 	}
 	NEWDL(d,n); d->td = td - d1->td;
 	for ( i = 0; i < n; i++ )
@@ -658,14 +674,12 @@ DP *rp;
 
 /*
  * m-reduction
+ * do content reduction over Z or Q(x,...)
+ * do nothing over finite fields
  *
  */
 
-void dp_red(p0,p1,p2,head,rest,dnp,multp)
-DP p0,p1,p2;
-DP *head,*rest;
-P *dnp;
-DP *multp;
+void dp_red(DP p0,DP p1,DP p2,DP *head,DP *rest,P *dnp,DP *multp)
 {
 	int i,n;
 	DL d1,d2,d;
@@ -699,15 +713,36 @@ DP *multp;
 	*head = h; *rest = r; *dnp = (P)c2;
 }
 
-void dp_red_mod(p0,p1,p2,mod,head,rest,dnp)
-DP p0,p1,p2;
-int mod;
-DP *head,*rest;
-P *dnp;
+/* m-reduction over a field */
+
+void dp_red_f(DP p1,DP p2,DP *rest)
 {
 	int i,n;
 	DL d1,d2,d;
 	MP m;
+	DP t,s;
+	Obj a,b;
+
+	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];
+
+	NEWMP(m); m->dl = d;
+	divr(CO,(Obj)BDY(p1)->c,(Obj)BDY(p2)->c,&a); chsgnr(a,&b);
+	C(m) = (P)b;
+	NEXT(m) = 0; MKDP(n,m,s); s->sugar = d->td;
+
+	muld(CO,s,p2,&t); addd(CO,p1,t,rest);
+}
+
+void dp_red_mod(DP p0,DP p1,DP p2,int mod,DP *head,DP *rest,P *dnp)
+{
+	int i,n;
+	DL d1,d2,d;
+	MP m;
 	DP t,s,r,h;
 	P c1,c2,g,u;
 
@@ -722,7 +757,7 @@ P *dnp;
 		divsmp(CO,mod,c1,c2,&u); c1 = u; c2 = (P)ONEM;
 	}
 	NEWMP(m); m->dl = d; chsgnmp(mod,(P)c1,&m->c); NEXT(m) = 0;
-	MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p2,s,&t);
+	MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,s,p2,&t);
 	if ( NUM(c2) ) {
 		addmd(CO,mod,p1,t,&r); h = p0;
 	} else {
@@ -731,26 +766,39 @@ P *dnp;
 	*head = h; *rest = r; *dnp = c2;
 }
 
-void _dp_red_mod_destructive(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
+struct oEGT eg_red_mod;
+
+void _dp_red_mod_destructive(DP p1,DP p2,int mod,DP *rp)
 {
 	int i,n;
 	DL d1,d2,d;
 	MP m;
 	DP t,s;
-	int c,c1;
+	int c,c1,c2;
+	extern int do_weyl;
 
 	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);
+	c = invm(ITOS(BDY(p2)->c),mod); 
+	c2 = ITOS(BDY(p1)->c);
+	DMAR(c,c2,0,mod,c1);
 	_NEWMP(m); m->dl = d; m->c = STOI(mod-c1); NEXT(m) = 0;
+#if 0
 	_MKDP(n,m,s); s->sugar = d->td;
 	_mulmd_dup(mod,s,p2,&t); _free_dp(s);
+#else
+	if ( do_weyl ) {
+		_MKDP(n,m,s); s->sugar = d->td;
+		_mulmd_dup(mod,s,p2,&t); _free_dp(s);
+	} else {
+		_mulmdm_dup(mod,p2,m,&t); _FREEMP(m);
+	}
+#endif
+/* get_eg(&t0); */
 	_addmd_destructive(mod,p1,t,rp);
+/* get_eg(&t1); add_eg(&eg_red_mod,&t0,&t1); */
 }
 
 /*
@@ -758,13 +806,7 @@ DP *rp;
  *
  */
 
-void dp_true_nf(b,g,ps,full,rp,dnp)
-NODE b;
-DP g;
-DP *ps;
-int full;
-DP *rp;
-P *dnp;
+void dp_true_nf(NODE b,DP g,DP *ps,int full,DP *rp,P *dnp)
 {
 	DP u,p,d,s,t,dmy;
 	NODE l;
@@ -819,12 +861,9 @@ P *dnp;
 	*rp = d; *dnp = dn;
 }
 
-void dp_nf_ptozp(b,g,ps,full,multiple,rp)
-NODE b;
-DP g;
-DP *ps;
-int full,multiple;
-DP *rp;
+/* nf computation over Z */
+
+void dp_nf_z(NODE b,DP g,DP *ps,int full,int multiple,DP *rp)
 {
 	DP u,p,d,s,t,dmy1;
 	P dmy;
@@ -842,8 +881,10 @@ DP *rp;
 	wb = (int *)ALLOCA(n*sizeof(int));
 	for ( i = 0, l = b; i < n; l = NEXT(l), i++ )
 		wb[i] = QTOS((Q)BDY(l));
+
 	hmag = multiple*HMAG(g);
 	sugar = g->sugar;
+
 	for ( d = 0; g; ) {
 		for ( u = 0, i = 0; i < n; i++ ) {
 			if ( dp_redble(g,p = ps[wb[i]]) ) {
@@ -891,14 +932,64 @@ DP *rp;
 	*rp = d;
 }
 
-void dp_nf_mod(b,g,ps,mod,full,rp)
-NODE b;
-DP g;
-DP *ps;
-int mod,full;
-DP *rp;
+/* nf computation over a field */
+
+void dp_nf_f(NODE b,DP g,DP *ps,int full,DP *rp)
 {
 	DP u,p,d,s,t;
+	NODE l;
+	MP m,mr;
+	int i,n;
+	int *wb;
+	int sugar,psugar;
+
+	if ( !g ) {
+		*rp = 0; return;
+	}
+	for ( n = 0, l = b; l; l = NEXT(l), n++ );
+	wb = (int *)ALLOCA(n*sizeof(int));
+	for ( i = 0, l = b; i < n; l = NEXT(l), i++ )
+		wb[i] = QTOS((Q)BDY(l));
+
+	sugar = g->sugar;
+	for ( d = 0; g; ) {
+		for ( u = 0, i = 0; i < n; i++ ) {
+			if ( dp_redble(g,p = ps[wb[i]]) ) {
+				dp_red_f(g,p,&u);
+				psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar;
+				sugar = MAX(sugar,psugar);
+				if ( !u ) {
+					if ( d )
+						d->sugar = sugar;
+					*rp = d; return;
+				}
+				break;
+			}
+		}
+		if ( u )
+			g = u;
+		else if ( !full ) {
+			if ( g ) {
+				MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t;
+			}
+			*rp = g; return;
+		} else {
+			m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c;
+			NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td;
+			addd(CO,d,t,&s); d = s;
+			dp_rest(g,&t); g = t;
+		}
+	}
+	if ( d )
+		d->sugar = sugar;
+	*rp = d;
+}
+
+/* nf computation over GF(mod) (only for internal use) */
+
+void dp_nf_mod(NODE b,DP g,DP *ps,int mod,int full,DP *rp)
+{
+	DP u,p,d,s,t;
 	P dmy;
 	NODE l;
 	MP m,mr;
@@ -942,13 +1033,7 @@ DP *rp;
 	*rp = d;
 }
 
-void dp_true_nf_mod(b,g,ps,mod,full,rp,dnp)
-NODE b;
-DP g;
-DP *ps;
-int mod,full;
-DP *rp;
-P *dnp;
+void dp_true_nf_mod(NODE b,DP g,DP *ps,int mod,int full,DP *rp,P *dnp)
 {
 	DP u,p,d,s,t;
 	NODE l;
@@ -1003,17 +1088,12 @@ P *dnp;
 	*rp = d; *dnp = dn;
 }
 
-void _dp_nf_mod_destructive(b,g,ps,mod,full,rp)
-NODE b;
-DP g;
-DP *ps;
-int mod,full;
-DP *rp;
+void _dp_nf_mod_destructive(NODE b,DP g,DP *ps,int mod,int full,DP *rp)
 {
-	DP u,p,d,s,t;
+	DP u,p,d;
 	NODE l;
-	MP m,mr,mrd;
-	int sugar,psugar,n,h_reducible,i;
+	MP m,mrd;
+	int sugar,psugar,n,h_reducible;
 
 	if ( !g ) {
 		*rp = 0; return;
@@ -1062,13 +1142,40 @@ DP *rp;
 	_dptodp(d,rp); _free_dp(d);
 }
 
-void dp_lnf_mod(p1,p2,g,mod,r1p,r2p)
-DP p1,p2;
-NODE g;
-int mod;
-DP *r1p,*r2p;
+/* reduction by linear base over a field */
+
+void dp_lnf_f(DP p1,DP p2,NODE g,DP *r1p,DP *r2p)
 {
 	DP r1,r2,b1,b2,t,s;
+	Obj c,c1,c2;
+	NODE l,b;
+	int n;
+
+	if ( !p1 ) {
+		*r1p = p1; *r2p = p2; return;
+	}
+	n = p1->nv;
+	for ( l = g, r1 = p1, r2 = p2; l; l = NEXT(l) ) {
+			if ( !r1 ) {
+				*r1p = r1; *r2p = r2; return;
+			}
+			b = BDY((LIST)BDY(l)); b1 = (DP)BDY(b);
+			if ( dl_equal(n,BDY(r1)->dl,BDY(b1)->dl) ) {
+				b2 = (DP)BDY(NEXT(b));
+				divr(CO,(Obj)ONE,(Obj)BDY(b1)->c,&c1);
+				mulr(CO,c1,(Obj)BDY(r1)->c,&c2); chsgnr(c2,&c);
+				muldc(CO,b1,(P)c,&t); addd(CO,r1,t,&s); r1 = s;
+				muldc(CO,b2,(P)c,&t); addd(CO,r2,t,&s); r2 = s;
+			}
+	}
+	*r1p = r1; *r2p = r2;
+}
+
+/* reduction by linear base over GF(mod) */
+
+void dp_lnf_mod(DP p1,DP p2,NODE g,int mod,DP *r1p,DP *r2p)
+{
+	DP r1,r2,b1,b2,t,s;
 	P c;
 	MQ c1,c2;
 	NODE l,b;
@@ -1094,11 +1201,7 @@ DP *r1p,*r2p;
 	*r1p = r1; *r2p = r2;
 }
 
-void dp_nf_tab_mod(p,tab,mod,rp)
-DP p;
-LIST *tab;
-int mod;
-DP *rp;
+void dp_nf_tab_mod(DP p,LIST *tab,int mod,DP *rp)
 {
 	DP s,t,u;
 	MP m;
@@ -1124,9 +1227,7 @@ DP *rp;
  *
  */
 
-int create_order_spec(obj,spec)
-Obj obj;
-struct order_spec *spec;
+int create_order_spec(Obj obj,struct order_spec *spec)
 {
 	int i,j,n,s,row,col;
 	struct order_pair *l;
@@ -1171,9 +1272,7 @@ struct order_spec *spec;
  *
  */
 
-void dp_homo(p,rp)
-DP p;
-DP *rp;
+void dp_homo(DP p,DP *rp)
 {
 	MP m,mr,mr0;
 	int i,n,nv,td;
@@ -1197,9 +1296,7 @@ DP *rp;
 	}
 }
 
-void dp_dehomo(p,rp)
-DP p;
-DP *rp;
+void dp_dehomo(DP p,DP *rp)
 {
 	MP m,mr,mr0;
 	int i,n,nv;
@@ -1222,11 +1319,7 @@ DP *rp;
 	}
 }
 
-void dp_mod(p,mod,subst,rp)
-DP p;
-int mod;
-NODE subst;
-DP *rp;
+void dp_mod(DP p,int mod,NODE subst,DP *rp)
 {
 	MP m,mr,mr0;
 	P t,s,s1;
@@ -1253,9 +1346,7 @@ DP *rp;
 	}
 }
 
-void dp_rat(p,rp)
-DP p;
-DP *rp;
+void dp_rat(DP p,DP *rp)
 {
 	MP m,mr,mr0;
 
@@ -1273,9 +1364,7 @@ DP *rp;
 }
 
 
-void homogenize_order(old,n,new)
-struct order_spec *old,*new;
-int n;
+void homogenize_order(struct order_spec *old,int n,struct order_spec *new)
 {
 	struct order_pair *l;
 	int length,nv,row,i,j;
@@ -1334,9 +1423,7 @@ int n;
 	}
 }
 
-void qltozl(w,n,dvr)
-Q *w,*dvr;
-int n;
+void qltozl(Q *w,int n,Q *dvr)
 {
 	N nm,dn;
 	N g,l1,l2,l3;
@@ -1364,15 +1451,12 @@ int n;
 	*dvr = d;
 }
 
-int comp_nm(a,b)
-Q *a,*b;
+int comp_nm(Q *a,Q *b)
 {
 	return cmpn((*a)?NM(*a):0,(*b)?NM(*b):0);
 }
 
-void sortbynm(w,n)
-Q *w;
-int n;
+void sortbynm(Q *w,int n)
 {
 	qsort(w,n,sizeof(Q),(int (*)(const void *,const void *))comp_nm);
 }
@@ -1383,8 +1467,7 @@ int n;
  *
  */
 
-int dp_redble(p1,p2)
-DP p1,p2;
+int dp_redble(DP p1,DP p2)
 {
 	int i,n;
 	DL d1,d2;
@@ -1400,9 +1483,7 @@ DP p1,p2;
 	}
 }
 
-void dp_subd(p1,p2,rp)
-DP p1,p2;
-DP *rp;
+void dp_subd(DP p1,DP p2,DP *rp)
 {
 	int i,n;
 	DL d1,d2,d;
@@ -1418,10 +1499,7 @@ DP *rp;
 	*rp = s;
 }
 
-void dltod(d,n,rp)
-DL d;
-int n;
-DP *rp;
+void dltod(DL d,int n,DP *rp)
 {
 	MP m;
 	DP s;
@@ -1431,9 +1509,7 @@ DP *rp;
 	*rp = s;
 }
 
-void dp_hm(p,rp)
-DP p;
-DP *rp;
+void dp_hm(DP p,DP *rp)
 {
 	MP m,mr;
 
@@ -1446,8 +1522,7 @@ DP *rp;
 	}
 }
 
-void dp_rest(p,rp)
-DP p,*rp;
+void dp_rest(DP p,DP *rp)
 {
 	MP m;
 
@@ -1461,24 +1536,21 @@ DP p,*rp;
 	}
 }
 
-DL lcm_of_DL(nv,dl1,dl2,dl)
-int nv;
-DL dl1,dl2;
-register DL dl;
+DL lcm_of_DL(int nv,DL dl1,DL dl2,DL dl)
 {
-	register int n, *d1, *d2, *d, td;
+	register int i, *d1, *d2, *d, td;
 
 	if ( !dl ) NEWDL(dl,nv);
 	d = dl->d,  d1 = dl1->d,  d2 = dl2->d;
-	for ( td = 0, n = nv; --n >= 0; d1++, d2++, d++ )
-		td += (*d = *d1 > *d2 ? *d1 : *d2 );
+	for ( td = 0, i = 0; i < nv; d1++, d2++, d++, i++ ) {
+		*d = *d1 > *d2 ? *d1 : *d2;
+		td += MUL_WEIGHT(*d,i);
+	}
 	dl->td = td;
 	return dl;
 }
 
-int dl_equal(nv,dl1,dl2)
-int nv;
-DL dl1, dl2;
+int dl_equal(int nv,DL dl1,DL dl2)
 {
     register int *d1, *d2, n;
 
@@ -1488,8 +1560,7 @@ DL dl1, dl2;
     return 1;
 }
 
-int dp_nt(p)
-DP p;
+int dp_nt(DP p)
 {
 	int i;
 	MP m;
@@ -1502,3 +1573,39 @@ DP p;
 	}
 }
 
+int dp_homogeneous(DP p)
+{
+	MP m;
+	int d;
+
+	if ( !p )
+		return 1;
+	else {
+		m = BDY(p);
+		d = m->dl->td;
+		m = NEXT(m);
+		for ( ; m; m = NEXT(m) ) {
+			if ( m->dl->td != d )
+				return 0;
+		}
+		return 1;
+	}
+}
+
+void _print_mp(int nv,MP m)
+{
+	int i;
+
+	if ( !m )
+		return;
+	for ( ; m; m = NEXT(m) ) {
+		fprintf(stderr,"%d<",ITOS(C(m)));
+		for ( i = 0; i < nv; i++ ) {
+			fprintf(stderr,"%d",m->dl->d[i]);
+			if ( i != nv-1 )
+				fprintf(stderr," ");
+		}
+		fprintf(stderr,">",C(m));
+	}
+	fprintf(stderr,"\n");
+}