===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gf.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/asir2000/builtin/gf.c	2001/06/28 08:57:20	1.9
+++ OpenXM_contrib2/asir2000/builtin/gf.c	2001/09/03 07:56:19	1.13
@@ -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.8 2001/06/25 10:01:27 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gf.c,v 1.12 2001/09/03 07:01:05 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);
@@ -209,7 +210,7 @@ NODE *rp;
 	BM fl;
 	BM *r;
 	VL vl,nvl;
-	int i,fn,dx,dy;
+	int i,fn,dx,dy,d;
 	NODE t,top;
 	UM fm,hm,q;
 	UM *gm;
@@ -229,9 +230,10 @@ NODE *rp;
 	x = VR((P)BDY(mfl));
 	y = vl->v == x ? vl->next->v : vl->v;
 
-	for ( i = 0, t = mfl; i < fn; i++, t = NEXT(t) ) {
+	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 */
@@ -240,11 +242,14 @@ NODE *rp;
 		vl = nvl; f = g;
 	}
 	dx = getdeg(x,f);
+	if ( dx != d )
+		error("sfuhensel : product of factors has incompatible degree");
+
 	dy = getdeg(y,f);
-	if ( bound < dy+1 ) bound = dy+1;
-	fl = BMALLOC(dx,bound);
-	ptosfbm(bound,f,fl);
-	shiftsfbm(bound,fl,FTOIF(CONT(ev)));
+	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);
@@ -265,7 +270,7 @@ NODE *rp;
 	r[i] = fl;
 
 	for ( i = fn-1, top = 0; i >= 0; i-- ) {
-		sfbmtop(bound,r[i],x,y,&s);
+		sfbmtop(r[i],x,y,&s);
 		reorderp(CO,vl,s,&u);
 		MKNODE(t,u,top); top = t;
 	}
@@ -905,6 +910,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");
 	}
@@ -1081,6 +1088,47 @@ 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;
+	GFSN one;
+
+	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;
 			}
 		}
 	}