===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v
retrieving revision 1.26
retrieving revision 1.28
diff -u -p -r1.26 -r1.28
--- OpenXM_contrib2/asir2000/engine/dist.c	2003/08/22 08:14:45	1.26
+++ OpenXM_contrib2/asir2000/engine/dist.c	2004/02/05 08:28:53	1.28
@@ -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/dist.c,v 1.25 2003/07/09 07:11:08 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.27 2004/02/03 23:31:57 noro Exp $ 
 */
 #include "ca.h"
 
@@ -72,7 +72,7 @@ int (*primitive_cmpdl[3])() = {cmpdl_revgradlex,cmpdl_
 int do_weyl;
 
 int dp_nelim,dp_fcoeffs;
-struct order_spec dp_current_spec;
+struct order_spec *dp_current_spec;
 int *dp_dl_work;
 
 void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr);
@@ -111,6 +111,10 @@ int has_sfcoef_p(P f)
 void initd(struct order_spec *spec)
 {
 	switch ( spec->id ) {
+		case 3:
+			cmpdl = cmpdl_composite;
+			dp_dl_work = (int *)MALLOC_ATOMIC(spec->nv*sizeof(int));	
+			break;
 		case 2:
 			cmpdl = cmpdl_matrix;
 			dp_dl_work = (int *)MALLOC_ATOMIC(spec->nv*sizeof(int));	
@@ -151,7 +155,7 @@ void initd(struct order_spec *spec)
 			}
 			break;
 	}
-	dp_current_spec = *spec;
+	dp_current_spec = spec;
 }
 
 void ptod(VL vl,VL dvl,P p,DP *pr)
@@ -1467,8 +1471,8 @@ int cmpdl_order_pair(int n,DL d1,DL d2)
 	int len,head;
 	struct order_pair *pair;
 
-	len = dp_current_spec.ord.block.length;
-	pair = dp_current_spec.ord.block.order_pair;
+	len = dp_current_spec->ord.block.length;
+	pair = dp_current_spec->ord.block.order_pair;
 
 	head = 0;
 	for ( i = 0, t1 = d1->d, t2 = d2->d; i < len; i++ ) {
@@ -1517,6 +1521,75 @@ int cmpdl_order_pair(int n,DL d1,DL d2)
 	return 0;
 }
 
+int cmpdl_composite(int nv,DL d1,DL d2)
+{
+	int n,i,j,k,start,s,len;
+	int *dw;
+	struct sparse_weight *sw;
+	struct weight_or_block *worb;
+	int *w,*t1,*t2;
+
+	n = dp_current_spec->ord.composite.length;
+	worb = dp_current_spec->ord.composite.w_or_b;
+	w = dp_dl_work;
+	for ( i = 0, t1 = d1->d, t2 = d2->d; i < nv; i++ )
+		w[i] = t1[i]-t2[i];
+	for ( i = 0; i < n; i++, worb++ ) {
+		len = worb->length;
+		switch ( worb->type ) {
+			case IS_DENSE_WEIGHT:
+				dw = worb->body.dense_weight;
+				for ( j = 0, s = 0; j < len; j++ )
+					s += dw[j]*w[j];
+				if ( s > 0 ) return 1;
+				else if ( s < 0 ) return -1;
+				break;
+			case IS_SPARSE_WEIGHT:
+				sw = worb->body.sparse_weight;
+				for ( j = 0, s = 0; j < len; j++ )
+					s += sw[j].value*w[sw[j].pos];
+				if ( s > 0 ) return 1;
+				else if ( s < 0 ) return -1;
+				break;
+			case IS_BLOCK:
+				start = worb->body.block.start;
+				switch ( worb->body.block.order ) {
+					case 0:
+						for ( j = 0, k = start, s = 0; j < len; j++, k++ ) {
+							s += MUL_WEIGHT(w[k],k);
+						}
+						if ( s > 0 ) return 1;
+						else if ( s < 0 ) return -1;
+						else {
+							for ( j = k-1; j >= start && w[j] == 0; j-- );
+							if ( j >= start )
+								return w[j] < 0 ? 1 : -1;
+						}
+						break;
+					case 1:
+						for ( j = 0, k = start, s = 0; j < len; j++, k++ ) {
+							s += MUL_WEIGHT(w[k],k);
+						}
+						if ( s > 0 ) return 1;
+						else if ( s < 0 ) return -1;
+						else {
+							for ( j = 0, k = start;  j < len && w[j] == 0; j++, k++ );
+							if ( j < len )
+								return w[j] > 0 ? 1 : -1;
+						}
+						break;
+					case 2:
+						for ( j = 0, k = start;  j < len && w[j] == 0; j++, k++ );
+						if ( j < len )
+							return w[j] > 0 ? 1 : -1;
+						break;
+				}
+				break;
+		}
+	}
+	return 0;
+}
+
 int cmpdl_matrix(int n,DL d1,DL d2)
 {
 	int *v,*w,*t1,*t2;
@@ -1525,8 +1598,8 @@ int cmpdl_matrix(int n,DL d1,DL d2)
 
 	for ( i = 0, t1 = d1->d, t2 = d2->d, w = dp_dl_work; i < n; i++ )
 		w[i] = t1[i]-t2[i];
-	len = dp_current_spec.ord.matrix.row;
-	matrix = dp_current_spec.ord.matrix.matrix;
+	len = dp_current_spec->ord.matrix.row;
+	matrix = dp_current_spec->ord.matrix.matrix;
 	for ( j = 0; j < len; j++ ) {
 		v = matrix[j];
 		for ( i = 0, s = 0; i < n; i++ )