===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Hgfs.c,v
retrieving revision 1.20
retrieving revision 1.27
diff -u -p -r1.20 -r1.27
--- OpenXM_contrib2/asir2000/engine/Hgfs.c	2001/10/30 10:24:35	1.20
+++ OpenXM_contrib2/asir2000/engine/Hgfs.c	2002/11/01 05:43:35	1.27
@@ -1,6 +1,7 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.19 2001/10/30 07:25:58 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.26 2002/10/25 02:43:40 noro Exp $ */
 
 #include "ca.h"
+#include "inline.h"
 
 void lnfsf(int n,UM p0,UM p1,struct p_pair *list,UM np0,UM np1);
 void extractcoefbm(BM f,int dx,UM r);
@@ -15,7 +16,7 @@ int comp_dum(DUM a,DUM b)
 		return 0;
 }
 
-void fctrsf(P p,DCP *dcp)
+void ufctrsf(P p,DCP *dcp)
 {
 	int n,i,j,k;
 	DCP dc,dc0;
@@ -27,7 +28,9 @@ void fctrsf(P p,DCP *dcp)
 
 	simp_ff((Obj)p,&obj); p = (P)obj;
 	if ( !p ) {
-		*dcp = 0; return;
+		NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; 
+		NEXT(dc) = 0; *dcp = dc;
+		return;
 	}
 	mp = W_UMALLOC(UDEG(p));
 	ptosfum(p,mp);
@@ -510,7 +513,7 @@ void ptosfbm(int,P,BM);
 
 /* f = f(x,y) */
 
-void sfhensel(int count,P f,V x,GFS *evp,P *sfp,ML *listp)
+void sfhensel(int count,P f,V x,int degbound,GFS *evp,P *sfp,ML *listp)
 {
 	int i;
 	int fn;
@@ -521,7 +524,7 @@ void sfhensel(int count,P f,V x,GFS *evp,P *sfp,ML *li
 	int dx,dy,bound;
 	GFS ev;
 	P f1,t,c,sf;
-	DCP dc;
+	DCP dc,dct,dc0;
 	UM q,fm,hm;
 	UM *gm;
 	struct oEGT tmp0,tmp1,eg_hensel,eg_hensel_t;
@@ -544,9 +547,35 @@ void sfhensel(int count,P f,V x,GFS *evp,P *sfp,ML *li
 		*listp = rlist = MLALLOC(1); rlist->n = fn; rlist->c[0] = 0;
 		return;
 	}
-	/* pass the the leading coeff. to the first element */
-	c = dc->c; dc = NEXT(dc);
-	mulp(vl,dc->c,c,&t); dc->c = t;
+	if ( degbound >= 0 ) {
+		/*
+		 * reconstruct dc so that
+		 * dc[1],... : factors satisfy degree bound
+		 * dc[0]     : product of others
+		 */
+		c = dc->c; dc = NEXT(dc);
+		dc0 = 0;
+		fn = 0;
+		while ( dc ) {
+			if ( getdeg(x,COEF(dc)) <= degbound ) {
+				dct = NEXT(dc); NEXT(dc) = dc0; dc0 = dc; dc = dct;
+				fn++;
+			} else {
+				mulp(vl,COEF(dc),c,&t); c = t;
+				dc = NEXT(dc);
+			}
+		}
+		if ( OID(c) == O_P ) {
+			NEWDC(dc); COEF(dc) = c; DEG(dc) = ONE; NEXT(dc) = dc0;
+			fn++;
+		} else {
+			mulp(vl,dc0->c,c,&t); dc0->c = t; dc = dc0;
+		}
+	} else {
+		/* pass the the leading coeff. to the first element */
+		c = dc->c; dc = NEXT(dc);
+		mulp(vl,dc->c,c,&t); dc->c = t;
+	}
 
 	/* convert mod y-a factors into UM */
 	gm = (UM *)ALLOCA(fn*sizeof(UM));
@@ -621,7 +650,7 @@ int sfberle(VL vl,P f,int count,GFS *ev,DCP *dcp)
 	V x,y;
 	P lc,lc0,f0;
 	Obj obj;
-	int j,q1,index,i;
+	int j,q,index,i;
 
 	clctv(vl,f,&nvl); vl = nvl;
 	x = vl->v; y = vl->next->v;
@@ -629,18 +658,18 @@ int sfberle(VL vl,P f,int count,GFS *ev,DCP *dcp)
 	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);
-	q1 = field_order_sf()-1;
+	q = field_order_sf();
 	lc = DC(f)->c;
 	for ( j = 0, fn = n + 1, index = 0; 
-		index < q1 && j < count && fn > 1; index++ ) {
-		MKGFS(index,m);
+		index < q && j < count && fn > 1; index++ ) {
+		indextogfs(index,&m);
 		substp(vl,lc,y,(P)m,&lc0);
 		if ( lc0 ) {
 			substp(vl,f,y,(P)m,&f0);
 			ptosfum(f0,wf); cpyum(wf,wf1); 
 			diffsfum(wf1,wf2); gcdsfum(wf1,wf2,gcd);
 			if ( DEG(gcd) == 0 ) {
-				fctrsf(f0,&dc);
+				ufctrsf(f0,&dc);
 				for ( dct = NEXT(dc), i = 0; dct; dct = NEXT(dct), i++ );
 				if ( i < fn ) {
 					dc0 = dc; fn = i; fm = m;
@@ -649,7 +678,7 @@ int sfberle(VL vl,P f,int count,GFS *ev,DCP *dcp)
 			}
 		}
 	}
-	if ( index == q1 )
+	if ( index == q )
 		return 0;
 	else if ( fn == 1 )
 		return 1;
@@ -792,6 +821,93 @@ void sfhenmain2(BM f,UM g0,UM h0,int dy,BM *gp)
 		cpyum(COEF(hk)[i],COEF(f)[i]);
 }
 
+/* a0*g+b0*h = 1 mod y -> a*g+b*h = 1 mod y^(dy+1) */
+
+void sfexgcd_by_hensel(BM g,BM h,int dy,BM *ap,BM *bp)
+{
+	int i,k;
+	int dx;
+	UM wt,wa,wb,q,w1,w2,ws;
+	UM wc,wd,we,wz,wa1,wb1;
+	BM wz0,wz1;
+	int dg,dh;
+	BM a,b,c;
+
+	dg = degbm(g);
+	dh = degbm(h);
+	dx = dg+dh;
+
+	a = BMALLOC(dh,dy);
+	b = BMALLOC(dg,dy);
+	/* c holds a*g+b*h-1 */
+	c = BMALLOC(dg+dh,dy);
+
+	W_BMALLOC(dx,dy,wz0); W_BMALLOC(dx,dy,wz1);
+
+	wt = W_UMALLOC(dx); ws = W_UMALLOC(dx); q = W_UMALLOC(2*dx);
+	wa1 = W_UMALLOC(2*dx); wb1 = W_UMALLOC(2*dx);
+	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(dg); cpyum(COEF(g)[0],w1);
+	w2 = W_UMALLOC(dh); cpyum(COEF(h)[0],w2);
+	wa = W_UMALLOC(2*dx); wb = W_UMALLOC(2*dx);  /* XXX */
+	eucsfum(w1,w2,wa,wb);
+	cpyum(wa,COEF(a)[0]); cpyum(wb,COEF(b)[0]);
+	
+	/* initialize c to a*g+b*h-1 */
+	mulsfbm(a,g,c); mulsfbm(b,h,wz0); addtosfbm(wz0,c);
+	COEF(COEF(c)[0])[0] = 0;
+	
+	fprintf(stderr,"dy=%d\n",dy);
+	for ( k = 1; k <= dy; k++ ) {
+		fprintf(stderr,".");
+
+		/* at this point, a*g+b*h = 1 mod y^k, c = a*g+b*h-1 */
+
+		/* wt = -((a*g+b*h-1)/y^k) */
+		cpyum(COEF(c)[k],wt);
+		for ( i = DEG(wt); i >= 0; i-- )
+			COEF(wt)[i] = _chsgnsf(COEF(wt)[i]);
+		
+		/* compute wa1,wb1 s.t. wa1*g0+wb1*h0 = wt */
+		mulsfum(wa,wt,wa1); DEG(wa1) = divsfum(wa1,COEF(h)[0],q);
+		mulsfum(wa1,COEF(g)[0],wc); subsfum(wt,wc,wd); 
+		DEG(wd) = divsfum(wd,COEF(h)[0],wb1);
+
+		/* c += ((wa1*g+wb1*h)*y^k mod y^(dy+1) */
+		/* wz0 = wa1*y^k */
+		clearbm(dx,wz0);
+		cpyum(wa1,COEF(wz0)[k]);
+
+		/* wz1 = wz0*g mod y^(dy+1) */
+		clearbm(dx,wz1);
+		mulsfbm(g,wz0,wz1);
+		/* c += wz1 */
+		addtosfbm(wz1,c);
+
+		/* wz0 = wb1*y^k */
+		clearbm(dx,wz0);
+		cpyum(wb1,COEF(wz0)[k]);
+
+		/* wz1 = wz0*h mod y^(dy+1) */
+		clearbm(dx,wz1);
+		mulsfbm(h,wz0,wz1);
+		/* c += wz1 */
+		addtosfbm(wz1,c);
+
+		/* a += wa1*y^k, b += wb1*y^k */
+		cpyum(wa1,COEF(a)[k]);
+		cpyum(wb1,COEF(b)[k]);
+	}
+	fprintf(stderr,"\n");
+	DEG(a) = dy;
+	DEG(b) = dy;
+	*ap = a;
+	*bp = b;
+}
+
 /* fl->c[i] = coef_y(f,i) */
 
 void ptosfbm(int dy,P f,BM fl)
@@ -836,7 +952,7 @@ void sfbmtop(BM f,V x,V y,P *fp)
 			if ( DEG(c[j]) >= i && (a = COEF(c[j])[i]) ) {
 				NEWDC(dct);
 				STOQ(j,DEG(dct));
-				MKGFS(IFTOF(a),b);
+				iftogfs(a,&b);
 				COEF(dct) = (P)b;
 				NEXT(dct) = dc;
 				dc = dct;
@@ -869,10 +985,8 @@ void sfsqfr(P f,DCP *dcp)
 		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");
+		sqfrsf(f,dcp);
 }
 
 void sfusqfr(P f,DCP *dcp)
@@ -903,16 +1017,22 @@ void sfusqfr(P f,DCP *dcp)
 	*dcp = dct;
 }
 
+#if 0
+void sfbsqfrmain(P f,V x,V y,DCP *dcp)
+{
+	/* XXX*/
+}
+
+/* f is bivariate */
+
 void sfbsqfr(P f,V x,V y,DCP *dcp)
 {
 	P t,rf,cx,cy;
 	VL vl,rvl;
-	DCP dcx,dcy;
+	DCP dcx,dcy,dct,dc;
 	struct oVL vl0,vl1;
 
-	/* vl = [x,y] */
-	vl0.v = x; vl0.next = &vl1; vl1.v = y; vl1.next = 0; vl = &vl0;
-	/* cy(y) = cont(f,x), f /= cx */
+	/* cy(y) = cont(f,x), f /= cy */
 	cont_pp_sfp(vl,f,&cy,&t); f = t;
 	/* rvl = [y,x] */
 	reordvar(vl,y,&rvl); reorderp(rvl,vl,f,&rf);
@@ -921,13 +1041,33 @@ void sfbsqfr(P f,V x,V y,DCP *dcp)
 	reorderp(vl,rvl,rf,&f);
 
 	/* f -> cx*cy*f */
-	sfusqfr(cx,&dcx);
-	sfusqfr(cy,&dcy);
+	sfsqfr(cx,&dcx); dcx = NEXT(dcx);
+	sfsqfr(cy,&dcy); dcy = NEXT(dcy);
+	if ( dcx ) {
+		for ( dct = dcx; NEXT(dct); dct = NEXT(dct) );
+		NEXT(dct) = dcy;
+	} else
+		dcx = dcy;
+	if ( OID(f) == O_N )
+		*dcp = dcx;
+	else {
+		/* f must be bivariate */
+		sfbsqfrmain(f,x,y,&dc);
+		if ( dcx ) {
+			for ( dct = dcx; NEXT(dct); dct = NEXT(dct) );
+			NEXT(dct) = dc;
+		} else
+			dcx = dc;
+		*dcp = dcx;
+	}
 }
+#endif
 
 void sfdtest(P,ML,V,V,DCP *);
 
-void sfbfctr(P f,V x,V y,DCP *dcp)
+/* if degbound >= 0 find factor s.t. deg_x(factor) <= degbound */
+
+void sfbfctr(P f,V x,V y,int degbound,DCP *dcp)
 {
 	ML list;
 	P sf;
@@ -937,7 +1077,7 @@ void sfbfctr(P f,V x,V y,DCP *dcp)
 	int dx,dy;
 
 	/* sf(x) = f(x+ev) = list->c[0]*list->c[1]*... */
-	sfhensel(5,f,x,&ev,&sf,&list);
+	sfhensel(5,f,x,degbound,&ev,&sf,&list);
 	if ( list->n == 0 )
 		error("sfbfctr : short of evaluation points");
 	else if ( list->n == 1 ) {
@@ -960,6 +1100,33 @@ void sfbfctr(P f,V x,V y,DCP *dcp)
 	*dcp = dc;
 }
 
+/* returns shifted f, shifted factors and the eval pt */
+
+void sfbfctr_shift(P f,V x,V y,int degbound,GFS *evp,P *sfp,DCP *dcp)
+{
+	ML list;
+	P sf;
+	GFS ev;
+	DCP dc,dct;
+	int dx,dy;
+
+	/* sf(x) = f(x+ev) = list->c[0]*list->c[1]*... */
+	sfhensel(5,f,x,degbound,&ev,&sf,&list);
+	if ( list->n == 0 )
+		error("sfbfctr_shift : short of evaluation points");
+	else if ( list->n == 1 ) {
+		/* f is irreducible */
+		NEWDC(dc); DEG(dc) = ONE; COEF(dc) = f; NEXT(dc) = 0;
+		*evp = 0;
+		*sfp = f;
+		*dcp = dc;
+	} else {
+		sfdtest(sf,list,x,y,dcp);
+		*evp = ev;
+		*sfp = sf;
+	}
+}
+
 /* 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)
@@ -1267,7 +1434,7 @@ void cont_pp_sfp(VL vl,P f,P *cp,P *fp)
 	y = vl->next->v;
 	d = getdeg(y,f);
 	if ( d == 0 ) {
-		MKGFS(0,g);
+		itogfs(1,&g);
 		*cp = (P)g;
 		*fp = f;  /* XXX */
 	} else {
@@ -1333,6 +1500,7 @@ int divtp_by_sfbm(VL vl,P f,P g,P *qp)
 /* XXX generate an irreducible poly of degree n */
 
 extern int current_gfs_q1;
+extern int *current_gfs_ntoi;
 
 void generate_defpoly_sfum(int n,UM *dp)
 {
@@ -1360,8 +1528,12 @@ void generate_defpoly_sfum(int n,UM *dp)
 		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 ( !current_gfs_ntoi )
+			for ( i = 0; i < n; i++ )
+				c[i] = w[i]?FTOIF(w[i]):0;
+		else
+			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);