===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.27
retrieving revision 1.31
diff -u -p -r1.27 -r1.31
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2004/02/03 23:31:57	1.27
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2004/03/09 09:40:46	1.31
@@ -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/builtin/dp-supp.c,v 1.26 2003/11/27 07:53:53 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.30 2004/03/05 02:26:52 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -1311,6 +1311,7 @@ void dp_nf_tab_f(DP p,LIST *tab,DP *rp)
 
 /*
  * setting flags
+ * call create_order_spec with vl=0 to set old type order.
  *
  */
 
@@ -1359,6 +1360,52 @@ int create_order_spec(VL vl,Obj obj,struct order_spec 
 		return 0;
 }
 
+void print_composite_order_spec(struct order_spec *spec)
+{
+	int nv,n,len,i,j,k,start;
+	struct weight_or_block *worb;
+
+	nv = spec->nv;
+	n = spec->ord.composite.length;
+	worb = spec->ord.composite.w_or_b;
+	for ( i = 0; i < n; i++, worb++ ) {
+		len = worb->length;
+		printf("[ ");
+		switch ( worb->type ) {
+			case IS_DENSE_WEIGHT:
+				for ( j = 0; j < len; j++ )
+					printf("%d ",worb->body.dense_weight[j]);
+				for ( ; j < nv; j++ )
+					printf("0 ");
+				break;
+			case IS_SPARSE_WEIGHT:
+				for ( j = 0, k = 0; j < nv; j++ )
+					if ( j == worb->body.sparse_weight[k].pos )
+						printf("%d ",worb->body.sparse_weight[k++].value);
+					else
+						printf("0 ");
+				break;
+			case IS_BLOCK:
+				start = worb->body.block.start;
+				for ( j = 0; j < start; j++ ) printf("0 ");
+				switch ( worb->body.block.order ) {
+					case 0:
+						for ( k = 0; k < len; k++, j++ ) printf("R ");
+						break;
+					case 1:
+						for ( k = 0; k < len; k++, j++ ) printf("G ");
+						break;
+					case 2:
+						for ( k = 0; k < len; k++, j++ ) printf("L ");
+						break;
+				}
+				for ( ; j < nv; j++ ) printf("0 ");
+				break;
+		}
+		printf("]\n");
+	}
+}
+
 /* order = [w_or_b, w_or_b, ... ] */
 /* w_or_b = w or b                */
 /* w = [1,2,...] or [x,1,y,2,...] */
@@ -1369,13 +1416,15 @@ int create_composite_order_spec(VL vl,LIST order,struc
 	NODE wb,t,p;
 	struct order_spec *spec;
 	VL tvl;
-	int n,i,j,k,l,len;
+	int n,i,j,k,l,start,end,len,w;
 	int *dw;
 	struct sparse_weight *sw;
 	struct weight_or_block *w_or_b;
 	Obj a0;
 	NODE a;
-	V v;
+	V v,sv,ev;
+	SYMBOL sym;
+	int *top;
 
 	/* l = number of vars in vl */
 	for ( l = 0, tvl = vl; tvl; tvl = NEXT(tvl), l++ );
@@ -1387,39 +1436,136 @@ int create_composite_order_spec(VL vl,LIST order,struc
 	spec->obj = (Obj)order;
 	spec->nv = l;
 	spec->ord.composite.length = n;
-	spec->ord.composite.w_or_b = (struct weight_or_block *)
-		MALLOC(sizeof(struct weight_or_block)*n);
-	for ( t = wb, i = 0; t; t = NEXT(t) ) {
-		a = BDY((LIST)BDY(wb));
+	w_or_b = spec->ord.composite.w_or_b = (struct weight_or_block *)
+		MALLOC(sizeof(struct weight_or_block)*(n+1));
+
+	/* top : register the top variable in each w_or_b specification */
+	top = (int *)ALLOCA(l*sizeof(int));
+	for ( i = 0; i < l; i++ ) top[i] = 0;
+
+	for ( t = wb, i = 0; t; t = NEXT(t), i++ ) {
+		if ( !BDY(t) || OID((Obj)BDY(t)) != O_LIST )
+			error("a list of lists must be specified for the key \"order\"");
+		a = BDY((LIST)BDY(t));
 		len = length(a);
 		a0 = (Obj)BDY(a);
 		if ( !a0 || OID(a0) == O_N ) {
-			/* a is dense weight */
+			/* a is a dense weight vector */
 			dw = (int *)MALLOC(sizeof(int)*len);
-			for ( j = 0, p = a; j < len; p = NEXT(p), j++ )
+			for ( j = 0, p = a; j < len; p = NEXT(p), j++ ) {
+				if ( !INT((Q)BDY(p)) )	
+					error("a dense weight vector must be specified as a list of integers");
 				dw[j] = QTOS((Q)BDY(p));
+			}
 			w_or_b[i].type = IS_DENSE_WEIGHT;
 			w_or_b[i].length = len;
 			w_or_b[i].body.dense_weight = dw;
+
+			/* find the top */
+			for ( k = 0; k < len && !dw[k]; k++ );
+			if ( k < len ) top[k] = 1;
+
 		} else if ( OID(a0) == O_P ) {
+			/* a is a sparse weight vector */
+			len >>= 1;
 			sw = (struct sparse_weight *)
 				MALLOC(sizeof(struct sparse_weight)*len);
 			for ( j = 0, p = a; j < len; j++ ) {
-				v = VR((P)BDY(a)); a = NEXT(a);
+				if ( !BDY(p) || OID((P)BDY(p)) != O_P )
+					error("a sparse weight vector must be specified as [var1,weight1,...]");
+				v = VR((P)BDY(p)); p = NEXT(p);
 				for ( tvl = vl, k = 0; tvl && tvl->v != v;
 					k++, tvl = NEXT(tvl) );
 				if ( !tvl )
-					error("invalid variable name");
+					error("invalid variable name in a sparse weight vector");
 				sw[j].pos = k;
-				sw[j].value = QTOS((Q)BDY(a));
+				if ( !INT((Q)BDY(p)) )
+					error("a sparse weight vector must be specified as [var1,weight1,...]");
+				sw[j].value = QTOS((Q)BDY(p)); p = NEXT(p);
 			}
 			w_or_b[i].type = IS_SPARSE_WEIGHT;
 			w_or_b[i].length = len;
 			w_or_b[i].body.sparse_weight = sw;
-		} else {
-			error("not implemented yet");
-		}		
+
+			/* find the top */
+			for ( k = 0; k < len && !sw[k].value; k++ );
+			if ( k < len ) top[sw[k].pos] = 1;
+		} else if ( OID(a0) == O_RANGE ) {
+			/* [range(v1,v2),w] */
+			sv = VR((P)(((RANGE)a0)->start));
+			ev = VR((P)(((RANGE)a0)->end));
+			for ( tvl = vl, start = 0; tvl && tvl->v != sv; start++, tvl = NEXT(tvl) );
+			if ( !tvl )
+				error("invalid range");
+			for ( end = start; tvl && tvl->v != ev; end++, tvl = NEXT(tvl) );
+			if ( !tvl )
+				error("invalid range");
+			len = end-start+1;
+			sw = (struct sparse_weight *)
+				MALLOC(sizeof(struct sparse_weight)*len);
+			w = QTOS((Q)BDY(NEXT(a)));
+			for ( tvl = vl, k = 0; k < start; k++, tvl = NEXT(tvl) );
+			for ( j = 0 ; k <= end; k++, tvl = NEXT(tvl), j++ ) {
+				sw[j].pos = k;
+				sw[j].value = w;
+			}
+			w_or_b[i].type = IS_SPARSE_WEIGHT;
+			w_or_b[i].length = len;
+			w_or_b[i].body.sparse_weight = sw;
+
+			/* register the top */
+			if ( w ) top[start] = 1;
+		} else if ( OID(a0) == O_SYMBOL ) {
+			/* a is a block */
+			sym = (SYMBOL)a0; a = NEXT(a); len--;
+			if ( OID((Obj)BDY(a)) == O_RANGE ) {
+				sv = VR((P)(((RANGE)BDY(a))->start));
+				ev = VR((P)(((RANGE)BDY(a))->end));
+				for ( tvl = vl, start = 0; tvl && tvl->v != sv; start++, tvl = NEXT(tvl) );
+				if ( !tvl )
+					error("invalid range");
+				for ( end = start; tvl && tvl->v != ev; end++, tvl = NEXT(tvl) );
+				if ( !tvl )
+					error("invalid range");
+				len = end-start+1;
+			} else {
+				for ( start = 0, tvl = vl; tvl->v != VR((P)BDY(a));
+				tvl = NEXT(tvl), start++ );
+				for ( p = NEXT(a), tvl = NEXT(tvl); p;
+					p = NEXT(p), tvl = NEXT(tvl) ) {
+					if ( !BDY(p) || OID((P)BDY(p)) != O_P )
+						error("a block must be specified as [ordsymbol,var1,var2,...]");
+					if ( tvl->v != VR((P)BDY(p)) ) break;
+				}
+				if ( p )
+					error("a block must be contiguous in the variable list");
+			}
+			w_or_b[i].type = IS_BLOCK;
+			w_or_b[i].length = len;
+			w_or_b[i].body.block.start = start;
+			if ( !strcmp(sym->name,"@grlex") )
+				w_or_b[i].body.block.order = 0;
+			else if ( !strcmp(sym->name,"@glex") )
+				w_or_b[i].body.block.order = 1;
+			else if ( !strcmp(sym->name,"@lex") )
+				w_or_b[i].body.block.order = 2;
+			else
+				error("invalid ordername");
+			/* register the tops */
+			for ( j = 0, k = start; j < len; j++, k++ )
+				top[k] = 1;
+		}
 	}
+	for ( k = 0; k < l && top[k]; k++ );
+	if ( k < l ) {
+		/* incomplete order specification; add @grlex */
+		w_or_b[n].type = IS_BLOCK;
+		w_or_b[n].length = l;
+		w_or_b[n].body.block.start = 0;
+		w_or_b[n].body.block.order = 0;
+		spec->ord.composite.length = n+1;
+	}
+	if ( 1 ) print_composite_order_spec(spec);
 }
 
 /*
@@ -1525,6 +1671,8 @@ void homogenize_order(struct order_spec *old,int n,str
 	int length,nv,row,i,j;
 	int **newm,**oldm;
 	struct order_spec *new;
+	int onv,nnv,nlen,olen,owlen;
+	struct weight_or_block *owb,*nwb;
 
 	*newp = new = (struct order_spec *)MALLOC(sizeof(struct order_spec));
 	switch ( old->id ) {
@@ -1574,6 +1722,46 @@ void homogenize_order(struct order_spec *old,int n,str
 			}
 			new->id = 2; new->nv = nv+1;
 			new->ord.matrix.row = row+1; new->ord.matrix.matrix = newm;
+			break;
+		case 3:
+			onv = old->nv;
+			nnv = onv+1;
+			olen = old->ord.composite.length;
+			nlen = olen+1;
+			owb = old->ord.composite.w_or_b;
+			nwb = (struct weight_or_block *)
+				MALLOC(nlen*sizeof(struct weight_or_block));
+			for ( i = 0; i < olen; i++ ) {
+				nwb[i].type = owb[i].type;
+				switch ( owb[i].type ) {
+					case IS_DENSE_WEIGHT:
+						owlen = owb[i].length;
+						nwb[i].length = owlen+1;
+						nwb[i].body.dense_weight = (int *)MALLOC((owlen+1)*sizeof(int));
+						for ( j = 0; j < owlen; j++ )
+							nwb[i].body.dense_weight[j] = owb[i].body.dense_weight[j];
+						nwb[i].body.dense_weight[owlen] = 0;
+						break;
+					case IS_SPARSE_WEIGHT:
+						nwb[i].length = owb[i].length;
+						nwb[i].body.sparse_weight = owb[i].body.sparse_weight;
+						break;
+					case IS_BLOCK:
+						nwb[i].length = owb[i].length;
+						nwb[i].body.block = owb[i].body.block;
+						break;
+				}
+			}
+			nwb[i].type = IS_SPARSE_WEIGHT;
+			nwb[i].body.sparse_weight = 
+				(struct sparse_weight *)MALLOC(sizeof(struct sparse_weight));
+			nwb[i].body.sparse_weight[0].pos = onv;
+			nwb[i].body.sparse_weight[0].value = 1;
+			new->id = 3;
+			new->nv = nnv;
+			new->ord.composite.length = nlen;
+			new->ord.composite.w_or_b = nwb;
+			print_composite_order_spec(new);
 			break;
 		default:
 			error("homogenize_order : invalid input");