===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Hgfs.c,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -p -r1.8 -r1.12
--- OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/06/25 10:01:28	1.8
+++ OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/06/27 04:07:57	1.12
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.7 2001/06/25 06:10:48 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.11 2001/06/26 09:47:05 noro Exp $ */
 
 #include "ca.h"
 
@@ -17,7 +17,19 @@ void sfbmtop(int,BM,V,V,P *);
 void pp_sfp(VL,P,P *);
 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;
@@ -65,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);
@@ -563,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 ) {
@@ -609,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;
 
@@ -941,6 +969,8 @@ BM fl;
 	int d,i,n;
 	UM t;
 
+	n = QTOS(DEG(DC(f)));
+	clearsfbm(bound,n,fl);
 	DEG(fl) = bound;
 	t = UMALLOC(bound);
 	for ( dc = DC(f); dc; dc = NEXT(dc) ) {
@@ -949,7 +979,6 @@ BM fl;
 		for ( i = 0; i <= DEG(t); i++ )
 			COEF(COEF(fl)[i])[d] = COEF(t)[i];
 	}
-	n = QTOS(DEG(DC(f)));
 	for ( i = 0; i < bound; i++ )
 		degum(COEF(fl)[i],n);
 }
@@ -1030,18 +1059,30 @@ P *fp;
 
 void sfdtest(P,ML,V,V,DCP *);
 
-void sfbfctr(f,x,y,evp,dcp)
+void sfbfctr(f,x,y,dcp)
 P f;
 V x,y;
-GFS *evp;
 DCP *dcp;
 {
 	ML list;
 	P sf;
+	GFS ev;
+	DCP dc,dct;
+	BM fl;
+	int n,bound;
 
 	/* sf(x) = f(x+ev) = list->c[0]*list->c[1]*... */
-	sfhensel(5,f,x,evp,&sf,&list);
-	sfdtest(sf,list,x,y,dcp);
+	sfhensel(5,f,x,&ev,&sf,&list);
+	sfdtest(sf,list,x,y,&dc);
+	n = getdeg(x,sf);
+	bound = list->bound;
+	W_BMALLOC(n,bound,fl);
+	for ( dct = dc; dct; dct = NEXT(dct) ) {
+		ptosfbm(bound,COEF(dct),fl);
+		shiftsfbm(bound,fl,_chsgnsf(FTOIF(CONT(ev))));
+		sfbmtop(bound,fl,x,y,&COEF(dct));
+	}
+	*dcp = dc;
 }
 
 /* f = f(x,y) = list->c[0]*list->c[1]*... mod y^list->bound */
@@ -1056,10 +1097,11 @@ DCP *dcp;
 	int i,j,k;
 	int *win;
 	P g,lcg,factor,cofactor,lcyx;
-	P csum,csumt;
+	P t,csum;
 	DCP dcf,dcf0,dc;
 	BM *c;
 	BM lcy;
+	UM lcg0;
 	ML wlist;
 	struct oVL vl1,vl0;
 	VL vl;
@@ -1068,39 +1110,49 @@ DCP *dcp;
 	/* vl = [x,y] */
 	vl0.v = x; vl0.next = &vl1; vl1.v = y; vl1.next = 0; vl = &vl0;
 
+	/* setup various structures and arrays */
 	n = UDEG(f); np = list->n; bound = list->bound; win = W_ALLOC(np+1);
-
-	/* csum = lc(f)*f(1) */
-	sfcsump(vl,f,&csum); mulp(vl,csum,COEF(DC(f)),&csumt); csum = csumt;
-
 	wlist = W_MLALLOC(np); wlist->n = list->n;
 	wlist->bound = list->bound;
 	c = (BM *)COEF(wlist);
 	bcopy((char *)COEF(list),(char *)c,(int)(sizeof(BM)*np));
 
+	lcg0 = W_UMALLOC(2*bound);
+
 	/* initialize g by f */
-	g = f; mulp(vl,g,COEF(DC(g)),&lcg);
+	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,bound,lcy);
-	NEWDC(dc); COEF(dc) = COEF(DC(g));
-	DEG(dc) = 0; 
+	NEWDC(dc); COEF(dc) = COEF(DC(g)); DEG(dc) = 0; 
 	NEWP(lcyx); VR(lcyx) = x; DC(lcyx) = dc;
 	ptosfbm(bound,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,lcy,csum,wlist,k,win,&factor,&cofactor) ) {
+		if ( sfdtestmain(vl,lcg,lcg0,lcy,csum,wlist,k,win,&factor,&cofactor) ) {
 			NEXTDC(dcf0,dcf); DEG(dcf) = ONE; COEF(dcf) = factor;
 			g = cofactor;
 
-			/* update csum */
-			sfcsump(vl,g,&csum); mulp(vl,csum,COEF(DC(g)),&csumt); csum = csumt;
-
 			/* update lcg */
 			mulp(vl,g,COEF(DC(g)),&lcg);
 
+			/* update lcg0 */
+			const_term(lcg,lcg0);
+
+			/* update csum */
+			sfcsump(vl,lcg,&csum);
+
 			/* update lcy */
 			clearsfbm(bound,0,lcy);
 			COEF(dc) = COEF(DC(g)); ptosfbm(bound,lcyx,lcy);
@@ -1133,10 +1185,11 @@ DCP *dcp;
 	DEG(dcf) = ONE; NEXT(dcf) = 0; *dcp = dcf0;
 }
 
-/* lcy = LC(g), lcg = lcy*g */
-int sfdtestmain(vl,lcg,lcy,csum,list,k,in,fp,cofp)
+/* lcy = LC(g), lcg = lcy*g, lcg0 = const part of lcg */
+int sfdtestmain(vl,lcg,lcg0,lcy,csum,list,k,in,fp,cofp)
 VL vl;
 P lcg;
+UM lcg0;
 BM lcy;
 P csum;
 ML list;
@@ -1149,10 +1202,8 @@ P *fp,*cofp;
 
 	x = vl->v;
 	y = vl->next->v;
-#if 0
-	if (!sfctest(g,list,k,in))
+	if (!sfctest(lcg0,lcy,list,k,in))
 		return 0;
-#endif
 	mulsfbmarray(UDEG(lcg),lcy,list,k,in,x,y,&fmul);
 	if ( csum ) {
 		sfcsump(vl,fmul,&csumg);
@@ -1161,7 +1212,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;
@@ -1169,40 +1220,71 @@ P *fp,*cofp;
 		return 0;
 }
 
-#if 0
-int sfctest(g,list,k,in)
-P g;
+void const_term(f,c)
+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(f,bound,c)
+BM f;
+int bound;
+UM c;
+{
+	int i;
+
+	for ( i = 0; i < bound; i++ )
+		if ( DEG(COEF(f)[i]) >= 0 )
+			COEF(c)[i] = COEF(COEF(f)[i])[0];
+		else
+			COEF(c)[i] = 0;
+	degum(c,bound-1);
+}
+
+/* lcy*(product of const part) | lcg0 ? */
+
+int sfctest(lcg0,lcy,list,k,in)
+UM lcg0;
+BM lcy;
 ML list;
 int k;
 int *in;
 {
-	register int i;
-	int q,bound;
-	int *wm,*wm1,*tmpp;
 	DCP dc;
-	Q dvr;
-	N lcn,cstn,dndn,dmyn,rn;
-	LUM *l;
+	int bound,i,dr;
+	UM t,s,u,w;
+	BM *l;
 
-	for ( dc = DC(g); dc && DEG(dc); dc = NEXT(dc) );
-	if ( dc ) 
-		cstn = NM((Q)COEF(dc));
-	else 
+	bound = list->bound;
+	t = W_UMALLOC(2*bound);
+	s = W_UMALLOC(2*bound);
+	u = W_UMALLOC(2*bound);
+	const_term_sfbm(lcy,bound,t);
+	if ( DEG(t) < 0 )
 		return 1;
-	q = list->mod; bound = list->bound;
-	ntobn(q,NM((Q)COEF(DC(g))),&lcn);;
-	W_CALLOC(bound+1,int,wm); W_CALLOC(bound+1,int,wm1); 
-	for ( i = 0; i < PL(lcn); i++ ) 
-		wm[i] = BD(lcn)[i];
-	for ( i = 0, l = (LUM *)list->c; i < k; i++ ) {
-		mulpadic(q,bound,wm,COEF(l[in[i]])[0],wm1);
-		tmpp = wm; wm = wm1; wm1 = tmpp;
+
+	l = (BM *)list->c;
+	for ( i = 0; i < k; i++ ) {
+		const_term_sfbm(l[in[i]],bound,s);
+		mulsfum(t,s,u);
+		if ( DEG(u) >= bound )
+			degum(u,bound-1);
+		w = t; t = u; u = w;
 	}
-	padictoq(q,bound,wm,&dvr);
-	kmuln(NM((Q)COEF(DC(g))),cstn,&dndn); divn(dndn,NM(dvr),&dmyn,&rn);
-	return rn ? 0 : 1;
+	cpyum(lcg0,s);
+	dr = divsfum(s,t,u);
+	if ( dr >= 0 )
+		return 0;
+	else
+		return 1;
 }
-#endif
 
 /* main var of f is x */
 
@@ -1278,4 +1360,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);
 }