===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.22
retrieving revision 1.25
diff -u -p -r1.22 -r1.25
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2002/12/27 07:37:57	1.22
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2003/01/18 02:38:56	1.25
@@ -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.21 2002/01/28 00:54:41 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.24 2003/01/15 04:53:03 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -387,6 +387,28 @@ int have_sf_coef(P p)
 	}
 }
 
+void head_coef(P p,Num *c)
+{
+	if ( !p )
+		*c = 0;
+	else if ( NUM(p) )
+		*c = (Num)p;
+	else
+		head_coef(COEF(DC(p)),c);
+}
+
+void dp_monic_sf(DP p,DP *rp)
+{
+	Num c;
+
+	if ( !p )
+		*rp = 0;
+	else {
+		head_coef(BDY(p)->c,&c);
+		divsdc(CO,p,(P)c,rp);
+	}
+}
+
 void dp_prim(DP p,DP *rp)
 {
 	P t,g;
@@ -399,33 +421,32 @@ void dp_prim(DP p,DP *rp)
 
 	if ( !p )
 		*rp = 0;
-	else if ( dp_fcoeffs ) {
-		for ( m = BDY(p); m; m = NEXT(m) ) {
+	else if ( dp_fcoeffs == N_GFS ) {
+		for ( m = BDY(p); m; m = NEXT(m) )
 			if ( OID(m->c) == O_N ) {
 				/* GCD of coeffs = 1 */
-				*rp = p;
+				dp_monic_sf(p,rp);
 				return;
-			} else if ( have_sf_coef(m->c) ) {
-				/* compute GCD over the finite fieid */
-				for ( m = BDY(p), n = 0; m; m = NEXT(m), n++ );
-				w = (P *)ALLOCA(n*sizeof(P));
-				for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ )
-					w[i] = m->c;
-				gcdsf(CO,w,n,&g);
-				if ( NUM(g) )
-					*rp = p;
-				else {
-					for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
-						NEXTMP(mr0,mr); divsp(CO,m->c,g,&mr->c); mr->dl = m->dl;
-					}
-					NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar;
-				}
-				return;
+			} else break;
+		/* compute GCD over the finite fieid */
+		for ( m = BDY(p), n = 0; m; m = NEXT(m), n++ );
+		w = (P *)ALLOCA(n*sizeof(P));
+		for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ )
+			w[i] = m->c;
+		gcdsf(CO,w,n,&g);
+		if ( NUM(g) )
+			dp_monic_sf(p,rp);
+		else {
+			for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
+				NEXTMP(mr0,mr); divsp(CO,m->c,g,&mr->c); mr->dl = m->dl;
 			}
+			NEXT(mr) = 0; MKDP(p->nv,mr0,p1); p1->sugar = p->sugar;
+			dp_monic_sf(p1,rp);
 		}
-		/* all coeffs are poly over Q */
+		return;
+	} else if ( dp_fcoeffs )
 		*rp = p;
-	} else if ( NoGCD )
+	else if ( NoGCD )
 		dp_ptozp(p,rp);
 	else {
 		dp_ptozp(p,&p1); p = p1;
@@ -728,13 +749,18 @@ void dp_red(DP p0,DP p1,DP p2,DP *head,DP *rest,P *dnp
 	Q c,c1,c2;
 	N gn,tn;
 	P g,a;
+	P p[2];
 
 	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];
 	c1 = (Q)BDY(p1)->c; c2 = (Q)BDY(p2)->c;
-	if ( dp_fcoeffs ) {
+	if ( dp_fcoeffs == N_GFS ) {
+		p[0] = (P)c1; p[1] = (P)c2;
+		gcdsf(CO,p,2,&g);
+		divsp(CO,(P)c1,g,&a); c1 = (Q)a; divsp(CO,(P)c2,g,&a); c2 = (Q)a;
+	} else if ( dp_fcoeffs ) {
 		/* do nothing */
 	} else if ( INT(c1) && INT(c2) ) {
 		gcdn(NM(c1),NM(c2),&gn);
@@ -1258,6 +1284,27 @@ void dp_nf_tab_mod(DP p,LIST *tab,int mod,DP *rp)
 			i++;
 		mulmdc(CO,mod,(DP)BDY(NEXT(BDY(tab[i]))),m->c,&t);
 		addmd(CO,mod,s,t,&u); s = u;
+	}
+	*rp = s;
+}
+
+void dp_nf_tab_f(DP p,LIST *tab,DP *rp)
+{
+	DP s,t,u;
+	MP m;
+	DL h;
+	int i,n;
+
+	if ( !p ) {
+		*rp = p; return;
+	}
+	n = p->nv;
+	for ( s = 0, i = 0, m = BDY(p); m; m = NEXT(m) ) {
+		h = m->dl;
+		while ( !dl_equal(n,h,BDY((DP)BDY(BDY(tab[i])))->dl ) )
+			i++;
+		muldc(CO,(DP)BDY(NEXT(BDY(tab[i]))),m->c,&t);
+		addd(CO,s,t,&u); s = u;
 	}
 	*rp = s;
 }