===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/E.c,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM_contrib2/asir2000/engine/E.c	2000/08/21 08:31:24	1.2
+++ OpenXM_contrib2/asir2000/engine/E.c	2001/06/07 04:54:40	1.7
@@ -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/E.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/E.c,v 1.6 2001/05/02 09:03:53 noro Exp $ 
 */
 #include "ca.h"
 
@@ -294,9 +294,7 @@ Q *qp;
 	wm = W_UMALLOC(m+n); 
 
 	for ( q = ONE, t = 0, c = 0, index = 0; ; ) {
-		mod = lprime[index++];
-		if ( !mod )
-			error("henzq1 : lprime[] exhausted.");
+		mod = get_lprime(index++);
 		if ( !rem(NM((Q)LC(g)),mod) || !rem(NM((Q)LC(h)),mod) ) 
 			continue;
 		ptomp(mod,g,&tg); ptomp(mod,h,&th);
@@ -342,9 +340,7 @@ Q *qp;
 		mulp(CO,gc0,(P)q,&c); gc0 = c; mulp(CO,hc0,(P)q,&c); hc0 = c;
 	}
 	for ( index = 0; ; ) {
-		mod = lprime[index++];
-		if ( !mod )
-			error("henzq1 : lprime[] exhausted.");
+		mod = get_lprime(index++);
 		if ( !rem(NM((Q)zzz),mod) ||
 			!rem(NM((Q)LC(g)),mod) || 
 			!rem(NM((Q)LC(h)),mod) ) 
@@ -516,6 +512,41 @@ Q n,m,m2,*nr;
 	}
 }
 
+/* 
+	extract d-homogeneous part with respect to vl - {v}
+*/
+
+void exthpc_generic(vl,p,d,v,pr)
+VL vl;
+P p;
+int d;
+V v;
+P *pr;
+{
+	P w,x,t,t1,a,xd;
+	V v0;
+	DCP dc;
+
+	if ( d < 0 || !p )
+		*pr = 0;
+	else if ( NUM(p) )
+		if ( d == 0 )
+			*pr = p;
+		else
+			*pr = 0;
+	else if ( v == VR(p) )
+		exthpc(vl,v,p,d,pr);
+	else {
+		v0 = VR(p);
+		for ( MKV(v0,x), dc = DC(p), w = 0; dc; dc = NEXT(dc) ) {
+			exthpc_generic(vl,COEF(dc),d-QTOS(DEG(dc)),v,&t);
+			pwrp(vl,x,DEG(dc),&xd);
+			mulp(vl,xd,t,&t1); addp(vl,w,t1,&a); w = a;
+		}
+		*pr = w;
+	}
+}
+
 void exthp(vl,p,d,pr)
 VL vl;
 P p;
@@ -599,7 +630,7 @@ int getdeg(v,p)
 V v;
 P p;
 {
-	int m;
+	int m,t;
 	DCP dc;
 	
 	if ( !p || NUM(p) ) 
@@ -607,8 +638,10 @@ P p;
 	else if ( v == VR(p) ) 
 		return ( deg(v,p) );
 	else {
-		for ( dc = DC(p), m = 0; dc; dc = NEXT(dc) ) 
-			m = MAX(m,getdeg(v,COEF(dc)));
+		for ( dc = DC(p), m = 0; dc; dc = NEXT(dc) ) {
+			t = getdeg(v,COEF(dc));
+			m = MAX(m,t);
+		}
 		return ( m );
 	}
 }
@@ -770,7 +803,7 @@ int dbound(v,f)
 V v;
 P f;
 {
-	int m;
+	int m,t;
 	DCP dc;
 
 	if ( !f ) 
@@ -778,8 +811,10 @@ P f;
 	else if ( v != VR(f) ) 
 		return homdeg(f);
 	else {
-		for ( dc = DC(f), m = 0; dc; dc = NEXT(dc) ) 
-			m = MAX(m,homdeg(COEF(dc)));
+		for ( dc = DC(f), m = 0; dc; dc = NEXT(dc) ) {
+			t = homdeg(COEF(dc));
+			m = MAX(m,t);
+		}
 		return ( m );
 	}
 }
@@ -787,7 +822,7 @@ P f;
 int homdeg(f)
 P f;
 {
-	int m;
+	int m,t;
 	DCP dc;
 
 	if ( !f ) 
@@ -795,8 +830,10 @@ P f;
 	else if ( NUM(f) ) 
 		return( 0 );
 	else {
-		for ( dc = DC(f), m = 0; dc; dc = NEXT(dc) ) 
-			m = MAX(m,QTOS(DEG(dc))+homdeg(COEF(dc)));
+		for ( dc = DC(f), m = 0; dc; dc = NEXT(dc) ) {
+			t = QTOS(DEG(dc))+homdeg(COEF(dc));
+			m = MAX(m,t);
+		}
 		return ( m );
 	}
 }
@@ -804,7 +841,7 @@ P f;
 int minhomdeg(f)
 P f;
 {
-	int m;
+	int m,t;
 	DCP dc;
 
 	if ( !f ) 
@@ -812,8 +849,10 @@ P f;
 	else if ( NUM(f) ) 
 		return( 0 );
 	else {
-		for ( dc = DC(f), m = homdeg(f); dc; dc = NEXT(dc) ) 
-			m = MIN(m,QTOS(DEG(dc))+minhomdeg(COEF(dc)));
+		for ( dc = DC(f), m = homdeg(f); dc; dc = NEXT(dc) ) {
+			t = QTOS(DEG(dc))+minhomdeg(COEF(dc));
+			m = MIN(m,t);
+		}
 		return ( m );
 	}
 }