===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Hgfs.c,v
retrieving revision 1.6
retrieving revision 1.18
diff -u -p -r1.6 -r1.18
--- OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/06/25 06:05:16	1.6
+++ OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/10/09 01:36:10	1.18
@@ -1,32 +1,30 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.5 2001/06/25 04:11:42 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.17 2001/09/03 07:01:06 noro Exp $ */
 
 #include "ca.h"
 
-struct p_pair {
-	UM p0;
-	UM p1;
-	struct p_pair *next;
-};
+void lnfsf(int n,UM p0,UM p1,struct p_pair *list,UM np0,UM np1);
 
-void canzassf(UM,int,UM *);
-void lnfsf(int,UM,UM,struct p_pair *,UM,UM);
-void minipolysf(UM,UM,UM);
-void czsfum(UM,UM *);
-void gensqfrsfum(UM,DUM);
+int comp_dum(DUM a,DUM b)
+{
+	if ( DEG(a->f) > DEG(b->f) )
+		return -1;
+	else if ( DEG(a->f) < DEG(b->f) )
+		return 1;
+	else
+		return 0;
+}
 
-void fctrsf(p,dcp)
-P p;
-DCP *dcp;
+void fctrsf(P p,DCP *dcp)
 {
 	int n,i,j,k;
 	DCP dc,dc0;
 	P lc;
-	P zp;
 	UM mp;
 	UM *tl;
+	Obj obj;
 	struct oDUM *udc,*udc1;
 
-	simp_ff(p,&zp); p = zp;
+	simp_ff((Obj)p,&obj); p = (P)obj;
 	if ( !p ) {
 		*dcp = 0; return;
 	}
@@ -61,6 +59,10 @@ DCP *dcp;
 			}
 		}
 	udc = udc1;
+	for ( i = 0; udc[i].f; i++ );
+	qsort(udc,i,sizeof(struct oDUM),
+		(int (*)(const void *,const void *))comp_dum);
+
 	NEWDC(dc0); COEF(dc0) = lc; DEG(dc0) = ONE; dc = dc0;
 	for ( n = 0; udc[n].f; n++ ) {
 		NEWDC(NEXT(dc)); dc = NEXT(dc);
@@ -69,9 +71,7 @@ DCP *dcp;
 	NEXT(dc) = 0; *dcp = dc0;
 }
 
-void gensqfrsfum(p,dc)
-UM p;
-struct oDUM *dc;
+void gensqfrsfum(UM p,struct oDUM *dc)
 {
 	int n,i,j,d,mod;
 	UM t,s,g,f,f1,b;
@@ -124,9 +124,7 @@ struct oDUM *dc;
 	}
 }
 
-void randsfum(d,p)
-int d;
-UM p;
+void randsfum(int d,UM p)
 {
 	int i;
 
@@ -136,9 +134,7 @@ UM p;
 	p->d = i;
 }
 
-void pwrmodsfum(p,e,f,pr)
-int e;
-UM p,f,pr;
+void pwrmodsfum(UM p,int e,UM f,UM pr)
 {
 	UM wt,ws,q;
 
@@ -166,9 +162,7 @@ UM p,f,pr;
 	}
 }
 
-void spwrsfum(m,f,e,r)
-UM f,m,r;
-N e;
+void spwrsfum(UM m,UM f,N e,UM r)
 {
 	UM t,s,q;
 	N e1;
@@ -190,9 +184,7 @@ N e;
 	}
 }
 
-void tracemodsfum(m,f,e,r)
-UM f,m,r;
-int e;
+void tracemodsfum(UM m,UM f,int e,UM r)
 {
 	UM t,s,q,u;
 	int i;
@@ -212,10 +204,7 @@ int e;
 	cpyum(s,r);
 }
 
-void make_qmatsf(p,tab,mp)
-UM p;
-UM *tab;
-int ***mp;
+void make_qmatsf(UM p,UM *tab,int ***mp)
 {
 	int n,i,j;
 	int *c;
@@ -236,10 +225,7 @@ int ***mp;
 		mat[i][i] = _subsf(mat[i][i],one);
 }
 
-void nullsf(mat,n,ind)
-int **mat;
-int *ind;
-int n;
+void nullsf(int **mat,int n,int *ind)
 {
 	int i,j,l,s,h,inv;
 	int *t,*u;
@@ -271,11 +257,7 @@ int n;
 	}
 }
 
-void null_to_solsf(mat,ind,n,r)
-int **mat;
-int *ind;
-int n;
-UM *r;
+void null_to_solsf(int **mat,int *ind,int n,UM *r)
 {
 	int i,j,k,l;
 	int *c;
@@ -304,8 +286,7 @@ nullsf(mat,n,ind)
 null_to_solsf(ind,n,r)
 */
 
-void czsfum(f,r)
-UM f,*r;
+void czsfum(UM f,UM *r)
 {
 	int i,j;
 	int d,n,ord;
@@ -359,10 +340,7 @@ UM f,*r;
 	r[j] = 0;
 }
 
-int berlekampsf(p,df,tab,r)
-UM p;
-int df;
-UM *tab,*r;
+int berlekampsf(UM p,int df,UM *tab,UM *r)
 {
 	int n,i,j,k,nf,d,nr;
 	int **mat;
@@ -408,10 +386,12 @@ UM *tab,*r;
 			}
 		}
 	}
+	/* NOT REACHED */
+	error("berlekampsf : cannot happen");
+	return 0;
 }
 
-void minipolysf(f,p,mp)
-UM f,p,mp;
+void minipolysf(UM f,UM p,UM mp)
 {
 	struct p_pair *list,*l,*l1,*lprev;	
 	int n,d;
@@ -446,13 +426,9 @@ UM f,p,mp;
 	}
 }
 
-void lnfsf(n,p0,p1,list,np0,np1)
-int n;
-UM p0,p1;
-struct p_pair *list;
-UM np0,np1;
+void lnfsf(int n,UM p0,UM p1,struct p_pair *list,UM np0,UM np1)
 {
-	int inv,h,d1;
+	int h,d1;
 	UM t0,t1,s0,s1;
 	struct p_pair *l;
 
@@ -469,12 +445,10 @@ UM np0,np1;
 	}
 }
 
-int find_rootsf(p,root)
-UM p;
-int *root;
+int find_rootsf(UM p,int *root)
 {
 	UM *r;
-	int i,j,n;
+	int i,n;
 
 	n = DEG(p);
 	r = ALLOCA((DEG(p))*sizeof(UM));
@@ -484,14 +458,12 @@ int *root;
 	return n;
 }
 
-void canzassf(f,d,r)
-UM f,*r;
-int d;
+void canzassf(UM f,int d,UM *r)
 {
 	UM t,s,u,w,g,o;
 	N n1,n2,n3,n4,n5;
 	UM *b;
-	int n,m,i,q,ed;
+	int n,q,ed;
 
 	if ( DEG(f) == d ) {
 		r[0] = UMALLOC(d); cpyum(f,r[0]);
@@ -532,31 +504,26 @@ int d;
 
 int sfberle(VL,P,int,GFS *,DCP *);
 void sfgcdgen(P,ML,ML *);
-void sfhenmain(LUM,ML,ML,ML *);
-void ptosflum(int,P,LUM);
 void sfhenmain2(BM,UM,UM,int,BM *);
 void ptosfbm(int,P,BM);
 
 /* f = f(x,y) */
 
-void sfhensel(count,f,x,listp)
-int count;
-P f;
-V x;
-ML *listp;
+void sfhensel(int count,P f,V x,GFS *evp,P *sfp,ML *listp)
 {
-	int i,j;
-	int fn,n,bound;
+	int i;
+	int fn;
 	ML rlist;
 	BM fl;
 	VL vl,nvl;
 	V y;
-	int dx,dy,mev;
+	int dx,dy;
 	GFS ev;
-	P f1,t,yev,c;
+	P f1,t,c,sf;
 	DCP dc;
-	UM w,w1,q,fm,hm;
+	UM q,fm,hm;
 	UM *gm;
+	struct oEGT tmp0,tmp1,eg_hensel,eg_hensel_t;
 
 	clctv(CO,f,&vl);
 	if ( vl->v != x ) {
@@ -587,62 +554,72 @@ ML *listp;
 		ptosfum(dc->c,gm[i]);
 	}
 
-	bound = dy+1;
 	/* f(x,y) -> f(x,y+ev) */
-	fl = BMALLOC(dx,bound);
-	ptosfbm(bound,f,fl);
-	shiftsfbm(bound,fl,FTOIF(CONT(ev)));
+	fl = BMALLOC(dx,dy);
+	ptosfbm(dy,f,fl);
+	if ( ev ) shiftsfbm(fl,FTOIF(CONT(ev)));
 
+	/* sf = f(x+ev) */
+	sfbmtop(fl,x,y,&sf);
+
 	/* fm = fl mod y */
 	fm = W_UMALLOC(dx);
 	cpyum(COEF(fl)[0],fm);
 	hm = W_UMALLOC(dx);
 
 	q = W_UMALLOC(dx);
-	rlist = MLALLOC(fn); rlist->n = fn; rlist->bound = bound;
-	for ( i = fn-1; i >= 1; i-- ) {
-		fprintf(stderr,"%d\n",i);
+	rlist = MLALLOC(fn); rlist->n = fn; rlist->bound = dy;
+	fprintf(asir_out,"%d candidates\n",fn);
+	init_eg(&eg_hensel);
+	for ( i = 0; i < fn-1; i++ ) {
+		fprintf(asir_out,"deg(fm) = %d, deg(gm[%d]) = %d\n",
+			DEG(fm),i,DEG(gm[i]));
+		init_eg(&eg_hensel_t);
+		get_eg(&tmp0);
 		/* fl = gm[i]*hm mod y */
 		divsfum(fm,gm[i],hm);
-		/* fl is replaced by the cofactor of gk mod y^bound */
+		/* fl is replaced by the cofactor of gk mod y^dy */
 		/* rlist->c[i] = gk */
-		sfhenmain2(fl,gm[i],hm,bound,(BM *)&rlist->c[i]);
+		sfhenmain2(fl,gm[i],hm,dy,(BM *)&rlist->c[i]);
 		cpyum(hm,fm);
+		get_eg(&tmp1); add_eg(&eg_hensel_t,&tmp0,&tmp1);
+		add_eg(&eg_hensel,&tmp0,&tmp1);
+		print_eg("Hensel",&eg_hensel_t);
+		fprintf(asir_out,"\n");
 	}
-	/* finally, fl must be the lift of gm[0] */
+	print_eg("Hensel total",&eg_hensel);
+	fprintf(asir_out,"\n");
+	/* finally, fl must be the lift of gm[fn-1] */
 	rlist->c[i] = fl;
 
+#if 0
 	/* y -> y-a */
-	w = W_UMALLOC(bound);
-	w1 = W_UMALLOC(bound);
 	mev = _chsgnsf(FTOIF(CONT(ev)));
 	for ( i = 0; i < fn; i++ )
-		shiftsfbm(bound,(BM)(rlist->c[i]),mev);
+		shiftsfbm((BM)(rlist->c[i]),mev);
+#endif
+	*evp = ev;
+	*sfp = sf;
 	*listp = rlist;
 }
 
 /* main variable of f = x */
 
-int sfberle(vl,f,count,ev,dcp)
-VL vl;
-P f;
-int count;
-GFS *ev;
-DCP *dcp;
+int sfberle(VL vl,P f,int count,GFS *ev,DCP *dcp)
 {
 	UM wf,wf1,wf2,wfs,gcd;
-	ML flist;
-	int fn,fn1,n;
+	int fn,n;
 	GFS m,fm;
 	DCP dc,dct,dc0;
 	VL nvl;
 	V x,y;
-	P g,lc,lc0,f0;
+	P lc,lc0,f0;
+	Obj obj;
 	int j,q1,index,i;
 
 	clctv(vl,f,&nvl); vl = nvl;
 	x = vl->v; y = vl->next->v;
-	simp_ff(f,&g); g = f;
+	simp_ff((Obj)f,&obj); f = (P)obj;
 	n = QTOS(DEG(DC(f)));
 	wf = W_UMALLOC(n); wf1 = W_UMALLOC(n); wf2 = W_UMALLOC(n);
 	wfs = W_UMALLOC(n); gcd = W_UMALLOC(n);
@@ -677,9 +654,7 @@ DCP *dcp;
 	}
 }
 
-void sfgcdgen(f,blist,clistp)
-P f;
-ML blist,*clistp;
+void sfgcdgen(P f,ML blist,ML *clistp)
 {
 	int i;
 	int n,d,np;
@@ -706,144 +681,58 @@ ML blist,*clistp;
 	}
 }
 
-/*
-	sfhenmain(fl,bqlist,cqlist,listp)
-*/
+/* f = g0*h0 mod y -> f = gk*hk mod y^(dy+1), f is replaced by hk */
 
-void sfhenmain(f,bqlist,cqlist,listp)
-LUM f;
-ML bqlist,cqlist,*listp;
+void sfhenmain2(BM f,UM g0,UM h0,int dy,BM *gp)
 {
-	int i,j,k;
-	int *px,*py;
-	int **pp,**pp1;
-	int n,np,bound,dr,tmp;
-	UM wt,wq0,wq,wr,wm,wm0,wa,q;
-	LUM wb0,wb1,tlum;
-	UM *b,*c;
-	LUM *l;
-	ML list;
-
-	n = DEG(f); np = bqlist->n; bound = bqlist->bound;
-	*listp = list = MLALLOC(n);
-	list->n = np; list->bound = bound;
-	W_LUMALLOC(n,bound,wb0); W_LUMALLOC(n,bound,wb1);
-	wt = W_UMALLOC(n); wq0 = W_UMALLOC(n); wq = W_UMALLOC(n);
-	wr = W_UMALLOC(n); wm = W_UMALLOC(2*n); wm0 = W_UMALLOC(2*n);
-	wa = W_UMALLOC(2*n); q = W_UMALLOC(2*n);
-	b = (UM *)bqlist->c; c = (UM *)cqlist->c; l = (LUM *)list->c; 
-	for ( i = 0; i < np; i++ ) {
-		l[i] = LUMALLOC(DEG(b[i]),bound);
-		for ( j = DEG(b[i]), pp = COEF(l[i]), px = COEF(b[i]); j >= 0; j-- ) 
-			pp[j][0] = px[j];
-	}
-	for ( i = 1; i < bound; i++ ) {
-		fprintf(stderr,".");
-		/* at this point, f = l[0]*l[1]*...*l[np-1] mod y^i */
-		mulsflum(i+1,l[0],l[1],wb0);
-		for ( j = 2; j < np; j++ ) {
-			mulsflum(i+1,l[j],wb0,wb1);
-			tlum = wb0; wb0 = wb1; wb1 = tlum;
-		}
-#if 0
-		/* check */
-		for ( j = 0, pp = COEF(f), pp1 = COEF(wb0); j <= n; j++ )
-			for ( k = 0; k < i; k++ )
-				if ( pp[j][k] != pp1[j][k] )
-					error("henmain : cannot happen");
-#endif
-		for ( j = n, px = COEF(wt); j >= 0; j-- )
-			px[j] = 0;
-		for ( j = n, pp = COEF(f), pp1 = COEF(wb0); j >= 0; j-- )
-			COEF(wt)[j] = _subsf(pp[j][i],pp1[j][i]);
-		degum(wt,n);
-		for ( j = n, px = COEF(wq0); j >= 0; j-- )
-			px[j] = 0;
-		for ( j = 1; j < np; j++ ) {
-			mulsfum(wt,c[j],wm); dr = divsfum(wm,b[j],q);
-			for ( k = DEG(q), px = COEF(wq0), py = COEF(q); k >= 0; k-- ) 
-				px[k] = _addsf(px[k],py[k]);
-			for ( k = dr, pp = COEF(l[j]), px = COEF(wm); k >= 0; k-- ) 
-				pp[k][i] = px[k];
-		}
-		degum(wq0,n); mulsfum(wq0,b[0],wm);
-		mulsfum(wt,c[0],wm0); addsfum(wm,wm0,wa);
-		for ( j = DEG(wa), pp = COEF(l[0]), px = COEF(wa); j >= 0; j-- ) 
-			pp[j][i] = px[j];
-		for ( j = n, px = COEF(wq0); j >= 0; j-- ) 
-			px[j] = 0;
-	}
-	fprintf(stderr,"\n");
-}
-
-/* f = g0*h0 mod y -> f = gk*hk mod y^bound, f is replaced by hk */
-
-void sfhenmain2(f,g0,h0,bound,gp)
-BM f;
-UM g0,h0;
-int bound;
-BM *gp;
-{
-	int i,j,k,l;
-	int *px,*py;
-	int **pp,**pp1;
-	int n,np,dr,tmp;
-	UM wt,wa,wb,wq,wm,q,w1,w2,wh1,wg1,ws;
+	int i,k;
+	int dx;
+	UM wt,wa,wb,q,w1,w2,wh1,wg1,ws;
 	UM wc,wd,we,wz;
 	BM wb0,wb1;
-	int ng,nh;
+	int dg,dh;
 	BM fk,gk,hk;
 	
-	n = f->d;
-	ng = g0->d;
-	nh = h0->d;
+	if ( DEG(f) < dy )
+		error("sfhenmain2 : invalid input");
 
-	W_BMALLOC(n,bound,wb0); W_BMALLOC(n,bound,wb1);
-	wt = W_UMALLOC(n); ws = W_UMALLOC(n);
-	wq = W_UMALLOC(n); q = W_UMALLOC(2*n);
-	wg1 = W_UMALLOC(2*n); wh1 = W_UMALLOC(2*n);
+	dx = degbm(f);
+	dg = DEG(g0);
+	dh = DEG(h0);
 
+	W_BMALLOC(dx,dy,wb0); W_BMALLOC(dx,dy,wb1);
+	wt = W_UMALLOC(dx); ws = W_UMALLOC(dx); q = W_UMALLOC(2*dx);
+	wg1 = W_UMALLOC(2*dx); wh1 = W_UMALLOC(2*dx);
+
 	/* fk = gk*hk mod y^k */
-	W_BMALLOC(n,bound,fk); cpyum(COEF(f)[0],COEF(fk)[0]);
-	gk = BMALLOC(ng,bound); cpyum(g0,COEF(gk)[0]);
-	W_BMALLOC(nh,bound,hk);
+	W_BMALLOC(dx,dy,fk);
+	cpyum(COEF(f)[0],COEF(fk)[0]);
+	gk = BMALLOC(dg,dy);
+	cpyum(g0,COEF(gk)[0]);
+	W_BMALLOC(dh,dy,hk);
 	cpyum(h0,COEF(hk)[0]);
 
-	wc = W_UMALLOC(2*n); wd = W_UMALLOC(2*n);
-	we = W_UMALLOC(2*n); wz = W_UMALLOC(2*n);
+	wc = W_UMALLOC(2*dx); wd = W_UMALLOC(2*dx);
+	we = W_UMALLOC(2*dx); wz = W_UMALLOC(2*dx);
 
 	/* compute wa,wb s.t. wa*g0+wb*h0 = 1 mod y */
-	w1 = W_UMALLOC(ng); cpyum(g0,w1);
-	w2 = W_UMALLOC(nh); cpyum(h0,w2);
-	wa = W_UMALLOC(2*n); wb = W_UMALLOC(2*n);  /* XXX */
+	w1 = W_UMALLOC(dg); cpyum(g0,w1);
+	w2 = W_UMALLOC(dh); cpyum(h0,w2);
+	wa = W_UMALLOC(2*dx); wb = W_UMALLOC(2*dx);  /* XXX */
 	eucsfum(w1,w2,wa,wb);
 
-#if 0
-	mulsfum(wa,g0,wc); mulsfum(wb,h0,wd); addsfum(wc,wd,we);
-	if ( DEG(we) != 0 || COEF(we)[0] != _onesf() )
-			error("henmain2 : cannot happen(euc)");
-#endif
-
-	fprintf(stderr,"bound=%d\n",bound);
-	for ( k = 1; k < bound; k++ ) {
+	fprintf(stderr,"dy=%d\n",dy);
+	for ( k = 1; k <= dy; k++ ) {
 		fprintf(stderr,".");
 
 		/* at this point, f = gk*hk mod y^k */
-#if 0
-		for ( j = 0; j < k; j++ )
-			if ( !isequalum(COEF(f)[j],COEF(fk)[j]) )
-					error("henmain2 : cannot happen(history)");
-#endif
 
 		/* clear wt */
-		bzero(COEF(wt),(n+1)*sizeof(int));
+		clearum(wt,dx);
 
 		/* wt = (f-gk*hk)/y^k */
 		subsfum(COEF(f)[k],COEF(fk)[k],wt);
 		
-		/* clear wq */
-		bzero(COEF(wq),(n+1)*sizeof(int));
-
 		/* compute wf1,wg1 s.t. wh1*g0+wg1*h0 = wt */
 		mulsfum(wa,wt,wh1); DEG(wh1) = divsfum(wh1,h0,q);
 		mulsfum(wh1,g0,wc); subsfum(wt,wc,wd); DEG(wd) = divsfum(wd,h0,wg1);
@@ -859,31 +748,29 @@ BM *gp;
 			error("henmain2 : cannot happen");
 #endif
 
-		/* fk += ((wg1*hk+wh1*gk)*y^k+wg1*wh1*y^(2*k) mod y^bound */
+		/* fk += ((wg1*hk+wh1*gk)*y^k+wg1*wh1*y^(2*k) mod y^(dy+1) */
 		/* wb0 = wh1*y^k */
-		clearsfbm(bound,n,wb0);
-		DEG(wb0) = bound;
+		clearbm(dx,wb0);
 		cpyum(wh1,COEF(wb0)[k]);
 
-		/* wb1 = gk*wb0 mod y^bound */
-		clearsfbm(bound,n,wb1);
-		mulsfbm(bound,gk,wb0,wb1);
+		/* wb1 = gk*wb0 mod y^(dy+1) */
+		clearbm(dx,wb1);
+		mulsfbm(gk,wb0,wb1);
 		/* fk += wb1 */
-		addtosfbm(bound,wb1,fk);
+		addtosfbm(wb1,fk);
 
 		/* wb0 = wg1*y^k */
-		clearsfbm(bound,n,wb0);
-		DEG(wb0) = bound;
+		clearbm(dx,wb0);
 		cpyum(wg1,COEF(wb0)[k]);
 
-		/* wb1 = hk*wb0 mod y^bound */
-		clearsfbm(bound,n,wb1);
-		mulsfbm(bound,hk,wb0,wb1);
+		/* wb1 = hk*wb0 mod y^(dy+1) */
+		clearbm(dx,wb1);
+		mulsfbm(hk,wb0,wb1);
 		/* fk += wb1 */
-		addtosfbm(bound,wb1,fk);
+		addtosfbm(wb1,fk);
 
-		/* fk += wg1*wh1*y^(2*k) mod y^bound */
-		if ( 2*k < bound ) {
+		/* fk += wg1*wh1*y^(2*k) mod y^(dy+1) */
+		if ( 2*k <= dy ) {
 			mulsfum(wg1,wh1,wt); addsfum(COEF(fk)[2*k],wt,ws);
 			cpyum(ws,COEF(fk)[2*k]);
 		}
@@ -894,104 +781,513 @@ BM *gp;
 	}
 	fprintf(stderr,"\n");
 	*gp = gk;
-	DEG(f) = bound;
-	for ( i = 0; i < bound; i++ )
+	DEG(f) = dy;
+	for ( i = 0; i <= dy; i++ )
 		cpyum(COEF(hk)[i],COEF(f)[i]);
 }
 
-void ptosflum(bound,f,fl)
-int bound;
-P f;
-LUM fl;
+/* fl->c[i] = coef_y(f,i) */
+
+void ptosfbm(int dy,P f,BM fl)
 {
 	DCP dc;
-	int **pp;
-	int d;
+	int d,i,dx;
 	UM t;
 
-	t = UMALLOC(bound);
-	for ( dc = DC(f), pp = COEF(fl); dc; dc = NEXT(dc) ) {
+	dx = QTOS(DEG(DC(f)));
+	if ( DEG(fl) < dy )
+		error("ptosfbm : invalid input");
+	DEG(fl) = dy;
+	clearbm(dx,fl);
+	t = UMALLOC(dy);
+	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
 		d = QTOS(DEG(dc));
 		ptosfum(COEF(dc),t);
-		bcopy(t->c,pp[d],(t->d+1)*sizeof(int));
+		for ( i = 0; i <= DEG(t); i++ )
+			COEF(COEF(fl)[i])[d] = COEF(t)[i];
 	}
+	for ( i = 0; i <= dy; i++ )
+		degum(COEF(fl)[i],dx);
 }
 
-/* fl->c[i] = coef_y(f,i) */
+/* x : main variable */
 
-void ptosfbm(bound,f,fl)
-int bound;
-P f;
-BM fl;
+void sfbmtop(BM f,V x,V y,P *fp)
 {
+	UM *c;
+	int i,j,d,a,dy;
+	GFS b;
+	DCP dc0,dc,dct;
+
+	dy = DEG(f);
+	c = COEF(f);
+	d = degbm(f);
+
+	dc0 = 0;
+	for ( i = 0; i <= d; i++ ) {
+		dc = 0;
+		for ( j = 0; j <= dy; j++ ) {
+			if ( DEG(c[j]) >= i && (a = COEF(c[j])[i]) ) {
+				NEWDC(dct);
+				STOQ(j,DEG(dct));
+				MKGFS(IFTOF(a),b);
+				COEF(dct) = (P)b;
+				NEXT(dct) = dc;
+				dc = dct;
+			}
+		}
+		if ( dc ) {
+			NEWDC(dct);
+			STOQ(i,DEG(dct));
+			MKP(y,dc,COEF(dct));
+			NEXT(dct) = dc0;
+			dc0 = dct;
+		}
+	}
+	if ( dc0 )
+		MKP(x,dc0,*fp);
+	else
+		*fp = 0;
+}
+
+void sfsqfr(P f,DCP *dcp)
+{
+	Obj obj;
 	DCP dc;
-	int d,i,n;
-	UM t;
+	VL vl;
 
-	DEG(fl) = bound;
-	t = UMALLOC(bound);
-	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
-		d = QTOS(DEG(dc));
-		ptosfum(COEF(dc),t);
-		for ( i = 0; i <= DEG(t); i++ )
-			COEF(COEF(fl)[i])[d] = COEF(t)[i];
+	simp_ff((Obj)f,&obj); f = (P)obj;
+	clctv(CO,f,&vl);
+	if ( !vl ) {
+		/* f is a const */
+		NEWDC(dc); DEG(dc) = ONE; COEF(dc) = f; NEXT(dc) = 0; *dcp = dc;
+	} else if ( !NEXT(vl) )
+		sfusqfr(f,dcp);
+	else if ( !NEXT(NEXT(vl)) )
+		sfbsqfr(f,vl->v,NEXT(vl)->v,dcp);
+	else
+		error("sfsqfr : not implemented yet");
+}
+
+void sfusqfr(P f,DCP *dcp)
+{
+	DCP dc,dct;
+	struct oDUM *udc;
+	V x;
+	P lc;
+	int n,i;
+	UM mf;
+
+	x = VR(f);
+	n = getdeg(x,f);
+	mf = W_UMALLOC(n);
+	ptosfum(f,mf);
+	lc = COEF(DC(f));
+	if ( !_isonesf(COEF(mf)[n]) ) {
+		monicsfum(mf);
 	}
-	n = UDEG(f);
-	for ( i = 0; i <= n; i++ )
-		degum(COEF(fl)[i],n);
+	W_CALLOC(n+1,struct oDUM,udc);
+	gensqfrsfum(mf,udc);
+	for ( i = 0, dc = 0; udc[i].f; i++ ) {
+		NEWDC(dct); STOQ(udc[i].n,DEG(dct));
+		sfumtop(x,udc[i].f,&COEF(dct));
+		NEXT(dct) = dc; dc = dct;
+	}
+	NEWDC(dct); DEG(dct) = ONE; COEF(dct) = (P)lc; NEXT(dct) = dc;
+	*dcp = dct;
 }
 
-/* x : main variable */
+void sfbsqfr(P f,V x,V y,DCP *dcp)
+{
+	P t,rf,cx,cy;
+	VL vl,rvl;
+	DCP dcx,dcy;
+	struct oVL vl0,vl1;
 
-void sflumtop(bound,fl,x,y,fp)
-int bound;
-LUM fl;
-V x,y;
-P *fp;
+	/* vl = [x,y] */
+	vl0.v = x; vl0.next = &vl1; vl1.v = y; vl1.next = 0; vl = &vl0;
+	/* cy(y) = cont(f,x), f /= cx */
+	cont_pp_sfp(vl,f,&cy,&t); f = t;
+	/* rvl = [y,x] */
+	reordvar(vl,y,&rvl); reorderp(rvl,vl,f,&rf);
+	/* cx(x) = cont(rf,y), Rf /= cy */
+	cont_pp_sfp(rvl,rf,&cx,&t); rf = t;
+	reorderp(vl,rvl,rf,&f);
+
+	/* f -> cx*cy*f */
+	sfusqfr(cx,&dcx);
+	sfusqfr(cy,&dcy);
+}
+
+void sfdtest(P,ML,V,V,DCP *);
+
+void sfbfctr(P f,V x,V y,DCP *dcp)
 {
-	int i,j,n;
-	int **c;
-	UM w;
-	int *coef;
+	ML list;
+	P sf;
+	GFS ev;
 	DCP dc,dct;
+	BM fl;
+	int dx,dy;
 
-	n = fl->d;
-	c = fl->c;
-	w = W_UMALLOC(bound);
-	for ( i = 0, dc = 0; i <= n; i++ ) {
-		coef = c[i];
-		for ( j = bound-1; j >= 0 && coef[j] == 0; j-- );
-		if ( j < 0 )
+	/* sf(x) = f(x+ev) = list->c[0]*list->c[1]*... */
+	sfhensel(5,f,x,&ev,&sf,&list);
+	if ( list->n == 0 )
+		error("sfbfctr : short of evaluation points");
+	else if ( list->n == 1 ) {
+		/* f is irreducible */
+		NEWDC(dc); DEG(dc) = ONE; COEF(dc) = f; NEXT(dc) = 0;
+		*dcp = dc;
+		return;
+	}
+	sfdtest(sf,list,x,y,&dc);
+	if ( ev ) {
+		dx = getdeg(x,sf);
+		dy = getdeg(y,sf);
+		W_BMALLOC(dx,dy,fl);
+		for ( dct = dc; dct; dct = NEXT(dct) ) {
+			ptosfbm(dy,COEF(dct),fl);
+			shiftsfbm(fl,_chsgnsf(FTOIF(CONT(ev))));
+			sfbmtop(fl,x,y,&COEF(dct));
+		}
+	}
+	*dcp = dc;
+}
+
+/* f = f(x,y) = list->c[0]*list->c[1]*... mod y^(list->bound+1) */
+
+void sfdtest(P f,ML list,V x,V y,DCP *dcp)
+{
+	int np,dx,dy;
+	int i,j,k;
+	int *win;
+	P g,lcg,factor,cofactor,lcyx;
+	P csum;
+	DCP dcf,dcf0,dc;
+	BM *c;
+	BM lcy;
+	UM lcg0;
+	ML wlist;
+	struct oVL vl1,vl0;
+	VL vl;
+	int z;
+
+	/* vl = [x,y] */
+	vl0.v = x; vl0.next = &vl1; vl1.v = y; vl1.next = 0; vl = &vl0;
+
+	/* setup various structures and arrays */
+	dx = getdeg(x,f);
+	dy = getdeg(y,f);
+	np = list->n;
+	win = W_ALLOC(np+1);
+	wlist = W_MLALLOC(np);
+	wlist->n = list->n;
+	wlist->bound = dy;
+	c = (BM *)COEF(wlist);
+	bcopy((char *)COEF(list),(char *)c,(int)(sizeof(BM)*np));
+
+	lcg0 = W_UMALLOC(2*dy);
+
+	/* initialize g by f */
+	g = f;
+
+	/* initialize lcg */
+	mulp(vl,g,COEF(DC(g)),&lcg);
+
+	/* initialize lcg0 */
+	const_term(lcg,lcg0);
+
+	/* initialize csum = lcg(1) */
+	sfcsump(vl,lcg,&csum);
+
+	/* initialize lcy by LC(f) */
+	W_BMALLOC(0,dy,lcy);
+	NEWDC(dc); COEF(dc) = COEF(DC(g)); DEG(dc) = 0; 
+	NEWP(lcyx); VR(lcyx) = x; DC(lcyx) = dc;
+	ptosfbm(dy,lcyx,lcy);
+
+	fprintf(stderr,"np = %d\n",np);
+	for ( g = f, k = 1, dcf = dcf0 = 0, win[0] = 1, --np, z = 0; ; z++ ) {
+		if ( !(z % 1000) ) fprintf(stderr,".");
+		if ( sfdtestmain(vl,lcg,lcg0,lcy,csum,wlist,k,win,&factor,&cofactor) ) {
+			NEXTDC(dcf0,dcf); DEG(dcf) = ONE; COEF(dcf) = factor;
+			g = cofactor;
+
+			/* update lcg */
+			mulp(vl,g,COEF(DC(g)),&lcg);
+
+			/* update lcg0 */
+			const_term(lcg,lcg0);
+
+			/* update csum */
+			sfcsump(vl,lcg,&csum);
+
+			/* update lcy */
+			clearbm(0,lcy);
+			COEF(dc) = COEF(DC(g));
+			ptosfbm(dy,lcyx,lcy);
+
+			for ( i = 0; i < k - 1; i++ ) 
+				for ( j = win[i] + 1; j < win[i + 1]; j++ ) 
+					c[j-i-1] = c[j];
+			for ( j = win[k-1] + 1; j <= np; j++ ) 	
+					c[j-k] = c[j];
+			if ( ( np -= k ) < k ) 
+				break;
+			if ( np - win[0] + 1 < k ) 
+				if ( ++k > np )
+					break;
+				else
+					for ( i = 0; i < k; i++ ) 
+						win[i] = i + 1;
+			else 
+				for ( i = 1; i < k; i++ ) 
+					win[i] = win[0] + i;
+		} else if ( !ncombi(1,np,k,win) ) 
+			if ( k == np ) 
+				break;
+			else
+				for ( i = 0, ++k; i < k; i++ ) 
+					win[i] = i + 1;
+	}
+	fprintf(stderr,"\n");
+	NEXTDC(dcf0,dcf); COEF(dcf) = g;
+	DEG(dcf) = ONE; NEXT(dcf) = 0; *dcp = dcf0;
+}
+
+/* lcy = LC(g), lcg = lcy*g, lcg0 = const part of lcg */
+int sfdtestmain(VL vl,P lcg,UM lcg0,BM lcy,P csum,ML list,
+	int k,int *in,P *fp,P *cofp)
+{
+	P fmul,csumg,q,cont;
+	V x,y;
+
+	x = vl->v;
+	y = vl->next->v;
+	if (!sfctest(lcg0,lcy,list,k,in))
+		return 0;
+	mulsfbmarray(UDEG(lcg),lcy,list,k,in,x,y,&fmul);
+	if ( csum ) {
+		sfcsump(vl,fmul,&csumg);
+		if ( csumg ) {
+			if ( !divtp(vl,csum,csumg,&q) )
+				return 0;
+		} 
+	}
+	if ( divtp_by_sfbm(vl,lcg,fmul,&q) ) {
+		cont_pp_sfp(vl,fmul,&cont,fp);
+		cont_pp_sfp(vl,q,&cont,cofp);
+		return 1;
+	} else
+		return 0;
+}
+
+void const_term(P f,UM c)
+{
+	DCP dc;
+
+	for ( dc = DC(f); dc && DEG(dc); dc = NEXT(dc) );
+	if ( dc ) 
+		ptosfum(COEF(dc),c);
+	else 
+		DEG(c) = -1;
+}
+
+void const_term_sfbm(BM f,UM c)
+{
+	int i,dy;
+
+	dy = DEG(f);
+	for ( i = 0; i <= dy; i++ )
+		if ( DEG(COEF(f)[i]) >= 0 )
+			COEF(c)[i] = COEF(COEF(f)[i])[0];
+		else
+			COEF(c)[i] = 0;
+	degum(c,dy);
+}
+
+/* lcy*(product of const part) | lcg0 ? */
+
+int sfctest(UM lcg0,BM lcy,ML list,int k,int *in)
+{
+	int dy,i,dr;
+	UM t,s,u,w;
+	BM *l;
+
+	dy = list->bound;
+	t = W_UMALLOC(2*dy);
+	s = W_UMALLOC(2*dy);
+	u = W_UMALLOC(2*dy);
+	const_term_sfbm(lcy,t);
+	if ( DEG(t) < 0 )
+		return 1;
+
+	l = (BM *)list->c;
+	for ( i = 0; i < k; i++ ) {
+		const_term_sfbm(l[in[i]],s);
+		mulsfum(t,s,u);
+		if ( DEG(u) > dy )
+			degum(u,dy);
+		w = t; t = u; u = w;
+	}
+	cpyum(lcg0,s);
+	dr = divsfum(s,t,u);
+	if ( dr >= 0 )
+		return 0;
+	else
+		return 1;
+}
+
+/* main var of f is x */
+
+void mulsfbmarray(int dx,BM lcy,ML list,int k,int *in,V x,V y,P *g)
+{
+	int dy,i;
+	BM wb0,wb1,t;
+	BM *l;
+
+	dy = list->bound;
+	W_BMALLOC(dx,dy,wb0); W_BMALLOC(dx,dy,wb1);
+	l = (BM *)list->c;
+	clearbm(dx,wb0);
+	mulsfbm(lcy,l[in[0]],wb0);
+	for ( i = 1; i < k; i++ ) {
+		clearbm(dx,wb1);
+		mulsfbm(l[in[i]],wb0,wb1);
+		t = wb0; wb0 = wb1; wb1 = t;
+	}
+	sfbmtop(wb0,x,y,g);
+}
+
+void sfcsump(VL vl,P f,P *s)
+{
+	P t,u;
+	DCP dc;
+
+	for ( dc = DC(f), t = 0; dc; dc = NEXT(dc) ) {
+		addp(vl,COEF(dc),t,&u); t = u;
+	}
+	*s = t;
+}
+
+/* *fp = primitive part of f w.r.t. x */
+
+void cont_pp_sfp(VL vl,P f,P *cp,P *fp)
+{
+	V x,y;
+	int d;
+	UM t,s,gcd;
+	DCP dc;
+	GFS g;
+
+	x = vl->v;
+	y = vl->next->v;
+	d = getdeg(y,f);
+	if ( d == 0 ) {
+		MKGFS(0,g);
+		*cp = (P)g;
+		*fp = f;  /* XXX */
+	} else {
+		t = W_UMALLOC(2*d);
+		s = W_UMALLOC(2*d);
+		gcd = W_UMALLOC(2*d);
+		dc = DC(f);
+		ptosfum(COEF(dc),gcd);
+		for ( dc = NEXT(dc); dc; dc = NEXT(dc) ) {
+			ptosfum(COEF(dc),t);
+			gcdsfum(gcd,t,s);
+			cpyum(s,gcd);
+		}
+		sfumtop(y,gcd,cp);
+		divsp(vl,f,*cp,fp);
+	}
+}
+
+int divtp_by_sfbm(VL vl,P f,P g,P *qp)
+{
+	V x,y;
+	int fx,fy,gx,gy;
+	BM fl,gl,ql;
+	UM *cf,*cg,*cq;
+	UM hg,q,t,s;
+	int i,j,dr;
+
+	x = vl->v; y = vl->next->v;
+	fx = getdeg(x,f); fy = getdeg(y,f);
+	gx = getdeg(x,g); gy = getdeg(y,g);
+
+	if ( fx < gx || fy < gy )
+		return 0;
+	W_BMALLOC(fx,fy,fl); ptosfbm(fy,f,fl); cf = COEF(fl);
+	W_BMALLOC(gx,gy,gl); ptosfbm(gy,g,gl); cg = COEF(gl);
+	W_BMALLOC(fx-gx,fy-gy,ql); cq = COEF(ql);
+
+	hg = cg[gy];
+	q = W_UMALLOC(fx); t = W_UMALLOC(fx); s = W_UMALLOC(fx);
+
+	for ( i = fy; i >= gy; i-- ) {
+		if ( DEG(cf[i]) < 0 )
 			continue;
-		DEG(w) = j; bcopy(coef,COEF(w),(j+1)*sizeof(int));
-		NEWDC(dct); STOQ(i,DEG(dct));
-		sfumtop(y,w,&COEF(dct)); NEXT(dct) = dc; dc = dct;
+		dr = divsfum(cf[i],hg,q);
+		if ( dr >= 0 )
+			return 0;
+		if ( DEG(q) > fx-gx )
+			return 0;
+		cpyum(q,cq[i-gy]);
+		for ( j = 0; j <= gy; j++ ) {
+			mulsfum(cg[j],q,t);
+			subsfum(cf[j+i-gy],t,s);
+			cpyum(s,cf[j+i-gy]);
+		}
 	}
-	MKP(x,dc,*fp);
+	for ( j = gy-1; j >= 0 && DEG(cf[j]) < 0; j-- );
+	if ( j >= 0 )
+		return 0;
+	sfbmtop(ql,x,y,qp);
+	return 1;
 }
 
-/* x : main variable */
+/* XXX generate an irreducible poly of degree n */
 
-void sfbmtop(vl,bound,f,x,y,fp)
-VL vl;
-int bound;
-BM f;
-V x,y;
-P *fp;
+extern int current_gfs_q1;
+
+void generate_defpoly_sfum(int n,UM *dp)
 {
-	UM *c;
-	P yv,r,s,t,u,yvd;
-	Q d;
-	int i;
+	UM r,dr,t,g;
+	UM *f;
+	int *c,*w;
+	int max,i,j;
 
-	c = f->c;
-	MKV(y,yv);
-	r = 0;
-	for ( i = 0; i < bound; i++ ) {
-		STOQ(i,d); sfumtop(x,c[i],&t);
-		pwrp(vl,yv,d,&yvd);
-		mulp(vl,t,yvd,&s);
-		addp(vl,r,s,&u); r = u;
+	*dp = r = UMALLOC(n);
+	DEG(r) = n;
+	c = COEF(r);
+	c[n] = _onesf();
+	max = current_gfs_q1;
+	w = (int *)ALLOCA(n*sizeof(int));
+	bzero(w,n*sizeof(int));
+
+	dr = W_UMALLOC(n); t = W_UMALLOC(n); g = W_UMALLOC(n);
+	f = (UM *)ALLOCA((n+1)*sizeof(UM));
+	while ( 1 ) {
+		for ( i = 0; i < n && w[i] == max; i++ );
+		if ( i == n ) {
+			/* XXX cannot happen */
+			error("generate_defpoly_sfum : cannot happen");
+		}
+		for ( j = 0; j < i; j++ )
+			w[j] = 0;
+		w[i]++;
+		for ( i = 0; i < n; i++ )
+			c[i] = w[i]?FTOIF(w[i]-1):0;
+		if ( !c[0] )
+			continue;
+		diffsfum(r,dr); cpyum(r,t); gcdsfum(t,dr,g);
+		if ( DEG(g) > 0 )
+			continue;
+
+		czsfum(r,f);
+		for ( i = 0; f[i]; i++ );
+		if ( i == 1 )
+			return;
 	}
-	*fp = r;
 }