===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.16
retrieving revision 1.21
diff -u -p -r1.16 -r1.21
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2001/09/17 01:18:34	1.16
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2002/01/28 00:54:41	1.21
@@ -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/builtin/dp-supp.c,v 1.15 2001/09/11 08:56:47 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"
@@ -67,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;
@@ -95,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;
@@ -121,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;
@@ -154,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;
@@ -170,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;
@@ -179,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
@@ -190,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;
 
@@ -207,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;
@@ -239,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;
@@ -261,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;
@@ -271,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;
@@ -286,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;
@@ -362,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;
@@ -388,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;
@@ -433,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;
@@ -462,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;
@@ -484,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;
@@ -515,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;
@@ -530,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;
@@ -570,9 +541,7 @@ DP *rp;
 	}
 }
 
-void _dp_sp_dup(p1,p2,rp)
-DP p1,p2;
-DP *rp;
+void _dp_sp_dup(DP p1,DP p2,DP *rp)
 {
 	int i,n,td;
 	int *w;
@@ -585,7 +554,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;
@@ -625,10 +594,7 @@ DP *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;
@@ -639,14 +605,14 @@ 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;
+	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;
@@ -654,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;
@@ -668,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++ )
@@ -683,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;
@@ -697,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++ )
@@ -719,11 +679,7 @@ DP *rp;
  *
  */
 
-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;
@@ -759,14 +715,12 @@ DP *multp;
 
 /* m-reduction over a field */
 
-void dp_red_f(p1,p2,rest)
-DP p1,p2;
-DP *rest;
+void dp_red_f(DP p1,DP p2,DP *rest)
 {
 	int i,n;
 	DL d1,d2,d;
 	MP m;
-	DP t,s,r,h;
+	DP t,s;
 	Obj a,b;
 
 	n = p1->nv;
@@ -784,11 +738,7 @@ DP *rest;
 	muld(CO,s,p2,&t); addd(CO,p1,t,rest);
 }
 
-void dp_red_mod(p0,p1,p2,mod,head,rest,dnp)
-DP p0,p1,p2;
-int mod;
-DP *head,*rest;
-P *dnp;
+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;
@@ -818,17 +768,13 @@ P *dnp;
 
 struct oEGT eg_red_mod;
 
-void _dp_red_mod_destructive(p1,p2,mod,rp)
-DP p1,p2;
-int mod;
-DP *rp;
+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,c2;
-	struct oEGT t0,t1;
 	extern int do_weyl;
 
 	n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl;
@@ -844,7 +790,8 @@ DP *rp;
 	_mulmd_dup(mod,s,p2,&t); _free_dp(s);
 #else
 	if ( do_weyl ) {
-		_weyl_mulmdm_dup(mod,p2,m,&t); _FREEMP(m);
+		_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);
 	}
@@ -852,7 +799,6 @@ DP *rp;
 /* get_eg(&t0); */
 	_addmd_destructive(mod,p1,t,rp);
 /* get_eg(&t1); add_eg(&eg_red_mod,&t0,&t1); */
-	_print_mp(NV(*rp),BDY(*rp));
 }
 
 /*
@@ -860,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;
@@ -923,12 +863,7 @@ P *dnp;
 
 /* nf computation over Z */
 
-void dp_nf_z(b,g,ps,full,multiple,rp)
-NODE b;
-DP g;
-DP *ps;
-int full,multiple;
-DP *rp;
+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;
@@ -999,15 +934,9 @@ DP *rp;
 
 /* nf computation over a field */
 
-void dp_nf_f(b,g,ps,full,rp)
-NODE b;
-DP g;
-DP *ps;
-int full;
-DP *rp;
+void dp_nf_f(NODE b,DP g,DP *ps,int full,DP *rp)
 {
 	DP u,p,d,s,t;
-	P dmy;
 	NODE l;
 	MP m,mr;
 	int i,n;
@@ -1058,12 +987,7 @@ DP *rp;
 
 /* nf computation over GF(mod) (only for internal use) */
 
-void dp_nf_mod(b,g,ps,mod,full,rp)
-NODE b;
-DP g;
-DP *ps;
-int mod,full;
-DP *rp;
+void dp_nf_mod(NODE b,DP g,DP *ps,int mod,int full,DP *rp)
 {
 	DP u,p,d,s,t;
 	P dmy;
@@ -1109,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;
@@ -1170,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;
@@ -1231,10 +1144,7 @@ DP *rp;
 
 /* reduction by linear base over a field */
 
-void dp_lnf_f(p1,p2,g,r1p,r2p)
-DP p1,p2;
-NODE g;
-DP *r1p,*r2p;
+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;
@@ -1263,11 +1173,7 @@ DP *r1p,*r2p;
 
 /* reduction by linear base over GF(mod) */
 
-void dp_lnf_mod(p1,p2,g,mod,r1p,r2p)
-DP p1,p2;
-NODE g;
-int mod;
-DP *r1p,*r2p;
+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;
@@ -1295,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;
@@ -1325,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;
@@ -1372,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;
@@ -1398,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;
@@ -1423,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;
@@ -1454,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;
 
@@ -1474,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;
@@ -1535,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;
@@ -1565,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);
 }
@@ -1584,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;
@@ -1601,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;
@@ -1619,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;
@@ -1632,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;
 
@@ -1647,8 +1522,7 @@ DP *rp;
 	}
 }
 
-void dp_rest(p,rp)
-DP p,*rp;
+void dp_rest(DP p,DP *rp)
 {
 	MP m;
 
@@ -1662,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;
 
@@ -1689,8 +1560,7 @@ DL dl1, dl2;
     return 1;
 }
 
-int dp_nt(p)
-DP p;
+int dp_nt(DP p)
 {
 	int i;
 	MP m;
@@ -1703,8 +1573,7 @@ DP p;
 	}
 }
 
-int dp_homogeneous(p)
-DP p;
+int dp_homogeneous(DP p)
 {
 	MP m;
 	int d;
@@ -1723,13 +1592,11 @@ DP p;
 	}
 }
 
-_print_mp(nv,m)
-int nv;
-MP m;
+void _print_mp(int nv,MP m)
 {
 	int i;
 
-	if ( m )
+	if ( !m )
 		return;
 	for ( ; m; m = NEXT(m) ) {
 		fprintf(stderr,"%d<",ITOS(C(m)));