===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/PD.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- OpenXM_contrib2/asir2000/engine/PD.c	2000/08/21 08:31:26	1.2
+++ OpenXM_contrib2/asir2000/engine/PD.c	2004/08/18 00:17:02	1.6
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -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/engine/PD.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/PD.c,v 1.5 2001/10/09 01:36:11 noro Exp $ 
 */
 #ifndef FBASE
 #define FBASE
@@ -54,154 +54,138 @@
 #include "b.h"
 #include "ca.h"
 
-void D_DIVSRP(vl,p1,p2,q,r)
-VL vl;
-P p1,p2;
-P *q,*r;
+#include "polydiv.c"
+
+void plisttop(P *f,V v,int n,P *gp)
 {
+	int i;
+	DCP dc,dc0;
+
+	for ( i = n; (i >= 0) && !f[i]; i-- );
+	if ( i < 0 ) 
+		*gp = 0;
+	else if ( i == 0 )
+		*gp = f[0];
+	else {
+		for ( dc0 = 0; i >= 0; i-- ) {
+			if ( !f[i] ) 
+				continue;
+			NEXTDC(dc0,dc);
+			if ( i ) 
+				STOQ(i,DEG(dc));
+			else 
+				DEG(dc) = 0;
+			COEF(dc) = f[i];
+		}
+		NEXT(dc) = 0; MKP(v,dc0,*gp);	
+	}
+}
+
+/* for multivariate polynomials over fields */
+
+int divtp(VL vl,P p1,P p2,P *q)
+{
 	register int i,j;
 	register DCP dc1,dc2,dc;
-	P m,s,dvr;
+	P m,m1,s,dvr,t;
 	P *pq,*pr,*pd;
 	V v1,v2;
 	Q deg1,deg2;
 	int d1,d2,sgn;
 
 	if ( !p1 ) {
-		*q = 0; *r = 0;
-	} else if ( NUM(p2) ) 
-		if ( NUM(p1) ) {
-			DIVNUM(p1,p2,q); *r = 0;
-		} else {
-			DIVSDCP(vl,p1,p2,q); *r = 0;
-		}
-	else if ( NUM(p1) ) {
-		*q = 0; *r = p1;
+		*q = 0;
+		return 1;
+	} else if ( NUM(p2) ) {
+		divsp(vl,p1,p2,q);
+		return 1;
+	} else if ( NUM(p1) ) {
+		*q = 0;
+		return 0;
 	} else if ( ( v1 = VR(p1) ) == ( v2 = VR(p2) ) ) {
 		dc1 = DC(p1); dc2 = DC(p2);
 		deg1 = DEG(dc1); deg2 = DEG(dc2);
 		sgn = cmpq(deg1,deg2);
-		if ( sgn == 0 ) {
-			DIVSP(vl,COEF(dc1),COEF(dc2),q);
-			MULP(vl,p2,*q,&m); SUBP(vl,p1,m,r); 
-		} else if ( sgn < 0 ) {
-			*q = 0; *r = p1;
-		} else {	
-			if ( (PL(NM(deg1)) > 1) ) 
-				error("divsrp : invalid input");
+		if ( sgn == 0 )
+			if ( !divtp(vl,COEF(dc1),COEF(dc2),&m) ) {
+				*q = 0;
+				return 0;
+			} else {
+				mulp(vl,p2,m,&m1); subp(vl,p1,m1,&s); 
+				if ( !s ) {
+					*q = m;
+					return 1;
+				} else {
+					*q = 0;
+					return 0;
+				}
+			}	
+		else if ( sgn < 0 ) {
+			*q = 0;
+			return 0;
+		} else {
+			if ( (PL(NM(deg1)) > 1) ) {
+				error("divtp : invalid input");
+				*q = 0;
+				return ( 0 );
+			}
 			d1 = QTOS(deg1); d2 = QTOS(deg2); 
 			W_CALLOC(d1-d2,P,pq); W_CALLOC(d1,P,pr); W_CALLOC(d2,P,pd);
 			for ( dc = dc1; dc; dc = NEXT(dc) ) 
 				pr[QTOS(DEG(dc))] = COEF(dc);
 			for ( dc = dc2; dc; dc = NEXT(dc) ) 
 				pd[QTOS(DEG(dc))] = COEF(dc);
-			for ( dvr = COEF(dc2), i = d1 - d2; i >= 0; i-- ) {
+			for ( dvr = COEF(dc2), i = d1 - d2; i >= 0; i-- ) 
 				if ( !pr[i+d2] ) 
 					continue;
-				DIVSP(vl,pr[i+d2],dvr,&pq[i]);
-				for ( j = d2; j >= 0; j-- ) {
-					MULP(vl,pq[i],pd[j],&m);
-					SUBP(vl,pr[i + j],m,&s); pr[i + j] = s;
+				else if ( !divtp(vl,pr[i+d2],dvr,&m) ) {
+					*q = 0;
+					return 0;
+				} else {
+					pq[i] = m;
+					for ( j = d2; j >= 0; j-- ) {
+						mulp(vl,pq[i],pd[j],&m);
+						subp(vl,pr[i + j],m,&s); pr[i + j] = s;
+					}
 				}
+			plisttop(pq,v1,d1 - d2,&m); plisttop(pr,v1,d1 - 1,&t);
+			if ( t ) {
+				*q = 0;
+				return 0;
+			} else {
+				*q = m;
+				return 1;
 			}
-			plisttop(pq,v1,d1 - d2,q); plisttop(pr,v1,d1 - 1,r);
 		}
 	} else {
 		for ( ; (v1 != vl->v) && (v2 != vl->v); vl = NEXT(vl) );
 		if ( v2 == vl->v ) {
-			*q = 0; *r = p1;
-		} else
-			DIVSRDCP(vl,p1,p2,q,r);
+			*q = 0;
+			return 0;
+		} else 
+			return divtdcp(vl,p1,p2,q);
 	}
 }
 
-void D_DIVSRDCP(vl,p1,p2,q,r)
-VL vl;
-P p1,p2,*q,*r;
+int divtdcp(VL vl,P p1,P p2,P *q)
 {
 
-	P qc,rc;
-	DCP dc,dcq,dcq0,dcr,dcr0;
-
-	for ( dc = DC(p1), dcq0 = 0, dcr0 = 0; dc; dc = NEXT(dc) ) {
-		DIVSRP(vl,COEF(dc),p2,&qc,&rc);
-		if ( qc ) {
-			NEXTDC(dcq0,dcq); DEG(dcq) = DEG(dc); COEF(dcq) = qc;
-		}
-		if ( rc ) {
-			NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = rc;
-		}
-	}
-	if ( dcq0 ) {
-		NEXT(dcq) = 0; MKP(VR(p1),dcq0,*q);
-	} else
-		*q = 0;
-	if ( dcr0 ) {
-		NEXT(dcr) = 0; MKP(VR(p1),dcr0,*r);
-	} else
-		*r = 0;
-}
-
-void D_DIVSP(vl,p1,p2,q)
-VL vl;
-P p1,p2,*q;
-{
-	P t;
-
-	DIVSRP(vl,p1,p2,q,&t);
-	if ( t ) 
-		error("divsp: cannot happen");
-}
-
-void D_DIVSDCP(vl,p1,p2,q)
-VL vl;
-P p1,p2,*q;
-{
-
 	P m;
 	register DCP dc,dcr,dcr0;
 
-	for ( dc = DC(p1), dcr0 = 0; dc; dc = NEXT(dc) ) {
-		DIVSP(vl,COEF(dc),p2,&m);
-		NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = m; NEXT(dcr) = 0;
-	}
+	for ( dc = DC(p1), dcr0 = 0; dc; dc = NEXT(dc) ) 
+		if ( !divtp(vl,COEF(dc),p2,&m) ) {
+			*q = 0;
+			return 0;
+		} else {
+			NEXTDC(dcr0,dcr); DEG(dcr) = DEG(dc); COEF(dcr) = m; NEXT(dcr) = 0;
+		}
 	MKP(VR(p1),dcr0,*q);
+	return 1;
 }
 
-#ifdef FBASE
-void plisttop(f,v,n,gp)
-P *f;
-V v;
-int n;
-P *gp;
+int divtpz(VL vl,P p1,P p2,P *q)
 {
-	int i;
-	DCP dc,dc0;
-
-	for ( i = n; (i >= 0) && !f[i]; i-- );
-	if ( i < 0 ) 
-		*gp = 0;
-	else if ( i == 0 )
-		*gp = f[0];
-	else {
-		for ( dc0 = 0; i >= 0; i-- ) {
-			if ( !f[i] ) 
-				continue;
-			NEXTDC(dc0,dc);
-			if ( i ) 
-				STOQ(i,DEG(dc));
-			else 
-				DEG(dc) = 0;
-			COEF(dc) = f[i];
-		}
-		NEXT(dc) = 0; MKP(v,dc0,*gp);	
-	}
-}
-
-int divtpz(vl,p1,p2,q)
-VL vl;
-P p1,p2,*q;
-{
 	register int i,j;
 	register DCP dc1,dc2,dc;
 	P m,m1,s,dvr,t;
@@ -300,9 +284,7 @@ P p1,p2,*q;
 	}
 }
 
-int divtdcpz(vl,p1,p2,q)
-VL vl;
-P p1,p2,*q;
+int divtdcpz(VL vl,P p1,P p2,P *q)
 {
 
 	P m;
@@ -319,8 +301,7 @@ P p1,p2,*q;
 	return ( 1 );
 }
 
-void udivpz(f1,f2,fqp,frp)
-P f1,f2,*fqp,*frp;
+void udivpz(P f1,P f2,P *fqp,P *frp)
 {
 	register int n1,n2,i,j;
 	Q *pq,*pr,*pd,d,m,s,q;
@@ -385,10 +366,7 @@ P f1,f2,*fqp,*frp;
 	plisttop((P *)pq,VR(f1),n1-n2,fqp); plisttop((P *)pr,VR(f1),n2-1,frp);
 }
 
-void udivpwm(mod,p1,p2,q,r)
-Q mod;
-P p1,p2;
-P *q,*r;
+void udivpwm(Q mod,P p1,P p2,P *q,P *r)
 {
 	P s,t,u,tq,tr;
 
@@ -397,9 +375,7 @@ P *q,*r;
 	cmp(mod,tr,r); mulpq(tq,t,&s); cmp(mod,s,q); 
 }
 
-void udivpzwm(mod,f1,f2,fqp,frp)
-Q mod;
-P f1,f2,*fqp,*frp;
+void udivpzwm(Q mod,P f1,P f2,P *fqp,P *frp)
 {
 	register int n1,n2,i,j;
 	Q *pq,*pr,*pd,d,m,s,q;
@@ -464,4 +440,3 @@ P f1,f2,*fqp,*frp;
 	}
 	plisttop((P *)pq,VR(f1),n1-n2,fqp); plisttop((P *)pr,VR(f1),n2-1,frp);
 }
-#endif