===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/PD.c,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -p -r1.3 -r1.5
--- OpenXM_contrib2/asir2000/engine/PD.c	2000/08/22 05:04:04	1.3
+++ OpenXM_contrib2/asir2000/engine/PD.c	2001/10/09 01:36:11	1.5
@@ -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.2 2000/08/21 08:31:26 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/PD.c,v 1.4 2001/03/29 09:49:57 noro Exp $ 
 */
 #ifndef FBASE
 #define FBASE
@@ -169,11 +169,7 @@ P p1,p2,*q;
 }
 
 #ifdef FBASE
-void plisttop(f,v,n,gp)
-P *f;
-V v;
-int n;
-P *gp;
+void plisttop(P *f,V v,int n,P *gp)
 {
 	int i;
 	DCP dc,dc0;
@@ -198,9 +194,9 @@ P *gp;
 	}
 }
 
-int divtpz(vl,p1,p2,q)
-VL vl;
-P p1,p2,*q;
+/* for multivariate polynomials over fields */
+
+int divtp(VL vl,P p1,P p2,P *q)
 {
 	register int i,j;
 	register DCP dc1,dc2,dc;
@@ -212,6 +208,107 @@ P p1,p2,*q;
 
 	if ( !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 )
+			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-- ) 
+				if ( !pr[i+d2] ) 
+					continue;
+				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;
+			}
+		}
+	} else {
+		for ( ; (v1 != vl->v) && (v2 != vl->v); vl = NEXT(vl) );
+		if ( v2 == vl->v ) {
+			*q = 0;
+			return 0;
+		} else 
+			return divtdcp(vl,p1,p2,q);
+	}
+}
+
+int divtdcp(VL vl,P p1,P p2,P *q)
+{
+
+	P m;
+	register DCP dc,dcr,dcr0;
+
+	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;
+}
+
+int divtpz(VL vl,P p1,P p2,P *q)
+{
+	register int i,j;
+	register DCP dc1,dc2,dc;
+	P m,m1,s,dvr,t;
+	P *pq,*pr,*pd;
+	V v1,v2;
+	Q deg1,deg2;
+	int d1,d2,sgn;
+
+	if ( !p1 ) {
+		*q = 0;
 		return ( 1 );
 	} else if ( NUM(p2) ) 
 		if ( NUM(p1) ) {
@@ -300,9 +397,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 +414,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 +479,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 +488,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;