===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/M.c,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -p -r1.6 -r1.9
--- OpenXM_contrib2/asir2000/engine/M.c	2001/06/25 01:35:21	1.6
+++ OpenXM_contrib2/asir2000/engine/M.c	2001/10/09 01:36:10	1.9
@@ -45,14 +45,12 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/M.c,v 1.5 2001/06/07 04:54:40 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/M.c,v 1.8 2001/07/03 01:41:26 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
 
-void addum(mod,p1,p2,pr)
-int mod;
-UM p1,p2,pr;
+void addum(int mod,UM p1,UM p2,UM pr)
 {
 	register int *c1,*c2,*cr,i,dmax,dmin;
 		
@@ -79,9 +77,7 @@ UM p1,p2,pr;
 		DEG(pr) = dmax;
 }
 
-void subum(mod,p1,p2,pr)
-int mod;
-UM p1,p2,pr;
+void subum(int mod,UM p1,UM p2,UM pr)
 {
 	register int *c1,*c2,*cr,i;
 	int dmax,dmin;
@@ -116,9 +112,7 @@ UM p1,p2,pr;
 		DEG(pr) = dmax;
 }
 		
-void pwrum(mod,p,e,pr)
-int mod,e;
-UM p,pr;
+void pwrum(int mod,UM p,int e,UM pr)
 {
 	UM wt,ws;
 
@@ -141,9 +135,7 @@ UM p,pr;
 	}
 }
 
-void gcdum(mod,p1,p2,pr)
-register int mod;
-UM p1,p2,pr;
+void gcdum(int mod,UM p1,UM p2,UM pr)
 {
 	register int inv;
 	UM t1,t2,q,tum;
@@ -168,9 +160,7 @@ UM p1,p2,pr;
 	}
 }
 
-void eucum(mod,f1,f2,a,b)
-register int mod;
-UM f1,f2,a,b;
+void eucum(int mod,UM f1,UM f2,UM a,UM b)
 {
 	UM g1,g2,a1,a2,a3,wm,q,tum;
 	int d,dr;
@@ -199,14 +189,85 @@ UM f1,f2,a,b;
 		DEG(wm) = 0; COEF(wm)[0] = mod - 1;
 	}
 	divum(mod,wm,f2,q); mulsum(mod,q,mod-1,b);
+#if 0
+	t1 = W_UMALLOC(d);
+	t2 = W_UMALLOC(d);
+	t3 = W_UMALLOC(d);
+	mulum(mod,a,f1,t1);
+	mulum(mod,b,f2,t2);
+	addum(mod,t1,t2,t3);
+#endif
 }
 
-void sqfrum(index,count,f,nindex,dcr,pl)
-int index,count,*nindex;
-P f;
-struct oDUM **dcr;
-ML *pl;
+void eucum2(int mod,UM f1,UM f2,UM a,UM b)
 {
+	UM gk,gk1,gk2,ak,ak1,ak2,bk,bk1,bk2,q,t,wm1,wm2,wz;
+	int d,inv;
+	UM t1,t2;
+
+	d = 2*(DEG(f1) + DEG(f2));
+	gk = W_UMALLOC(d); gk1 = W_UMALLOC(d); gk2 = W_UMALLOC(d);
+	ak = W_UMALLOC(d); ak1 = W_UMALLOC(d); ak2 = W_UMALLOC(d);
+	bk = W_UMALLOC(d); bk1 = W_UMALLOC(d); bk2 = W_UMALLOC(d);
+	q = W_UMALLOC(d); wm1 = W_UMALLOC(d); wm2 = W_UMALLOC(d);
+	wz = W_UMALLOC(d);
+	
+	t1 = UMALLOC(1000);
+	t2 = UMALLOC(1000);
+	cpyum(f1,t1);
+	cpyum(f2,t2);
+
+	DEG(ak) = 0; COEF(ak)[0] = 1;
+	DEG(ak1) = -1;
+	DEG(bk) = -1;
+	DEG(bk1) = 0; COEF(bk1)[0] = 1;
+
+	cpyum(f1,gk); cpyum(f2,gk1);
+
+	while ( 1 ) {
+		/* ak*f1+bk*f2 = gk, ak1*f1+bk1*f2 = gk1 */
+		cpyum(gk,gk2);
+		DEG(gk2) = divum(mod,gk2,gk1,q);
+		/* gk2 = gk - q*gk1 */
+		if ( DEG(gk2) == -1 ) 
+			break;
+		/* ak2 = ak - q*ak1, bk2 = bk - q*bk1 */
+		mulum(mod,ak1,q,wm1); subum(mod,ak,wm1,ak2);
+		mulum(mod,bk1,q,wm1); subum(mod,bk,wm1,bk2);
+
+		/* shift */
+		t = ak; ak = ak1; ak1 = ak2; ak2 = t;
+		t = bk; bk = bk1; bk1 = bk2; bk2 = t;
+		t = gk; gk = gk1; gk1 = gk2; gk2 = t;
+	}
+	/* ak1*f1+bk1*f2 = gk1 = GCD(f1,f2) */
+	mulum(mod,ak1,t1,wm1); 
+	mulum(mod,bk1,t2,wm2);
+	addum(mod,wm1,wm2,wz);
+	if ( DEG(wz) != 0 )
+		error("euc 1");
+
+	DEG(ak1) = divum(mod,ak1,f2,q);
+	DEG(bk1) = divum(mod,bk1,f1,q);
+	mulum(mod,ak1,f1,wm1); 
+	mulum(mod,bk1,f2,wm2);
+	addum(mod,wm1,wm2,wz);
+	if ( DEG(wz) != 0 )
+		error("euc 2");
+
+
+	if ( COEF(wz)[0] != 1 ) {
+		inv = invm(COEF(wz)[0],mod);
+		mulsum(mod,ak1,inv,a);
+		mulsum(mod,bk1,inv,b);
+	} else {
+		cpyum(ak1,a);
+		cpyum(bk1,b);
+	}
+}
+
+void sqfrum(int index,int count,P f,int *nindex,struct oDUM **dcr,ML *pl)
+{
 	int i,j,m,n,d,dt,mod;
 	UM wf,wdf,ws,wt,wgcd,mf,mgcd;
 	UM *l;
@@ -257,10 +318,7 @@ ML *pl;
 	l[i] = 0;
 }
 
-void sqfrummain(mod,p,gcd,dcp)
-int mod;
-UM p,gcd;
-struct oDUM **dcp;
+void sqfrummain(int mod,UM p,UM gcd,struct oDUM **dcp)
 {
 	int i,j,n;
 	UM wp,wdp,wc,wd,ws,wt,wq;
@@ -339,8 +397,7 @@ struct oDUM **dcp;
 	dc[j].f = 0;
 }
 
-void cpyum(p1,p2)
-UM p1,p2;
+void cpyum(UM p1,UM p2)
 {
 	register int *c1,*c2,i;
 
@@ -349,19 +406,21 @@ UM p1,p2;
 		c2[i] = c1[i];
 }
 
-void degum(f,n)
-UM f;
-int n;
+void clearum(UM p,int n)
 {
+	DEG(p) = -1;
+	bzero(COEF(p),(n+1)*sizeof(int));
+}
+
+void degum(UM f,int n)
+{
 	register int i,*c;
 
 	for ( i = n, c = COEF(f); ( i >= 0 ) && ( c[i] == 0 ); i-- );
 	DEG(f) = i;
 }
 
-int deg(v,p)
-V v;
-P p;
+int deg(V v,P p)
 {
 	if ( !p )
 		return ( -1 );
@@ -376,8 +435,7 @@ P p;
 		return ( UDEG(p) );
 }
 
-LUM LUMALLOC(n,bound)
-int n,bound;
+LUM LUMALLOC(int n,int bound)
 {
 	LUM p;
 	int **c;
@@ -392,26 +450,24 @@ int n,bound;
 	return p;
 }
 
-BM BMALLOC(n,bound)
-int n,bound;
+/* dx = deg in x, dy = deg in y, c[i] <-> the coef of y^i (poly in x) */
+
+BM BMALLOC(int dx,int dy)
 {
 	BM p;
 	UM *c;
 	int i;
 
-	p = (BM)MALLOC(TRUESIZE(oBM,n,UM));
-	DEG(p) = n;
-	for ( i = 0, c = (UM *)COEF(p); i <= n; i++ ) {
-		c[i] = UMALLOC(bound);
-		DEG(c[i]) = -1;
-		bzero((char *)COEF(c[i]),(bound+1)*sizeof(int));
+	p = (BM)MALLOC(TRUESIZE(oBM,dy,UM));
+	DEG(p) = dy;
+	for ( i = 0, c = (UM *)COEF(p); i <= dy; i++ ) {
+		c[i] = UMALLOC(dx);
+		clearum(c[i],dx);
 	}
 	return p;
 }
 
-void mullum(mod,n,f1,f2,fr)
-int mod,n;
-LUM f1,f2,fr;
+void mullum(int mod,int n,LUM f1,LUM f2,LUM fr)
 {
 	int max;
 	register int i,j,**p1,**p2,*px;
@@ -437,9 +493,7 @@ LUM f1,f2,fr;
 	}
 }
 
-void cpylum(bound,p,r)
-int bound;
-LUM p,r;
+void cpylum(int bound,LUM p,LUM r)
 {
 	register int i,j;
 	register int **pp,**ppr;
@@ -451,10 +505,32 @@ LUM p,r;
 			ppr[i][j] = pp[i][j];
 }
 
-void pwrlum(mod,bound,p,n,r)
-int mod,bound,n;
-LUM p,r;
+int isequalum(UM f1,UM f2)
 {
+	int i;
+
+	if ( DEG(f1) < 0 )
+		if ( DEG(f2) < 0 )
+			return 1;
+		else
+			return 0;
+	else if ( DEG(f2) < 0 )
+		return 0;
+	else {
+		if ( DEG(f1) != DEG(f2) )
+			return 0;
+		for ( i = 0; i <= DEG(f1); i++ )
+			if ( COEF(f1)[i] != COEF(f2)[i] )
+				break;
+		if ( i < DEG(f1) )
+			return 0;
+		else
+			return 1;
+	}
+}
+
+void pwrlum(int mod,int bound,LUM p,int n,LUM r)
+{
 	LUM t,s;
 
 	if ( n == 0 ) {
@@ -477,8 +553,7 @@ LUM p,r;
 	}
 }
 
-int **almat(n,m)
-int n,m;
+int **almat(int n,int m)
 {
 	int **mat,i;
 
@@ -488,9 +563,7 @@ int n,m;
 	return mat;
 }
 
-void mini(mod,f,fr)
-register int mod;
-UM f,fr;
+void mini(int mod,UM f,UM fr)
 {
 	register int i,j,**c,*ptr;
 	int d,dr,dm,n;
@@ -524,10 +597,7 @@ UM f,fr;
 	DEG(fr) = dm + 1;
 }
 
-int minimain(mod,n,m,c)
-register int mod;
-int n,m;
-register int **c;
+int minimain(int mod,int n,int m,int **c)
 {
 	register int *ptr,*ci,*p;
 	register int i,l,a,j,b,inv;