===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v
retrieving revision 1.24
retrieving revision 1.31
diff -u -p -r1.24 -r1.31
--- OpenXM_contrib2/asir2000/engine/dist.c	2003/06/19 07:08:19	1.24
+++ OpenXM_contrib2/asir2000/engine/dist.c	2004/05/14 06:02:54	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/engine/dist.c,v 1.23 2003/05/28 07:32:32 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.30 2004/04/14 07:27:41 ohara Exp $ 
 */
 #include "ca.h"
 
@@ -72,7 +72,8 @@ 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;
+struct modorder_spec *dp_current_modspec;
 int *dp_dl_work;
 
 void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr);
@@ -80,6 +81,15 @@ void comm_quod(VL vl,DP p1,DP p2,DP *pr);
 void muldm_trunc(VL vl,DP p,MP m0,DL dl,DP *pr);
 void muldc_trunc(VL vl,DP p,P c,DL dl,DP *pr);
 
+void order_init()
+{
+	struct order_spec *spec;
+
+	create_order_spec(0,0,&spec);
+	initd(spec);
+	create_modorder_spec(0,0,&dp_current_modspec);
+}
+
 int has_sfcoef(DP f)
 {
 	MP t;
@@ -111,6 +121,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 +165,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)
@@ -286,12 +300,23 @@ void addd(VL vl,DP p1,DP p2,DP *pr)
 	int n;
 	MP m1,m2,mr,mr0;
 	P t;
+	DL d;
 
 	if ( !p1 )
 		*pr = p2;
 	else if ( !p2 )
 		*pr = p1;
 	else {
+		if ( OID(p1) <= O_R ) {
+			n = NV(p2);	NEWDL(d,n);
+			NEWMP(m1); m1->dl = d; C(m1) = (P)p1; NEXT(m1) = 0;
+			MKDP(n,m1,p1); (p1)->sugar = 0;
+		}
+		if ( OID(p2) <= O_R ) {
+			n = NV(p1);	NEWDL(d,n);
+			NEWMP(m2); m2->dl = d; C(m2) = (P)p2; NEXT(m2) = 0;
+			MKDP(n,m2,p2); (p2)->sugar = 0;
+		}
 		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; )
 			switch ( (*cmpdl)(n,m1->dl,m2->dl) ) {
 				case 0:
@@ -385,6 +410,8 @@ void symb_addd(DP p1,DP p2,DP *pr)
 NODE symb_merge(NODE m1,NODE m2,int n)
 {
 	NODE top,prev,cur,m,t;
+	int c,i;
+	DL d1,d2;
 
 	if ( !m1 )
 		return m2;
@@ -405,7 +432,27 @@ NODE symb_merge(NODE m1,NODE m2,int n)
 		prev = top; cur = NEXT(top);
 		/* BDY(prev) > BDY(m) always holds */
 		while ( cur && m ) {
+			d1 = (DL)BDY(cur);
+			d2 = (DL)BDY(m);
+#if 1
 			switch ( (*cmpdl)(n,(DL)BDY(cur),(DL)BDY(m)) ) {
+#else
+			/* XXX only valid for DRL */
+			if ( d1->td > d2->td )
+				c = 1;
+			else if ( d1->td < d2->td )
+				c = -1;
+			else {
+				for ( i = n-1; i >= 0 && d1->d[i] == d2->d[i]; i-- );
+				if ( i < 0 )
+					c = 0;
+				else if ( d1->d[i] < d2->d[i] )
+					c = 1;
+				else
+					c = -1;
+			}
+			switch ( c ) {
+#endif
 				case 0:
 					m = NEXT(m);
 					prev = cur; cur = NEXT(cur);
@@ -1114,7 +1161,7 @@ int cmpdl_gradlex(int n,DL d1,DL d2)
 
 int cmpdl_revgradlex(int n,DL d1,DL d2)
 {
-	register int i;
+	register int i,c;
 	register int *p1,*p2;
 
 	if ( d1->td > d2->td )
@@ -1122,9 +1169,69 @@ int cmpdl_revgradlex(int n,DL d1,DL d2)
 	else if ( d1->td < d2->td )
 		return -1;
 	else {
-		for ( i= n - 1, p1 = d1->d+n-1, p2 = d2->d+n-1;
-			i >= 0 && *p1 == *p2; i--, p1--, p2-- );
-		return i < 0 ? 0 : (*p1 < *p2 ? 1 : -1);
+		i = n-1;
+		p1 = d1->d+n-1;
+		p2 = d2->d+n-1;
+		while ( i >= 7 ) {
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			c = (*p1--) - (*p2--); if ( c ) goto LAST;
+			i -= 8;
+		}
+		switch ( i ) {
+			case 6:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			case 5:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			case 4:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			case 3:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			case 2:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			case 1:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			case 0:
+				c = (*p1--) - (*p2--); if ( c ) goto LAST;
+				return 0;
+			default:
+				return 0;
+		}
+LAST:
+		if ( c > 0 ) return -1;
+		else return 1;
 	}
 }
 
@@ -1385,8 +1492,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++ ) {
@@ -1435,6 +1542,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;
@@ -1443,8 +1619,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++ )
@@ -1455,4 +1631,147 @@ int cmpdl_matrix(int n,DL d1,DL d2)
 			return -1;
 	}
 	return 0;
+}
+
+GeoBucket create_bucket()
+{
+	GeoBucket g;
+
+	g = CALLOC(1,sizeof(struct oGeoBucket));
+	g->m = 32;
+	return g;
+}
+
+void add_bucket(GeoBucket g,NODE d,int nv)
+{
+	int l,k,m;
+
+	l = length(d);
+	for ( k = 0, m = 1; l > m; k++, m <<= 1 );
+	/* 2^(k-1) < l <= 2^k */
+	d = symb_merge(g->body[k],d,nv);
+	for ( ; length(d) > (1<<(k)); k++ ) {
+		g->body[k] = 0;
+		d = symb_merge(g->body[k+1],d,nv);
+	}
+	g->body[k] = d;
+	g->m = MAX(g->m,k);
+}
+
+DL remove_head_bucket(GeoBucket g,int nv)
+{
+	int j,i,c,m;
+	DL d;
+
+	j = -1;
+	m = g->m;
+	for ( i = 0; i <= m; i++ ) {
+		if ( !g->body[i] )
+			continue;
+		if ( j < 0 ) j = i;
+		else {
+			c = (*cmpdl)(nv,g->body[i]->body,g->body[j]->body);
+			if ( c > 0 )
+				j = i;
+			else if ( c == 0 )
+				g->body[i] = NEXT(g->body[i]);	
+		}
+	}
+	if ( j < 0 )
+		return 0;
+	else {
+		d = g->body[j]->body;
+		g->body[j] = NEXT(g->body[j]);
+		return d;
+	}
+}
+
+/*  DPV functions */
+
+void adddv(VL vl,DPV p1,DPV p2,DPV *pr)
+{
+	int i,len;
+	DP *e;
+
+	if ( !p1 || !p2 )
+		error("adddv : invalid argument");
+	else if ( p1->len != p2->len )
+		error("adddv : size mismatch");
+	else {
+		len = p1->len;
+		e = (DP *)MALLOC(p1->len*sizeof(DP));
+		for ( i = 0; i < len; i++ )
+			addd(vl,p1->body[i],p2->body[i],&e[i]);
+		MKDPV(len,e,*pr);
+		(*pr)->sugar = MAX(p1->sugar,p2->sugar);
+	}
+}
+
+void subdv(VL vl,DPV p1,DPV p2,DPV *pr)
+{
+	int i,len;
+	DP *e;
+
+	if ( !p1 || !p2 )
+		error("subdv : invalid argument");
+	else if ( p1->len != p2->len )
+		error("subdv : size mismatch");
+	else {
+		len = p1->len;
+		e = (DP *)MALLOC(p1->len*sizeof(DP));
+		for ( i = 0; i < len; i++ )
+			subd(vl,p1->body[i],p2->body[i],&e[i]);
+		MKDPV(len,e,*pr);
+		(*pr)->sugar = MAX(p1->sugar,p2->sugar);
+	}
+}
+
+void chsgndv(DPV p1,DPV *pr)
+{
+	int i,len;
+	DP *e;
+
+	if ( !p1 )
+		error("subdv : invalid argument");
+	else {
+		len = p1->len;
+		e = (DP *)MALLOC(p1->len*sizeof(DP));
+		for ( i = 0; i < len; i++ )
+			chsgnd(p1->body[i],&e[i]);
+		MKDPV(len,e,*pr);
+		(*pr)->sugar = p1->sugar;
+	}
+}
+
+void muldv(VL vl,DP p1,DPV p2,DPV *pr)
+{
+	int i,len;
+	DP *e;
+
+	len = p2->len;
+	e = (DP *)MALLOC(p2->len*sizeof(DP));
+	if ( !p1 ) {
+		MKDPV(len,e,*pr);
+		(*pr)->sugar = 0;
+	} else {
+		for ( i = 0; i < len; i++ )
+			muld(vl,p1,p2->body[i],&e[i]);
+		MKDPV(len,e,*pr);
+		(*pr)->sugar = p1->sugar + p2->sugar;	
+	}
+}
+
+int compdv(VL vl,DPV p1,DPV p2)
+{
+	int i,t,len;
+
+	if ( p1->len != p2->len )
+		error("compdv : size mismatch");
+	else {
+		len = p1->len;
+		for ( i = 0; i < len; i++ )
+			if ( t = compd(vl,p1->body[i],p2->body[i]) )
+				return t;
+		return 0;
+	}
 }