===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v
retrieving revision 1.12
retrieving revision 1.21
diff -u -p -r1.12 -r1.21
--- OpenXM_contrib2/asir2000/engine/dist.c	2000/12/11 02:00:41	1.12
+++ OpenXM_contrib2/asir2000/engine/dist.c	2002/01/30 01:09:07	1.21
@@ -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.11 2000/12/05 06:59:16 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.20 2002/01/28 00:54:43 noro Exp $ 
 */
 #include "ca.h"
 
@@ -60,31 +60,22 @@
 #define ORD_BLEXREV 8
 #define ORD_ELIM 9
 #define ORD_WEYL_ELIM 10
+#define ORD_HOMO_WW_DRL 11
+#define ORD_DRL_ZIGZAG 12
+#define ORD_HOMO_WW_DRL_ZIGZAG 13
 
+int cmpdl_drl_zigzag(), cmpdl_homo_ww_drl_zigzag();
+
 int (*cmpdl)()=cmpdl_revgradlex;
 int (*primitive_cmpdl[3])() = {cmpdl_revgradlex,cmpdl_gradlex,cmpdl_lex};
 
-void comm_muld(VL,DP,DP,DP *);
-void weyl_muld(VL,DP,DP,DP *);
-void weyl_muldm(VL,MP,DP,DP *);
-void weyl_mulmm(VL,MP,MP,int,struct cdl *,int);
-void comm_muld_tab(VL,int,struct cdl *,int,struct cdl *,int,struct cdl *);
-
-void mkwc(int,int,Q *);
-
-int cmpdl_weyl_elim();
-
 int do_weyl;
 
 int dp_nelim,dp_fcoeffs;
 struct order_spec dp_current_spec;
 int *dp_dl_work;
 
-int has_fcoef(DP);
-int has_fcoef_p(P);
-
-int has_fcoef(f)
-DP f;
+int has_fcoef(DP f)
 {
 	MP t;
 
@@ -96,15 +87,17 @@ DP f;
 	return t ? 1 : 0;
 }
 
-int has_fcoef_p(f)
-P f;
+int has_fcoef_p(P f)
 {
 	DCP dc;
 
 	if ( !f )
 		return 0;
 	else if ( NUM(f) )
-		return (NID((Num)f) == N_LM || NID((Num)f) == N_GF2N) ? 1 : 0;
+		return (NID((Num)f) == N_LM 
+			|| NID((Num)f) == N_GF2N
+			|| NID((Num)f) == N_GFPN
+			|| NID((Num)f) == N_GFS) ? 1 : 0;
 	else {
 		for ( dc = DC(f); dc; dc = NEXT(dc) )
 			if ( has_fcoef_p(COEF(dc)) )
@@ -113,8 +106,7 @@ P f;
 	}
 }
 
-void initd(spec)
-struct order_spec *spec;
+void initd(struct order_spec *spec)
 {
 	switch ( spec->id ) {
 		case 2:
@@ -146,6 +138,12 @@ struct order_spec *spec;
 					cmpdl = cmpdl_elim; break;
 				case ORD_WEYL_ELIM:
 					cmpdl = cmpdl_weyl_elim; break;
+				case ORD_HOMO_WW_DRL:
+					cmpdl = cmpdl_homo_ww_drl; break;
+				case ORD_DRL_ZIGZAG:
+					cmpdl = cmpdl_drl_zigzag; break;
+				case ORD_HOMO_WW_DRL_ZIGZAG:
+					cmpdl = cmpdl_homo_ww_drl_zigzag; break;
 				case ORD_LEX: default:
 					cmpdl = cmpdl_lex; break;
 			}
@@ -154,18 +152,16 @@ struct order_spec *spec;
 	dp_current_spec = *spec;
 }
 
-void ptod(vl,dvl,p,pr)
-VL vl,dvl;
-P p;
-DP *pr;
+void ptod(VL vl,VL dvl,P p,DP *pr)
 {
 	int isconst = 0;
-	int n,i;
+	int n,i,j,k;
 	VL tvl;
 	V v;
 	DL d;
 	MP m;
 	DCP dc;
+	DCP *w;
 	DP r,s,t,u;
 	P x,c;
 
@@ -180,15 +176,26 @@ DP *pr;
 			for ( i = 0, tvl = dvl, v = VR(p);
 				tvl && tvl->v != v; tvl = NEXT(tvl), i++ );
 			if ( !tvl ) {
-				for ( dc = DC(p), s = 0, MKV(v,x); dc; dc = NEXT(dc) ) {
-					ptod(vl,dvl,COEF(dc),&t); pwrp(vl,x,DEG(dc),&c);
+				for ( dc = DC(p), k = 0; dc; dc = NEXT(dc), k++ );
+				w = (DCP *)ALLOCA(k*sizeof(DCP));
+				for ( dc = DC(p), j = 0; j < k; dc = NEXT(dc), j++ )
+					w[j] = dc;
+
+				for ( j = k-1, s = 0, MKV(v,x); j >= 0; j-- ) {
+					ptod(vl,dvl,COEF(w[j]),&t); pwrp(vl,x,DEG(w[j]),&c);
 					muldc(vl,t,c,&r); addd(vl,r,s,&t); s = t;
 				}
 				*pr = s;
 			} else {
-				for ( dc = DC(p), s = 0; dc; dc = NEXT(dc) ) {
-					ptod(vl,dvl,COEF(dc),&t);
-					NEWDL(d,n); d->td = QTOS(DEG(dc)); d->d[i] = d->td;
+				for ( dc = DC(p), k = 0; dc; dc = NEXT(dc), k++ );
+				w = (DCP *)ALLOCA(k*sizeof(DCP));
+				for ( dc = DC(p), j = 0; j < k; dc = NEXT(dc), j++ )
+					w[j] = dc;
+
+				for ( j = k-1, s = 0; j >= 0; j-- ) {
+					ptod(vl,dvl,COEF(w[j]),&t);
+					NEWDL(d,n); d->d[i] = QTOS(DEG(w[j]));
+					d->td = MUL_WEIGHT(d->d[i],i);
 					NEWMP(m); m->dl = d; C(m) = (P)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td;
 					comm_muld(vl,t,u,&r); addd(vl,r,s,&t); s = t;
 				}
@@ -196,18 +203,18 @@ DP *pr;
 			}
 		}
 	}
+#if 0
 	if ( !dp_fcoeffs && has_fcoef(*pr) )
 		dp_fcoeffs = 1;
+#endif
 }
 
-void dtop(vl,dvl,p,pr)
-VL vl,dvl;
-DP p;
-P *pr;
+void dtop(VL vl,VL dvl,DP p,P *pr)
 {
-	int n,i;
+	int n,i,j,k;
 	DL d;
 	MP m;
+	MP *a;
 	P r,s,t,u,w;
 	Q q;
 	VL tvl;
@@ -215,7 +222,13 @@ P *pr;
 	if ( !p )
 		*pr = 0;
 	else {
-		for ( n = p->nv, m = BDY(p), s = 0; m; m = NEXT(m) ) {
+		for ( k = 0, m = BDY(p); m; m = NEXT(m), k++ );
+		a = (MP *)ALLOCA(k*sizeof(MP));
+		for ( j = 0, m = BDY(p); j < k; m = NEXT(m), j++ )
+			a[j] = m;
+
+		for ( n = p->nv, j = k-1, s = 0; j >= 0; j-- ) {
+			m = a[j];
 			t = C(m);
 			if ( NUM(t) && NID((Num)t) == N_M ) {
 				mptop(t,&u); t = u;
@@ -231,9 +244,7 @@ P *pr;
 	}
 }
 
-void nodetod(node,dp)
-NODE node;
-DP *dp;
+void nodetod(NODE node,DP *dp)
 {
 	NODE t;
 	int len,i,td;
@@ -251,7 +262,7 @@ DP *dp;
 		else if ( !NUM(e) || !RATN(e) || !INT(e) )
 			error("nodetod : invalid input");
 		else {
-			d->d[i] = QTOS((Q)e); td += d->d[i];
+			d->d[i] = QTOS((Q)e); td += MUL_WEIGHT(d->d[i],i);
 		}
 	}
 	d->td = td;
@@ -259,8 +270,7 @@ DP *dp;
 	MKDP(len,m,u); u->sugar = td; *dp = u;
 }
 
-int sugard(m)
-MP m;
+int sugard(MP m)
 {
 	int s;
 
@@ -269,9 +279,7 @@ MP m;
 	return s;
 }
 
-void addd(vl,p1,p2,pr)
-VL vl;
-DP p1,p2,*pr;
+void addd(VL vl,DP p1,DP p2,DP *pr)
 {
 	int n;
 	MP m1,m2,mr,mr0;
@@ -320,12 +328,10 @@ DP p1,p2,*pr;
 
 /* for F4 symbolic reduction */
 
-void symb_addd(p1,p2,pr)
-DP p1,p2,*pr;
+void symb_addd(DP p1,DP p2,DP *pr)
 {
 	int n;
 	MP m1,m2,mr,mr0;
-	P t;
 
 	if ( !p1 )
 		*pr = p2;
@@ -374,9 +380,7 @@ DP p1,p2,*pr;
  * return : a merged list
  */
 
-NODE symb_merge(m1,m2,n)
-NODE m1,m2;
-int n;
+NODE symb_merge(NODE m1,NODE m2,int n)
 {
 	NODE top,prev,cur,m,t;
 
@@ -420,10 +424,47 @@ int n;
 	}
 }
 
-void subd(vl,p1,p2,pr)
-VL vl;
-DP p1,p2,*pr;
+DLBUCKET symb_merge_bucket(DLBUCKET m1,DLBUCKET m2,int n)
 {
+	DLBUCKET top,prev,cur,m,t;
+
+	if ( !m1 )
+		return m2;
+	else if ( !m2 )
+		return m1;
+	else {
+		if ( m1->td == m2->td ) {
+			top = m1;
+			BDY(top) = symb_merge(BDY(top),BDY(m2),n);
+			m = NEXT(m2);
+		} else if ( m1->td > m2->td ) {
+			top = m1; m = m2;
+		} else {
+			top = m2; m = m1;
+		}
+		prev = top; cur = NEXT(top);
+		/* prev->td > m->td always holds */
+		while ( cur && m ) {
+			if ( cur->td == m->td ) {
+				BDY(cur) = symb_merge(BDY(cur),BDY(m),n);
+				m = NEXT(m);
+				prev = cur; cur = NEXT(cur);
+			} else if ( cur->td > m->td ) {
+				t = NEXT(cur); NEXT(cur) = m; m = t;
+				prev = cur; cur = NEXT(cur);
+			} else {
+				NEXT(prev) = m; m = cur;
+				prev = NEXT(prev); cur = NEXT(prev);
+			}
+		}
+		if ( !cur )
+			NEXT(prev) = m;
+		return top;
+	}
+}
+
+void subd(VL vl,DP p1,DP p2,DP *pr)
+{
 	DP t;
 
 	if ( !p2 )
@@ -433,8 +474,7 @@ DP p1,p2,*pr;
 	}
 }
 
-void chsgnd(p,pr)
-DP p,*pr;
+void chsgnd(DP p,DP *pr)
 {
 	MP m,mr,mr0;
 
@@ -450,9 +490,7 @@ DP p,*pr;
 	}
 }
 
-void muld(vl,p1,p2,pr)
-VL vl;
-DP p1,p2,*pr;
+void muld(VL vl,DP p1,DP p2,DP *pr)
 {
 	if ( ! do_weyl )
 		comm_muld(vl,p1,p2,pr);
@@ -460,9 +498,7 @@ DP p1,p2,*pr;
 		weyl_muld(vl,p1,p2,pr);
 }
 
-void comm_muld(vl,p1,p2,pr)
-VL vl;
-DP p1,p2,*pr;
+void comm_muld(VL vl,DP p1,DP p2,DP *pr)
 {
 	MP m;
 	DP s,t,u;
@@ -498,11 +534,7 @@ DP p1,p2,*pr;
 	}
 }
 
-void muldm(vl,p,m0,pr)
-VL vl;
-DP p;
-MP m0;
-DP *pr;
+void muldm(VL vl,DP p,MP m0,DP *pr)
 {
 	MP m,mr,mr0;
 	P c;
@@ -527,9 +559,7 @@ DP *pr;
 	}
 }
 
-void weyl_muld(vl,p1,p2,pr)
-VL vl;
-DP p1,p2,*pr;
+void weyl_muld(VL vl,DP p1,DP p2,DP *pr)
 {
 	MP m;
 	DP s,t,u;
@@ -562,11 +592,7 @@ DP p1,p2,*pr;
 
 /* monomial * polynomial */
 
-void weyl_muldm(vl,m0,p,pr)
-VL vl;
-MP m0;
-DP p;
-DP *pr;
+void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 {
 	DP r,t,t1;
 	MP m;
@@ -624,16 +650,9 @@ DP *pr;
 /* m0 = x0^d0*x1^d1*... * dx0^e0*dx1^e1*... */
 /* rtab : array of length (e0+1)*(e1+1)*... */
 
-void weyl_mulmm(vl,m0,m1,n,rtab,rtablen)
-VL vl;
-MP m0,m1;
-int n;
-struct cdl *rtab;
-int rtablen;
+void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rtab,int rtablen)
 {
-	MP m,mr,mr0;
-	DP r,t,t1;
-	P c,c0,c1,cc;
+	P c,c0,c1;
 	DL d,d0,d1,dt;
 	int i,j,a,b,k,l,n2,s,min,curlen;
 	struct cdl *p;
@@ -671,10 +690,13 @@ int rtablen;
 	for ( i = 0; i < n2; i++ ) {
 		a = d0->d[i]; b = d1->d[n2+i];
 		k = d0->d[n2+i]; l = d1->d[i];
+
+		/* degree of xi^a*(Di^k*xi^l)*Di^b */
+		a += l;
+		b += k;
+		s = MUL_WEIGHT(a,i)+MUL_WEIGHT(b,n2+i);
+
 		if ( !k || !l ) {
-			a += l;
-			b += k;
-			s = a+b;
 			for ( j = 0, p = rtab; j < curlen; j++, p++ ) {
 				if ( p->c ) {
 					dt = p->d;
@@ -693,8 +715,6 @@ int rtablen;
 			tab = (struct cdl *)MALLOC(tablen*sizeof(struct cdl));
 			ctab = (Q *)MALLOC(tablen*sizeof(Q));
 		}
-		/* degree of xi^a*(Di^k*xi^l)*Di^b */
-		s = a+k+l+b;
 		/* compute xi^a*(Di^k*xi^l)*Di^b */
 		min = MIN(k,l);
 		mkwc(k,l,ctab);
@@ -702,17 +722,17 @@ int rtablen;
 		if ( n & 1 )
 			for ( j = 0; j <= min; j++ ) {
 				NEWDL(d,n);
-				d->d[i] = l-j+a; d->d[n2+i] = k-j+b;
+				d->d[i] = a-j; d->d[n2+i] = b-j;
 				d->td = s;
-				d->d[n-1] = s-(d->d[i]+d->d[n2+i]); 
+				d->d[n-1] = s-(MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i));
 				tab[j].d = d;
 				tab[j].c = (P)ctab[j];
 			}
 		else
 			for ( j = 0; j <= min; j++ ) {
 				NEWDL(d,n);
-				d->d[i] = l-j+a; d->d[n2+i] = k-j+b;
-				d->td = d->d[i]+d->d[n2+i]; /* XXX */
+				d->d[i] = a-j; d->d[n2+i] = b-j;
+				d->td = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i); /* XXX */
 				tab[j].d = d;
 				tab[j].c = (P)ctab[j];
 			}
@@ -732,14 +752,7 @@ int rtablen;
   ]
 */
 
-void comm_muld_tab(vl,nv,t,n,t1,n1,rt)
-VL vl;
-int nv;
-struct cdl *t;
-int n;
-struct cdl *t1;
-int n1;
-struct cdl *rt;
+void comm_muld_tab(VL vl,int nv,struct cdl *t,int n,struct cdl *t1,int n1,struct cdl *rt)
 {
 	int i,j;
 	struct cdl *p;
@@ -761,11 +774,7 @@ struct cdl *rt;
 	}
 }
 
-void muldc(vl,p,c,pr)
-VL vl;
-DP p;
-P c;
-DP *pr;
+void muldc(VL vl,DP p,P c,DP *pr)
 {
 	MP m,mr,mr0;
 
@@ -790,11 +799,7 @@ DP *pr;
 	}
 }
 
-void divsdc(vl,p,c,pr)
-VL vl;
-DP p;
-P c;
-DP *pr;
+void divsdc(VL vl,DP p,P c,DP *pr)
 {
 	MP m,mr,mr0;
 
@@ -812,10 +817,7 @@ DP *pr;
 	}
 }
 
-void adddl(n,d1,d2,dr)
-int n;
-DL d1,d2;
-DL *dr;
+void adddl(int n,DL d1,DL d2,DL *dr)
 {
 	DL dt;
 	int i;
@@ -834,11 +836,8 @@ DL *dr;
 
 /* d1 += d2 */
 
-void adddl_destructive(n,d1,d2)
-int n;
-DL d1,d2;
+void adddl_destructive(int n,DL d1,DL d2)
 {
-	DL dt;
 	int i;
 
 	d1->td += d2->td;
@@ -846,9 +845,7 @@ DL d1,d2;
 		d1->d[i] += d2->d[i];
 }
 
-int compd(vl,p1,p2)
-VL vl;
-DP p1,p2;
+int compd(VL vl,DP p1,DP p2)
 {
 	int n,t;
 	MP m1,m2;
@@ -872,9 +869,7 @@ DP p1,p2;
 	}
 }
 
-int cmpdl_lex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_lex(int n,DL d1,DL d2)
 {
 	int i;
 
@@ -882,9 +877,7 @@ DL d1,d2;
 	return i == n ? 0 : (d1->d[i] > d2->d[i] ? 1 : -1);
 }
 
-int cmpdl_revlex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_revlex(int n,DL d1,DL d2)
 {
 	int i;
 
@@ -892,9 +885,7 @@ DL d1,d2;
 	return i < 0 ? 0 : (d1->d[i] < d2->d[i] ? 1 : -1);
 }
 
-int cmpdl_gradlex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_gradlex(int n,DL d1,DL d2)
 {
 	if ( d1->td > d2->td )
 		return 1;
@@ -904,9 +895,7 @@ DL d1,d2;
 		return cmpdl_lex(n,d1,d2);
 }
 
-int cmpdl_revgradlex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_revgradlex(int n,DL d1,DL d2)
 {
 	register int i;
 	register int *p1,*p2;
@@ -922,9 +911,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_blex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_blex(int n,DL d1,DL d2)
 {
 	int c;
 
@@ -936,9 +923,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_bgradlex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_bgradlex(int n,DL d1,DL d2)
 {
 	int e1,e2,c;
 
@@ -956,9 +941,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_brevgradlex(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_brevgradlex(int n,DL d1,DL d2)
 {
 	int e1,e2,c;
 
@@ -976,9 +959,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_brevrev(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_brevrev(int n,DL d1,DL d2)
 {
 	int e1,e2,f1,f2,c,i;
 
@@ -1005,9 +986,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_bgradrev(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_bgradrev(int n,DL d1,DL d2)
 {
 	int e1,e2,f1,f2,c,i;
 
@@ -1034,9 +1013,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_blexrev(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_blexrev(int n,DL d1,DL d2)
 {
 	int e1,e2,f1,f2,c,i;
 
@@ -1057,9 +1034,7 @@ DL d1,d2;
 	}
 }
 
-int cmpdl_elim(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_elim(int n,DL d1,DL d2)
 {
 	int e1,e2,i;
 
@@ -1074,9 +1049,7 @@ DL d1,d2;
 		return cmpdl_revgradlex(n,d1,d2);
 }
 
-int cmpdl_weyl_elim(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_weyl_elim(int n,DL d1,DL d2)
 {
 	int e1,e2,i;
 
@@ -1094,24 +1067,118 @@ DL d1,d2;
 	else return -cmpdl_revlex(n,d1,d2);
 }
 
-int cmpdl_order_pair(n,d1,d2)
-int n;
-DL d1,d2;
+/*
+	a special ordering
+	1. total order
+	2. (-w,w) for the first 2*m variables
+	3. DRL for the first 2*m variables
+*/
+
+extern int *current_weyl_weight_vector;
+
+int cmpdl_homo_ww_drl(int n,DL d1,DL d2)
 {
+	int e1,e2,m,i;
+	int *p1,*p2;
+
+	if ( d1->td > d2->td )
+		return 1;
+	else if ( d1->td < d2->td )
+		return -1;
+
+	m = n>>1;
+	for ( i = 0, e1 = e2 = 0, p1 = d1->d, p2 = d2->d; i < m; i++ ) {
+		e1 += current_weyl_weight_vector[i]*(p1[m+i] - p1[i]);
+		e2 += current_weyl_weight_vector[i]*(p2[m+i] - p2[i]);
+	}
+	if ( e1 > e2 )
+		return 1;
+	else if ( e1 < e2 )
+		return -1;
+
+	e1 = d1->td - d1->d[n-1];
+	e2 = d2->td - d2->d[n-1];
+	if ( e1 > e2 )
+		return 1;
+	else if ( e1 < e2 )
+		return -1;
+
+	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);
+}
+
+int cmpdl_drl_zigzag(int n,DL d1,DL d2)
+{
+	int i,t,m;
+	int *p1,*p2;
+
+	if ( d1->td > d2->td )
+		return 1;
+	else if ( d1->td < d2->td )
+		return -1;
+	else {
+		m = n>>1;
+		for ( i= m - 1, p1 = d1->d, p2 = d2->d; i >= 0; i-- ) {
+			if ( t = p1[m+i] - p2[m+i] ) return t > 0 ? -1 : 1;
+			if ( t = p1[i] - p2[i] ) return t > 0 ? -1 : 1;
+		}
+		return 0;
+	}
+}
+
+int cmpdl_homo_ww_drl_zigzag(int n,DL d1,DL d2)
+{
+	int e1,e2,m,i,t;
+	int *p1,*p2;
+
+	if ( d1->td > d2->td )
+		return 1;
+	else if ( d1->td < d2->td )
+		return -1;
+
+	m = n>>1;
+	for ( i = 0, e1 = e2 = 0, p1 = d1->d, p2 = d2->d; i < m; i++ ) {
+		e1 += current_weyl_weight_vector[i]*(p1[m+i] - p1[i]);
+		e2 += current_weyl_weight_vector[i]*(p2[m+i] - p2[i]);
+	}
+	if ( e1 > e2 )
+		return 1;
+	else if ( e1 < e2 )
+		return -1;
+
+	e1 = d1->td - d1->d[n-1];
+	e2 = d2->td - d2->d[n-1];
+	if ( e1 > e2 )
+		return 1;
+	else if ( e1 < e2 )
+		return -1;
+
+	for ( i= m - 1, p1 = d1->d, p2 = d2->d; i >= 0; i-- ) {
+		if ( t = p1[m+i] - p2[m+i] ) return t > 0 ? -1 : 1;
+		if ( t = p1[i] - p2[i] ) return t > 0 ? -1 : 1;
+	}
+	return 0;
+}
+
+int cmpdl_order_pair(int n,DL d1,DL d2)
+{
 	int e1,e2,i,j,l;
 	int *t1,*t2;
-	int len;
+	int len,head;
 	struct order_pair *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++ ) {
 		l = pair[i].length;
 		switch ( pair[i].order ) {
 			case 0:
 				for ( j = 0, e1 = e2 = 0; j < l; j++ ) {
-					e1 += t1[j]; e2 += t2[j];
+					e1 += MUL_WEIGHT(t1[j],head+j);
+					e2 += MUL_WEIGHT(t2[j],head+j);
 				}
 				if ( e1 > e2 )
 					return 1;
@@ -1125,7 +1192,8 @@ DL d1,d2;
 				break;
 			case 1:
 				for ( j = 0, e1 = e2 = 0; j < l; j++ ) {
-					e1 += t1[j]; e2 += t2[j];
+					e1 += MUL_WEIGHT(t1[j],head+j);
+					e2 += MUL_WEIGHT(t2[j],head+j);
 				}
 				if ( e1 > e2 )
 					return 1;
@@ -1145,14 +1213,12 @@ DL d1,d2;
 			default:
 				error("cmpdl_order_pair : invalid order"); break;
 		}
-		t1 += l; t2 += l;
+		t1 += l; t2 += l; head += l;
 	}
 	return 0;
 }
 
-int cmpdl_matrix(n,d1,d2)
-int n;
-DL d1,d2;
+int cmpdl_matrix(int n,DL d1,DL d2)
 {
 	int *v,*w,*t1,*t2;
 	int s,i,j,len;