===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2003/01/04 09:06:15	1.23
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2003/11/27 07:53:53	1.26
@@ -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.22 2002/12/27 07:37:57 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.25 2003/01/18 02:38:56 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;
@@ -403,7 +425,7 @@ void dp_prim(DP p,DP *rp)
 		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 break;
 		/* compute GCD over the finite fieid */
@@ -413,12 +435,13 @@ void dp_prim(DP p,DP *rp)
 			w[i] = m->c;
 		gcdsf(CO,w,n,&g);
 		if ( NUM(g) )
-			*rp = p;
+			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,*rp); (*rp)->sugar = p->sugar;
+			NEXT(mr) = 0; MKDP(p->nv,mr0,p1); p1->sugar = p->sugar;
+			dp_monic_sf(p1,rp);
 		}
 		return;
 	} else if ( dp_fcoeffs )
@@ -1265,6 +1288,27 @@ void dp_nf_tab_mod(DP p,LIST *tab,int mod,DP *rp)
 	*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;
+}
+
 /*
  * setting flags
  *
@@ -1652,3 +1696,38 @@ void _print_mp(int nv,MP m)
 	}
 	fprintf(stderr,"\n");
 }
+
+static int cmp_mp_nvar;
+
+int comp_mp(MP *a,MP *b)
+{
+	return -(*cmpdl)(cmp_mp_nvar,(*a)->dl,(*b)->dl);
+}
+
+void dp_sort(DP p,DP *rp)
+{
+	MP t,mp,mp0;
+	int i,n;
+	DP r;
+	MP *w;
+
+	if ( !p ) {
+		*rp = 0;
+		return;
+	}
+	for ( t = BDY(p), n = 0; t; t = NEXT(t), n++ );
+	w = (MP *)ALLOCA(n*sizeof(MP));
+	for ( t = BDY(p), i = 0; i < n; t = NEXT(t), i++ )
+		w[i] = t;
+	cmp_mp_nvar = NV(p);
+	qsort(w,n,sizeof(MP),(int (*)(const void *,const void *))comp_mp);
+	mp0 = 0;
+	for ( i = n-1; i >= 0; i-- ) {
+		NEWMP(mp); mp->dl = w[i]->dl; C(mp) = C(w[i]);
+		NEXT(mp) = mp0; mp0 = mp;
+	}
+	MKDP(p->nv,mp0,r);
+	r->sugar = p->sugar;
+	*rp = r;
+}
+