===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gf.c,v
retrieving revision 1.6
retrieving revision 1.14
diff -u -p -r1.6 -r1.14
--- OpenXM_contrib2/asir2000/builtin/gf.c	2001/06/25 01:35:20	1.6
+++ OpenXM_contrib2/asir2000/builtin/gf.c	2001/10/09 01:36:06	1.14
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/gf.c,v 1.5 2001/05/09 01:41:41 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gf.c,v 1.13 2001/09/03 07:56:19 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -67,6 +67,7 @@ void nullspace_lm(LM **,int,int *);
 void nullspace_gf2n(GF2N **,int,int *);
 void nullspace_gfpn(GFPN **,int,int *);
 void nullspace_gfs(GFS **,int,int *);
+void nullspace_gfsn(GFSN **,int,int *);
 void null_to_sol(int **,int *,int,int,UM *);
 
 void showgfmat(UM **,int);
@@ -84,7 +85,7 @@ void Plinear_form_to_vect(),Pvect_to_linear_form();
 void solve_linear_equation_gf2n(GF2N **,int,int,int *);
 void linear_form_to_array(P,VL,int,Num *);
 void array_to_linear_form(Num *,VL,int,P *);
-void sfuhensel(P,V,V,NODE *);
+void sfuhensel(P,NODE,GFS,int,NODE *);
 
 extern int current_ff;
 
@@ -97,7 +98,7 @@ struct ftab gf_tab[] = {
 	{"resfmain",Presfmain,4},
 	{"pwr_mod",Ppwr_mod,6},
 	{"uhensel",Puhensel,4},
-	{"sfuhensel",Psfuhensel,3},
+	{"sfuhensel",Psfuhensel,4},
 	{0,0,0},
 };
 
@@ -187,32 +188,89 @@ NODE arg;
 LIST *rp;
 {
 	P f;
-	V x,y;
-	NODE r;
+	int bound;
+	NODE r,mfl;
+	GFS ev;
 
 	f = (P)ARG0(arg);
-	x = VR((P)ARG1(arg));
-	y = VR((P)ARG2(arg));
-	sfuhensel(f,x,y,&r);
+	mfl = BDY((LIST)ARG1(arg));
+	ev = (GFS)ARG2(arg);
+	bound = QTOS((Q)ARG3(arg));
+	sfuhensel(f,mfl,ev,bound,&r);
 	MKLIST(*rp,r);
 }
 
-void sfuhensel(f,x,y,rp)
+void sfuhensel(f,mfl,ev,bound,rp)
 P f;
-V x,y;
+NODE mfl;
+GFS ev;
+int bound;
 NODE *rp;
 {
-	ML lift;
-	int i;
-	P s,u;
+	BM fl;
+	BM *r;
+	VL vl,nvl;
+	int i,fn,dx,dy,d;
 	NODE t,top;
-	VL vl,vl1;
+	UM fm,hm,q;
+	UM *gm;
+	V x,y;
+	P g,s,u;
 
-	NEWVL(vl1); vl1->v = y; NEXT(vl1) = 0;
-	NEWVL(vl); vl->v = x; NEXT(vl) = vl1;
-	sfhensel(5,f,x,&lift);
-	for ( i = lift->n-1, top = 0; i >= 0; i-- ) {
-		sflumtop(lift->bound,lift->c[i],x,y,&s);
+	clctv(CO,f,&vl);
+	if ( !vl || !vl->next || vl->next->next )
+		error("sfuhensel : f must be a bivariate poly");
+
+	for ( i = 0, t = mfl; t; i++, t = NEXT(t) );
+	fn = i;
+
+	gm = (UM *)MALLOC(fn*sizeof(UM));
+
+	/* XXX : more severe check is necessary */
+	x = VR((P)BDY(mfl));
+	y = vl->v == x ? vl->next->v : vl->v;
+
+	for ( i = 0, t = mfl, d = 0; i < fn; i++, t = NEXT(t) ) {
+		gm[i] = (pointer)UMALLOC(getdeg(x,(P)BDY(t)));
+		ptosfum((P)BDY(t),gm[i]);
+		d += DEG(gm[i]);
+	}
+
+	/* reorder f if necessary */
+	if ( vl->v != x ) {
+		reordvar(vl,x,&nvl); reorderp(nvl,vl,f,&g);
+		vl = nvl; f = g;
+	}
+	dx = getdeg(x,f);
+	if ( dx != d )
+		error("sfuhensel : product of factors has incompatible degree");
+
+	dy = getdeg(y,f);
+	dy = MAX(dy,bound);
+	fl = BMALLOC(dx,dy);
+	ptosfbm(dy,f,fl);
+	if ( ev ) shiftsfbm(fl,FTOIF(CONT(ev)));
+
+	/* fm = fl mod y */
+	fm = W_UMALLOC(dx);
+	cpyum(COEF(fl)[0],fm);
+	hm = W_UMALLOC(dx);
+
+	q = W_UMALLOC(dx);
+	r = (BM *)MLALLOC(fn*sizeof(BM));
+	for ( i = 0; i < fn-1; i++ ) {
+		/* fl = gm[i]*hm mod y */
+		divsfum(fm,gm[i],hm);
+		/* fl is replaced by the cofactor of gk mod y^bound */
+		/* r[i] = gk */
+		sfhenmain2(fl,gm[i],hm,bound,r+i);
+		cpyum(hm,fm);
+	}
+	/* finally, fl must be the lift of gm[fn-1] */
+	r[i] = fl;
+
+	for ( i = fn-1, top = 0; i >= 0; i-- ) {
+		sfbmtop(r[i],x,y,&s);
 		reorderp(CO,vl,s,&u);
 		MKNODE(t,u,top); top = t;
 	}
@@ -826,7 +884,6 @@ NODE arg;
 LIST *rp;
 {
 	int i,j,n;
-	Q mod;
 	MAT mat,r;
 	VECT u;
 	Q q;
@@ -852,6 +909,8 @@ LIST *rp;
 			nullspace_gfpn((GFPN **)w,n,ind); break;
 		case FF_GFS:
 			nullspace_gfs((GFS **)w,n,ind); break;
+		case FF_GFSN:
+			nullspace_gfsn((GFSN **)w,n,ind); break;
 		default:
 			error("nullspace_ff : current_ff is not set");
 	}
@@ -1028,6 +1087,46 @@ int *ind;
 			chsgngfs(u[j],&h);
 			for ( s = j; s < n; s++ ) {
 				mulgfs(h,t[s],&w); addgfs(w,u[s],&w1); u[s] = w1;
+			}
+		}
+	}
+}
+
+void nullspace_gfsn(mat,n,ind)
+GFSN **mat;
+int n;
+int *ind;
+{
+	int i,j,l,s;
+	GFSN w,w1,h,inv;
+	GFSN *t,*u;
+
+	bzero(ind,n*sizeof(int));
+	ind[0] = 0;
+
+	for ( i = j = 0; j < n; i++, j++ ) {
+		for ( ; j < n; j++ ) {
+			for ( l = i; l < n; l++ )
+				if ( mat[l][j] )
+					break;
+			if ( l < n ) {
+				t = mat[i]; mat[i] = mat[l]; mat[l] = t; break;
+			} else
+				ind[j] = 1;
+		}
+		if ( j == n )
+			break;
+		invgfsn(mat[i][j],&inv);
+		for ( s = j, t = mat[i]; s < n; s++ ) {
+			mulgfsn(t[s],inv,&w); t[s] = w;
+		}
+		for ( l = 0; l < n; l++ ) {
+			if ( l == i )
+				continue;
+			u = mat[l]; 
+			chsgngfsn(u[j],&h);
+			for ( s = j; s < n; s++ ) {
+				mulgfsn(h,t[s],&w); addgfsn(w,u[s],&w1); u[s] = w1;
 			}
 		}
 	}