===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Hgfs.c,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- OpenXM_contrib2/asir2000/engine/Hgfs.c	2002/09/27 04:24:04	1.22
+++ OpenXM_contrib2/asir2000/engine/Hgfs.c	2002/10/25 02:43:40	1.26
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.21 2001/11/19 00:57:11 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.25 2002/10/23 07:54:58 noro Exp $ */
 
 #include "ca.h"
 #include "inline.h"
@@ -16,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;
@@ -650,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;
@@ -658,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;
@@ -678,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;
@@ -865,7 +865,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;
@@ -898,12 +898,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);
-#if 0
-	else if ( !NEXT(NEXT(vl)) )
-		sfbsqfr(f,vl->v,NEXT(vl)->v,dcp);
-#endif
 	else
-		error("sfsqfr : not implemented yet");
+		sqfrsf(f,dcp);
 }
 
 void sfusqfr(P f,DCP *dcp)
@@ -934,6 +930,7 @@ void sfusqfr(P f,DCP *dcp)
 	*dcp = dct;
 }
 
+#if 0
 void sfbsqfrmain(P f,V x,V y,DCP *dcp)
 {
 	/* XXX*/
@@ -977,6 +974,7 @@ void sfbsqfr(P f,V x,V y,DCP *dcp)
 		*dcp = dcx;
 	}
 }
+#endif
 
 void sfdtest(P,ML,V,V,DCP *);
 
@@ -1015,6 +1013,33 @@ void sfbfctr(P f,V x,V y,int degbound,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)
@@ -1322,7 +1347,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 {