===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/E.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- OpenXM_contrib2/asir2000/engine/E.c	1999/12/03 07:39:07	1.1
+++ OpenXM_contrib2/asir2000/engine/E.c	2001/05/02 09:03:53	1.6
@@ -1,4 +1,52 @@
-/* $OpenXM: OpenXM/src/asir99/engine/E.c,v 1.1.1.1 1999/11/10 08:12:26 noro Exp $ */
+/*
+ * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED 
+ * All rights reserved.
+ * 
+ * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited,
+ * non-exclusive and royalty-free license to use, copy, modify and
+ * redistribute, solely for non-commercial and non-profit purposes, the
+ * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and
+ * conditions of this Agreement. For the avoidance of doubt, you acquire
+ * only a limited right to use the SOFTWARE hereunder, and FLL or any
+ * third party developer retains all rights, including but not limited to
+ * copyrights, in and to the SOFTWARE.
+ * 
+ * (1) FLL does not grant you a license in any way for commercial
+ * purposes. You may use the SOFTWARE only for non-commercial and
+ * non-profit purposes only, such as academic, research and internal
+ * business use.
+ * (2) The SOFTWARE is protected by the Copyright Law of Japan and
+ * international copyright treaties. If you make copies of the SOFTWARE,
+ * with or without modification, as permitted hereunder, you shall affix
+ * to all such copies of the SOFTWARE the above copyright notice.
+ * (3) An explicit reference to this SOFTWARE and its copyright owner
+ * 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@sec.flab.fujitsu.co.jp of the detailed specification
+ * for such modification or the source code of the modified part of the
+ * SOFTWARE.
+ * 
+ * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL
+ * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND
+ * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES'
+ * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY
+ * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY.
+ * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT,
+ * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL
+ * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES
+ * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES
+ * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY
+ * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF
+ * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART
+ * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
+ * 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.5 2001/04/20 03:10:36 noro Exp $ 
+*/
 #include "ca.h"
 
 void henmv(vl,vn,f,g0,h0,a0,b0,lg,lh,lg0,lh0,q,k,gp,hp)
@@ -468,6 +516,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;
@@ -551,7 +634,7 @@ int getdeg(v,p)
 V v;
 P p;
 {
-	int m;
+	int m,t;
 	DCP dc;
 	
 	if ( !p || NUM(p) ) 
@@ -559,8 +642,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 );
 	}
 }
@@ -722,7 +807,7 @@ int dbound(v,f)
 V v;
 P f;
 {
-	int m;
+	int m,t;
 	DCP dc;
 
 	if ( !f ) 
@@ -730,8 +815,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 );
 	}
 }
@@ -739,7 +826,7 @@ P f;
 int homdeg(f)
 P f;
 {
-	int m;
+	int m,t;
 	DCP dc;
 
 	if ( !f ) 
@@ -747,8 +834,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 );
 	}
 }
@@ -756,7 +845,7 @@ P f;
 int minhomdeg(f)
 P f;
 {
-	int m;
+	int m,t;
 	DCP dc;
 
 	if ( !f ) 
@@ -764,8 +853,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 );
 	}
 }