===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/Mgfs.c,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -p -r1.6 -r1.11
--- OpenXM_contrib2/asir2000/engine/Mgfs.c	2001/06/25 10:01:28	1.6
+++ OpenXM_contrib2/asir2000/engine/Mgfs.c	2001/10/09 01:36:10	1.11
@@ -1,15 +1,19 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/Mgfs.c,v 1.5 2001/06/25 05:30:49 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/Mgfs.c,v 1.10 2001/09/03 01:04:26 noro Exp $ */
 
 #include "ca.h"
 
 extern int up_kara_mag, current_gfs_q1;
 extern int *current_gfs_plus1;
 
-void mulssfum(UM,int,UM);
-void kmulsfummain(UM,UM,UM);
+#if defined(__GNUC__)
+#define INLINE inline
+#elif defined(VISUAL)
+#define INLINE __inline
+#else
+#define INLINE
+#endif
 
-inline int _ADDSF(a,b)
-int a,b;
+INLINE int _ADDSF(int a,int b)
 {
 	if ( !a )
 		return b;
@@ -42,8 +46,7 @@ int a,b;
 	}
 }
 
-inline int _MULSF(a,b)
-int a,b;
+INLINE int _MULSF(int a,int b)
 {
 	if ( !a || !b )
 		return 0;
@@ -55,8 +58,7 @@ int a,b;
 	}
 }
 
-void addsfum(p1,p2,pr)
-UM p1,p2,pr;
+void addsfum(UM p1,UM p2,UM pr)
 {
 	int *c1,*c2,*cr,i,dmax,dmin;
 		
@@ -83,8 +85,7 @@ UM p1,p2,pr;
 		DEG(pr) = dmax;
 }
 
-void subsfum(p1,p2,pr)
-UM p1,p2,pr;
+void subsfum(UM p1,UM p2,UM pr)
 {
 	int *c1,*c2,*cr,i;
 	int dmax,dmin;
@@ -119,8 +120,7 @@ UM p1,p2,pr;
 		DEG(pr) = dmax;
 }
 		
-void gcdsfum(p1,p2,pr)
-UM p1,p2,pr;
+void gcdsfum(UM p1,UM p2,UM pr)
 {
 	int inv;
 	UM t1,t2,q,tum;
@@ -144,8 +144,8 @@ UM p1,p2,pr;
 		mulssfum(t2,inv,pr);
 	}
 }
-void mulsfum(p1,p2,pr)
-UM p1,p2,pr;
+
+void mulsfum(UM p1,UM p2,UM pr)
 {
 	int *pc1,*pcr;
 	int *c1,*c2,*cr;
@@ -166,9 +166,7 @@ UM p1,p2,pr;
 	DEG(pr) = d1 + d2;
 }
 
-void mulssfum(p,n,pr)
-int n;
-UM p,pr;
+void mulssfum(UM p,int n,UM pr)
 {
 	int *sp,*dp;
 	int i;
@@ -178,8 +176,7 @@ UM p,pr;
 		*dp = _MULSF(*sp,n);
 }
 	
-void kmulsfum(n1,n2,nr)
-UM n1,n2,nr;
+void kmulsfum(UM n1,UM n2,UM nr)
 {
 	UM n,t,s,m,carry;
 	int d,d1,d2,len,i,l;
@@ -226,8 +223,7 @@ UM n1,n2,nr;
 	bcopy((char *)r0,(char *)COEF(nr),l*sizeof(int));
 }
 
-void kmulsfummain(n1,n2,nr)
-UM n1,n2,nr;
+void kmulsfummain(UM n1,UM n2,UM nr)
 {
 	int d1,d2,h,len;
 	UM n1lo,n1hi,n2lo,n2hi,hi,lo,mid1,mid2,mid,s1,s2,t1,t2;
@@ -261,8 +257,7 @@ UM n1,n2,nr;
 		copyum(t1,nr);
 }
 
-int divsfum(p1,p2,pq)
-UM p1,p2,pq;
+int divsfum(UM p1,UM p2,UM pq)
 {
 	int *pc1,*pct;
 	int *c1,*c2,*ct;
@@ -298,8 +293,7 @@ UM p1,p2,pq;
 	return i;
 }
 
-void diffsfum(f,fd)
-UM f,fd;
+void diffsfum(UM f,UM fd)
 {
 	int *dp,*sp;
 	int i;
@@ -311,8 +305,7 @@ UM f,fd;
 	degum(fd,DEG(f) - 1);
 }
 
-void monicsfum(f)
-UM f;
+void monicsfum(UM f)
 {
 	int *sp;
 	int i,inv;
@@ -323,130 +316,93 @@ UM f;
 		*sp = _MULSF(*sp,inv);
 }
 
-void addsfarray(int,int *,int *);
-void mulsfarray_trunc(int,int *,int *,int *);
-
-void mulsflum(n,f1,f2,fr)
-int n;
-LUM f1,f2,fr;
+int compsfum(UM a,UM b)
 {
-	int max;
-	int i,j,**p1,**p2,*px;
-	int *w,*w1,*w2;
+	int i,da,db;
 
-	p1 = (int **)COEF(f1); p2 = (int **)COEF(f2);
-	w = W_ALLOC(2*(n+1)); w1 = W_ALLOC(DEG(f1)); w2 = W_ALLOC(DEG(f2));
-	for ( i = DEG(f1); i >= 0; i-- ) {
-		for ( j = n - 1, px = p1[i]; ( j >= 0 ) && ( px[j] == 0 ); j-- );
-		w1[i] = ( j == -1 ? 0 : 1 );
+	if ( !a )
+		return !b?0:1;
+	else if ( !b )
+		return 1;
+	else if ( (da = DEG(a)) > (db = DEG(b)) )
+		return 1;
+	else if ( da < db )
+		return -1;
+	else {
+		for ( i = da; i >= 0 && COEF(a)[i] == COEF(b)[i]; i-- );
+		if ( i < 0 )
+			return 0;
+		else if ( (unsigned int)COEF(a)[i] > (unsigned int)COEF(b)[i] )
+			return 1;
+		else
+			return -1;
 	}
-	for ( i = DEG(f2); i >= 0; i-- ) {
-		for ( j = n - 1, px = p2[i]; ( j >= 0 ) && ( px[j] == 0 ); j-- );
-		w2[i] = ( j == -1 ? 0 : 1 );
-	}
-	for ( j = DEG(fr) = DEG(f1) + DEG(f2); j >= 0; j-- ) {
-		for ( i = n - 1, px = COEF(fr)[j]; i >= 0; i-- ) 
-			px[i] = 0;
-		for ( max = MIN(DEG(f1),j), i = MAX(0,j-DEG(f2)); i <= max; i++ ) 
-			if ( w1[i] != 0 && w2[j - i] != 0 ) {
-				mulsfarray_trunc(n,p1[i],p2[j - i],w); addsfarray(n,w,px);
-			}
-	}
 }
 
+void addsfarray(int,int *,int *);
+void mulsfarray_trunc(int,int *,int *,int *);
+
 /* f1 = f1->c[0]+f1->c[1]*y+...,  f2 = f2->c[0]+f2->c[1]*y+... mod y^n */
 
-void mulsfbm(bound,f1,f2,fr)
-int bound;
-BM f1,f2,fr;
+void mulsfbm(BM f1,BM f2,BM fr)
 {
 	UM mul,t,s;
-	int i,j,h,d1,d2;
+	int i,j,d1,d2,dy;
 
-	if ( DEG(f1) < bound || DEG(f2) < bound )
-		error("mulsfbm : invalid input");
+	dy = MIN(DEG(f1),DEG(f2));
 
-	d1 = degsfbm(bound,f1);
-	d2 = degsfbm(bound,f2);
+	d1 = degbm(f1);
+	d2 = degbm(f2);
 	t = W_UMALLOC(d1+d2);
 	s = W_UMALLOC(d1+d2);
 
-	for ( i = 0; i < bound; i++ ) {
+	for ( i = 0; i <= dy; i++ ) {
 		mul = COEF(f2)[i];
 		if ( DEG(mul) >= 0 )
-		for ( j = 0; i+j < bound; j++ ) {
+		for ( j = 0; i+j <= dy; j++ ) {
 			if ( COEF(f1)[j] ) {
-				mulsfum(COEF(f1)[j],mul,t);
+				kmulsfum(COEF(f1)[j],mul,t);
 				addsfum(t,COEF(fr)[i+j],s);
 				cpyum(s,COEF(fr)[i+j]);
 			}
 		}
 	}
-	DEG(fr) = bound;
+	DEG(fr) = dy;
 }
 
-int degsfbm(bound,f)
-int bound;
-BM f;
+int degbm(BM f)
 {
-	int d,i;
+	int d,i,dy;
 
+	dy = DEG(f);
 	d = DEG(COEF(f)[0]);
-	for ( i = 1; i < bound; i++ )
+	for ( i = 1; i <= dy; i++ )
 		d = MAX(DEG(COEF(f)[i]),d);
 	return d;
 }
 
 /* g += f */
 
-void addtosfbm(bound,f,g)
-int bound;
-BM f,g;
+void addtosfbm(BM f,BM g)
 {
-	int i,d1,d2;
+	int i,d1,d2,dy;
 	UM t;
 
-	d1 = degsfbm(bound,f);
-	d2 = degsfbm(bound,g);
+	dy = DEG(g);
+	if ( DEG(f) > dy )
+		error("addtosfbm : invalid input");
+	dy = MIN(DEG(f),dy);
+	d1 = degbm(f);
+	d2 = degbm(g);
 	t = W_UMALLOC(MAX(d1,d2));
-	for ( i = 0; i < bound; i++ ) {
+	for ( i = 0; i <= dy; i++ ) {
 		addsfum(COEF(f)[i],COEF(g)[i],t);
 		cpyum(t,COEF(g)[i]);
 	}
 }
 
-void addsfarray(n,a1,a2)
-int n;
-int *a1,*a2;
+void eucsfum(UM f1,UM f2,UM a,UM b)
 {
-	int i;
-
-	for ( i = 0; i < n; i++, a1++, a2++ )
-		if ( *a1 )
-			*a2 = _ADDSF(*a1,*a2);
-}
-
-void mulsfarray_trunc(n,a1,a2,r)
-int n;
-int *a1,*a2,*r;
-{
-	int mul,i,j;
-	int *c1,*c2,*cr;
-	int *pc1,*pc2,*pcr;
-
-	bzero(r,n*sizeof(int));
-	c1 = a1; c2 = a2; cr = r;
-	for ( i = 0; i < n; i++, cr++ ) {
-		if ( mul = *c2++ )
-		for ( j = 0, pc1 = c1, pcr = cr; j+i < n; j++, pc1++, pcr++ )
-			if ( *pc1 )
-				*pcr = _ADDSF(_MULSF(*pc1,mul),*pcr);
-	}
-}
-
-void eucsfum(f1,f2,a,b)
-UM f1,f2,a,b;
-{
 	UM g1,g2,a1,a2,a3,wm,q,tum;
 	int d,dr;
 
@@ -479,10 +435,7 @@ UM f1,f2,a,b;
 
 void shiftsfum(UM,int,UM);
 
-void shiftsflum(n,f,ev)
-int n;
-LUM f;
-int ev;
+void shiftsflum(int n,LUM f,int ev)
 {
 	int d,i,j;
 	UM w,w1;
@@ -506,10 +459,7 @@ int ev;
 
 /* f(x) -> g(x) = f(x+a) */
 
-void shiftsfum(f,a,g)
-UM f;
-int a;
-UM g;
+void shiftsfum(UM f,int a,UM g)
 {
 	int n,i;
 	UM pwr,xa,w,t;
@@ -546,86 +496,45 @@ UM g;
 
 /* f(y) -> f(y+a) */
 
-void shiftsfbm(bound,f,a)
-int bound;
-BM f;
-int a;
+void shiftsfbm(BM f,int a)
 {
-	int i,j,d;
+	int i,j,d,dy;
 	UM pwr,ya,w,t,s;
 	UM *c;
 
-	if ( bound <= 0 )
-		return;
-	else {
-		c = COEF(f);
-		d = DEG(c[0]);
-		for ( i = 1; i < bound; i++ )
-			d = MAX(DEG(c[i]),d);
+	dy = DEG(f);
+	c = COEF(f);
+	d = degbm(f);
 
-		w = W_UMALLOC(d);
-		t = W_UMALLOC(d);
-		s = W_UMALLOC(bound);
+	w = W_UMALLOC(d);
+	t = W_UMALLOC(d);
+	s = W_UMALLOC(dy);
 
-		/* pwr = 1 */
-		pwr = W_UMALLOC(bound); DEG(pwr) = 0; COEF(pwr)[0] = _onesf();
+	/* pwr = 1 */
+	pwr = W_UMALLOC(dy); DEG(pwr) = 0; COEF(pwr)[0] = _onesf();
 
-		/* ya = y+a */
-		ya = W_UMALLOC(1); DEG(ya) = 1; 
-		COEF(ya)[0] = a; COEF(ya)[1] = _onesf();
+	/* ya = y+a */
+	ya = W_UMALLOC(1); DEG(ya) = 1; 
+	COEF(ya)[0] = a; COEF(ya)[1] = _onesf();
 
-		for ( i = 0; i < bound; i++ ) {
-			/* c[i] does not change */
-			for ( j = 0; j < i; j++ ) {
-				mulssfum(c[i],COEF(pwr)[j],w);
-				addsfum(w,c[j],t); cpyum(t,c[j]);
-			}
-			if ( i < bound-1 ) {
-				mulsfum(pwr,ya,s); cpyum(s,pwr);
-			}
+	for ( i = 0; i <= dy; i++ ) {
+		/* c[i] does not change */
+		for ( j = 0; j < i; j++ ) {
+			mulssfum(c[i],COEF(pwr)[j],w);
+			addsfum(w,c[j],t); cpyum(t,c[j]);
 		}
+		if ( i < dy ) {
+			mulsfum(pwr,ya,s); cpyum(s,pwr);
+		}
 	}
 }
 
-/* clear the body of f */
-
-void clearsflum(bound,n,f)
-int bound,n;
-LUM f;
+void clearbm(int n,BM f)
 {
-	int **c;
-	int i;
-
-	DEG(f) = 0;
-	for ( c = COEF(f), i = 0; i <= n; i++ )
-		bzero(c[i],(bound+1)*sizeof(int));
-}
-
-void clearsfbm(bound,n,f)
-int bound,n;
-BM f;
-{
-	int i;
+	int i,dy;
 	UM *c;
 
-	DEG(f) = bound;
-	for ( c = COEF(f), i = 0; i < bound; i++ )
+	dy = DEG(f);
+	for ( c = COEF(f), i = 0; i <= dy; i++ )
 		clearum(c[i],n);
-}
-
-/* f += g */
-
-void addtosflum(bound,g,f)
-int bound;
-LUM g,f;
-{
-	int dg,i,j;
-	int **cg,**cf;
-
-	dg = DEG(g);
-	cg = COEF(g);
-	cf = COEF(f);
-	for ( i = 0; i <= dg; i++ )
-		for ( j = 0; j <= bound; j++ )
-			cf[i][j] = _ADDSF(cf[i][j],cg[i][j]);
 }