===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Hgfs.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/06/26 08:52:59	1.10
+++ OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/06/29 09:08:53	1.13
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.9 2001/06/26 03:00:40 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.12 2001/06/27 04:07:57 noro Exp $ */
 
 #include "ca.h"
 
@@ -19,6 +19,17 @@ void sfcsump(VL,P,P *);
 void mulsfbmarray(int,BM,ML,int,int *,V,V,P *);
 void const_term(P,UM);
 
+int comp_dum(a,b)
+DUM a,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;
@@ -66,6 +77,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);
@@ -564,6 +579,7 @@ ML *listp;
 	DCP dc;
 	UM w,w1,q,fm,hm;
 	UM *gm;
+	struct oEGT tmp0,tmp1,eg_hensel,eg_hensel_t;
 
 	clctv(CO,f,&vl);
 	if ( vl->v != x ) {
@@ -610,15 +626,26 @@ ML *listp;
 
 	q = W_UMALLOC(dx);
 	rlist = MLALLOC(fn); rlist->n = fn; rlist->bound = bound;
+	fprintf(asir_out,"%d candidates\n",fn);
+	init_eg(&eg_hensel);
 	for ( i = 0; i < fn-1; i++ ) {
-		fprintf(stderr,"%d\n",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 */
 		/* rlist->c[i] = gk */
 		sfhenmain2(fl,gm[i],hm,bound,(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");
 	}
+	print_eg("Hensel total",&eg_hensel);
+	fprintf(asir_out,"\n");
 	/* finally, fl must be the lift of gm[fn-1] */
 	rlist->c[i] = fl;
 
@@ -1046,6 +1073,14 @@ DCP *dcp;
 
 	/* 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);
 	n = getdeg(x,sf);
 	bound = list->bound;
@@ -1185,7 +1220,7 @@ P *fp,*cofp;
 				return 0;
 		} 
 	}
-	if ( divtp(vl,lcg,fmul,&q) ) {
+	if ( divtp_by_sfbm(vl,lcg,fmul,&q) ) {
 		pp_sfp(vl,fmul,fp);
 		pp_sfp(vl,q,cofp);
 		return 1;
@@ -1333,4 +1368,50 @@ P *fp;
 		sfumtop(y,gcd,&dvr);
 		divsp(vl,f,dvr,fp);
 	}
+}
+
+int divtp_by_sfbm(vl,f,g,qp)
+VL vl;
+P f,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+1,fl); ptosfbm(fy+1,f,fl); cf = COEF(fl);
+	W_BMALLOC(gx,gy+1,gl); ptosfbm(gy+1,g,gl); cg = COEF(gl);
+	W_BMALLOC(fx-gx,fy-gy+1,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;
+		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]);
+		}
+	}
+	for ( j = gy-1; j >= 0 && DEG(cf[j]) < 0; j-- );
+	if ( j >= 0 )
+		return 0;
+	sfbmtop(DEG(ql),ql,x,y,qp);
 }