===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.36
retrieving revision 1.39
diff -u -p -r1.36 -r1.39
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2004/05/14 09:20:56	1.36
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2005/08/25 18:59:11	1.39
@@ -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.35 2004/05/14 06:02:54 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.38 2004/12/06 09:29:34 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -62,6 +62,10 @@ extern int NoGCD;
 extern int GenTrace;
 extern NODE TraceList;
 
+int show_orderspec;
+
+void print_composite_order_spec(struct order_spec *spec);
+
 /* 
  * content reduction
  *
@@ -118,6 +122,32 @@ void dp_ptozp2(DP p0,DP p1,DP *hp,DP *rp)
 	*hp = h; *rp = r;
 }
 
+void dp_ptozp3(DP p,Q *dvr,DP *rp)
+{
+	MP m,mr,mr0;
+	int i,n;
+	Q *w;
+	P t;
+
+	if ( !p ) {
+		*rp = 0; *dvr = 0;
+	}else {
+		for ( m =BDY(p), n = 0; m; m = NEXT(m), n++ );
+		w = (Q *)ALLOCA(n*sizeof(Q));
+		for ( m =BDY(p), i = 0; i < n; m = NEXT(m), i++ )
+			if ( NUM(m->c) )
+				w[i] = (Q)m->c;
+			else
+				ptozp(m->c,1,&w[i],&t);
+		sortbynm(w,n);	
+		qltozl(w,n,dvr);
+		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
+			NEXTMP(mr0,mr); divsp(CO,m->c,(P)(*dvr),&mr->c); mr->dl = m->dl;
+		}
+		NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar;
+	}
+}
+
 void dp_idiv(DP p,Q c,DP *rp)
 {
 	Q t;
@@ -1317,7 +1347,7 @@ void dp_nf_tab_f(DP p,LIST *tab,DP *rp)
 
 int create_order_spec(VL vl,Obj obj,struct order_spec **specp)
 {
-	int i,j,n,s,row,col;
+	int i,j,n,s,row,col,ret;
 	struct order_spec *spec;
 	struct order_pair *l;
 	NODE node,t,tn;
@@ -1325,8 +1355,12 @@ int create_order_spec(VL vl,Obj obj,struct order_spec 
 	pointer **b;
 	int **w;
 
-	if ( vl && obj && OID(obj) == O_LIST )
-		return create_composite_order_spec(vl,(LIST)obj,specp);
+	if ( vl && obj && OID(obj) == O_LIST ) {
+		ret = create_composite_order_spec(vl,(LIST)obj,specp);
+		if ( show_orderspec )
+			print_composite_order_spec(*specp);
+		return ret;
+	}
 
 	*specp = spec = (struct order_spec *)MALLOC(sizeof(struct order_spec));
 	if ( !obj || NUM(obj) ) {
@@ -1406,6 +1440,95 @@ void print_composite_order_spec(struct order_spec *spe
 	}
 }
 
+struct order_spec *append_block(struct order_spec *spec,
+	int nv,int nalg,int ord)
+{
+	MAT m,mat;
+	int i,j,row,col,n;
+	Q **b,**wp;
+	int **w;
+	NODE t,s,s0;
+	struct order_pair *l,*l0;
+	int n0,nv0;
+	LIST list0,list1,list;
+	Q oq,nq;
+	struct order_spec *r;
+
+	r = (struct order_spec *)MALLOC(sizeof(struct order_spec));
+	switch ( spec->id ) {
+		case 0:
+			STOQ(spec->ord.simple,oq); STOQ(nv,nq);
+			t = mknode(2,oq,nq); MKLIST(list0,t);
+			STOQ(ord,oq); STOQ(nalg,nq);
+			t = mknode(2,oq,nq); MKLIST(list1,t);
+			t = mknode(2,list0,list1); MKLIST(list,t);
+			l = (struct order_pair *)MALLOC_ATOMIC(2*sizeof(struct order_pair));
+			l[0].order = spec->ord.simple; l[0].length = nv;
+			l[1].order = ord; l[1].length = nalg;
+			r->id = 1;  r->obj = (Obj)list;
+			r->ord.block.order_pair = l;
+			r->ord.block.length = 2;
+			r->nv = nv+nalg;
+			break;
+		case 1:
+			if ( spec->nv != nv )
+				error("append_block : number of variables mismatch");
+			l0 = spec->ord.block.order_pair;
+			n0 = spec->ord.block.length;
+			nv0 = spec->nv;
+			list0 = (LIST)spec->obj;
+			n = n0+1;
+			l = (struct order_pair *)MALLOC_ATOMIC(n*sizeof(struct order_pair));
+			for ( i = 0; i < n0; i++ )
+				l[i] = l0[i];
+			l[i].order = ord; l[i].length = nalg;
+			 for ( t = BDY(list0), s0 = 0; t; t = NEXT(t) ) {
+				NEXTNODE(s0,s); BDY(s) = BDY(t);
+			}
+			STOQ(ord,oq); STOQ(nalg,nq);
+			t = mknode(2,oq,nq); MKLIST(list,t);
+			NEXTNODE(s0,s); BDY(s) = (pointer)list; NEXT(s) = 0;
+			MKLIST(list,s0);
+			r->id = 1;  r->obj = (Obj)list;
+			r->ord.block.order_pair = l;
+			r->ord.block.length = n;
+			r->nv = nv+nalg;
+			break;
+		case 2:
+			if ( spec->nv != nv )
+				error("append_block : number of variables mismatch");
+			m = (MAT)spec->obj;
+			row = m->row; col = m->col; b = (Q **)BDY(m);
+			w = almat(row+nalg,col+nalg);
+			MKMAT(mat,row+nalg,col+nalg); wp = (Q **)BDY(mat);
+			for ( i = 0; i < row; i++ )
+				for ( j = 0; j < col; j++ ) {
+					w[i][j] = QTOS(b[i][j]);
+					wp[i][j] = b[i][j];
+				}
+			for ( i = 0; i < nalg; i++ ) {
+				w[i+row][i+col] = 1;
+				wp[i+row][i+col] = ONE;
+			}
+			r->id = 2; r->obj = (Obj)mat;
+			r->nv = col+nalg; r->ord.matrix.row = row+nalg;
+			r->ord.matrix.matrix = w;
+			break;
+		case 3:
+		default:
+			/* XXX */
+			error("append_block : not implemented yet");
+	}
+	return r;
+}
+
+int comp_sw(struct sparse_weight *a, struct sparse_weight *b)
+{
+	if ( a->pos > b->pos ) return 1;
+	else if ( a->pos < b->pos ) return -1;
+	else return 0;
+}
+
 /* order = [w_or_b, w_or_b, ... ] */
 /* w_or_b = w or b                */
 /* w = [1,2,...] or [x,1,y,2,...] */
@@ -1483,6 +1606,8 @@ int create_composite_order_spec(VL vl,LIST order,struc
 					error("a sparse weight vector must be specified as [var1,weight1,...]");
 				sw[j].value = QTOS((Q)BDY(p)); p = NEXT(p);
 			}
+			qsort(sw,len,sizeof(struct sparse_weight),
+				(int (*)(const void *,const void *))comp_sw);
 			w_or_b[i].type = IS_SPARSE_WEIGHT;
 			w_or_b[i].length = len;
 			w_or_b[i].body.sparse_weight = sw;