===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.8
retrieving revision 1.19
diff -u -p -r1.8 -r1.19
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2000/12/08 06:43:09	1.8
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2001/09/19 09:10:34	1.19
@@ -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.18 2001/09/17 10:32:40 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
+#include "inline.h"
 #include "parse.h"
 #include "ox.h"
 
@@ -292,7 +293,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 {
@@ -569,6 +570,61 @@ DP *rp;
 	}
 }
 
+void _dp_sp_dup(p1,p2,rp)
+DP p1,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 += w[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(p1,p2,mod,rp)
 DP p1,p2;
 int mod;
@@ -585,12 +641,12 @@ DP *rp;
 	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;
+	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;
@@ -658,6 +714,8 @@ DP *rp;
 
 /*
  * m-reduction
+ * do content reduction over Z or Q(x,...)
+ * do nothing over finite fields
  *
  */
 
@@ -699,6 +757,33 @@ DP *multp;
 	*head = h; *rest = r; *dnp = (P)c2;
 }
 
+/* m-reduction over a field */
+
+void dp_red_f(p1,p2,rest)
+DP p1,p2;
+DP *rest;
+{
+	int i,n;
+	DL d1,d2,d;
+	MP m;
+	DP t,s,r,h;
+	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(p0,p1,p2,mod,head,rest,dnp)
 DP p0,p1,p2;
 int mod;
@@ -722,7 +807,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,6 +816,8 @@ P *dnp;
 	*head = h; *rest = r; *dnp = c2;
 }
 
+struct oEGT eg_red_mod;
+
 void _dp_red_mod_destructive(p1,p2,mod,rp)
 DP p1,p2;
 int mod;
@@ -740,17 +827,32 @@ DP *rp;
 	DL d1,d2,d;
 	MP m;
 	DP t,s;
-	int c,c1;
+	int c,c1,c2;
+	struct oEGT t0,t1;
+	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); */
 }
 
 /*
@@ -819,7 +921,9 @@ P *dnp;
 	*rp = d; *dnp = dn;
 }
 
-void dp_nf_ptozp(b,g,ps,full,multiple,rp)
+/* nf computation over Z */
+
+void dp_nf_z(b,g,ps,full,multiple,rp)
 NODE b;
 DP g;
 DP *ps;
@@ -842,8 +946,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,6 +997,67 @@ DP *rp;
 	*rp = d;
 }
 
+/* nf computation over a field */
+
+void dp_nf_f(b,g,ps,full,rp)
+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;
+	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(b,g,ps,mod,full,rp)
 NODE b;
 DP g;
@@ -1062,6 +1229,40 @@ DP *rp;
 	_dptodp(d,rp); _free_dp(d);
 }
 
+/* reduction by linear base over a field */
+
+void dp_lnf_f(p1,p2,g,r1p,r2p)
+DP p1,p2;
+NODE g;
+DP *r1p,*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(p1,p2,g,mod,r1p,r2p)
 DP p1,p2;
 NODE g;
@@ -1502,3 +1703,42 @@ DP p;
 	}
 }
 
+int dp_homogeneous(p)
+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;
+	}
+}
+
+_print_mp(nv,m)
+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");
+}