===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v
retrieving revision 1.42
retrieving revision 1.46
diff -u -p -r1.42 -r1.46
--- OpenXM_contrib2/asir2000/engine/dist.c	2006/08/27 22:17:27	1.42
+++ OpenXM_contrib2/asir2000/engine/dist.c	2013/11/05 02:55:03	1.46
@@ -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.41 2006/08/08 02:39:17 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.45 2012/12/17 07:20:44 noro Exp $ 
 */
 #include "ca.h"
 
@@ -65,8 +65,10 @@
 #define ORD_HOMO_WW_DRL_ZIGZAG 13
 
 int cmpdl_drl_zigzag(), cmpdl_homo_ww_drl_zigzag();
+int cmpdl_top_weight();
 
 int (*cmpdl)()=cmpdl_revgradlex;
+int (*cmpdl_tie_breaker)();
 int (*primitive_cmpdl[3])() = {cmpdl_revgradlex,cmpdl_gradlex,cmpdl_lex};
 
 int do_weyl;
@@ -118,8 +120,13 @@ int has_sfcoef_p(P f)
 	}
 }
 
+extern N *current_top_weight_vector;
+static int current_top_weight_len;
+
 void initd(struct order_spec *spec)
 {
+	int len,i;
+
 	switch ( spec->id ) {
 		case 3:
 			cmpdl = cmpdl_composite;
@@ -165,6 +172,14 @@ void initd(struct order_spec *spec)
 			}
 			break;
 	}
+	if ( current_top_weight_vector ) {
+		cmpdl_tie_breaker = cmpdl;
+		cmpdl = cmpdl_top_weight;
+		for ( len = 0, i = 0; i < spec->nv; i++ )
+			if ( current_top_weight_vector[i] )
+				len = MAX(PL(current_top_weight_vector[i]),len);
+		current_top_weight_len = len;
+	}
 	dp_current_spec = spec;
 }
 
@@ -509,7 +524,7 @@ NODE symb_mul_merge(NODE m1,DL dl,DP f,int n)
 					if ( !cur ) {
 						MKDP(n,m,g);
 						NEXT(prev) = mul_dllist(dl,g);
-						return;
+						return top;
 					}
 					m = NEXT(m);
 					if ( m ) _adddl(n,m->dl,dl,t);
@@ -519,7 +534,7 @@ NODE symb_mul_merge(NODE m1,DL dl,DP f,int n)
 					if ( !cur ) {
 						MKDP(n,m,g);
 						NEXT(prev) = mul_dllist(dl,g);
-						return;
+						return top;
 					}
 					break;
 				case -1:
@@ -642,7 +657,7 @@ void comm_muld(VL vl,DP p1,DP p2,DP *pr)
 			l = l1;
 		}
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -680,7 +695,7 @@ void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr)
 			l = l1;
 		}
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -814,7 +829,7 @@ void weyl_muld(VL vl,DP p1,DP p2,DP *pr)
 	else {
 		for ( m = BDY(p1), l = 0; m; m = NEXT(m), l++ );
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -846,7 +861,7 @@ void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 	else {
 		for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ );
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -858,8 +873,8 @@ void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 		for ( i = 0, tlen = 1; i < n2; i++ )
 			tlen *= d0->d[n2+i]+1;
 		if ( tlen > rtlen ) {
-			if ( tab ) GC_free(tab);
-			if ( psum ) GC_free(psum);
+			if ( tab ) GCFREE(tab);
+			if ( psum ) GCFREE(psum);
 			rtlen = tlen;
 			tab = (struct cdl *)MALLOC(rtlen*sizeof(struct cdl));
 			psum = (MP *)MALLOC(rtlen*sizeof(MP));
@@ -921,7 +936,7 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 	rtab[0].d = d;
 
 	if ( rtablen > tmptablen ) {
-		if ( tmptab ) GC_free(tmptab);
+		if ( tmptab ) GCFREE(tmptab);
 		tmptab = (struct cdl *)MALLOC(rtablen*sizeof(struct cdl));
 		tmptablen = rtablen;
 	}
@@ -947,8 +962,8 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 			continue;
 		}
 		if ( k+1 > tablen ) {
-			if ( tab ) GC_free(tab);
-			if ( ctab ) GC_free(ctab);
+			if ( tab ) GCFREE(tab);
+			if ( ctab ) GCFREE(ctab);
 			tablen = k+1;
 			tab = (struct cdl *)MALLOC(tablen*sizeof(struct cdl));
 			ctab = (Q *)MALLOC(tablen*sizeof(Q));
@@ -1089,16 +1104,10 @@ void adddl(int n,DL d1,DL d2,DL *dr)
 	DL dt;
 	int i;
 
-	if ( !d1->td )
-		*dr = d2;
-	else if ( !d2->td )
-		*dr = d1;
-	else {
-		*dr = dt = (DL)MALLOC_ATOMIC((n+1)*sizeof(int));
-		dt->td = d1->td + d2->td;
-		for ( i = 0; i < n; i++ )
-			dt->d[i] = d1->d[i]+d2->d[i];
-	}
+	*dr = dt = (DL)MALLOC_ATOMIC((n+1)*sizeof(int));
+	dt->td = d1->td + d2->td;
+	for ( i = 0; i < n; i++ )
+		dt->d[i] = d1->d[i]+d2->d[i];
 }
 
 /* d1 += d2 */
@@ -1638,6 +1647,50 @@ int cmpdl_matrix(int n,DL d1,DL d2)
 			return -1;
 	}
 	return 0;
+}
+
+int cmpdl_top_weight(int n,DL d1,DL d2)
+{
+	int *w;
+	N sum,wm,wma,t;
+	N *a;
+	struct oN tn;
+	int len,i,sgn,tsgn;
+	int *t1,*t2;
+
+	w = (int *)ALLOCA(n*sizeof(int));
+	len = current_top_weight_len+3;
+	t1 = d1->d; t2 = d2->d;
+	for ( i = 0; i < n; i++ ) w[i] = t1[i]-t2[i];
+	sum = (N)W_ALLOC(len); sgn = 0;
+	wm = (N)W_ALLOC(len);
+	wma = (N)W_ALLOC(len);
+	a = current_top_weight_vector;
+	for ( i = 0; i < n; i++ ) {
+		if ( !a[i] || !w[i] ) continue;
+		tn.p = 1;
+		if ( w[i] > 0 ) {
+			tn.b[0] = w[i]; tsgn = 1;
+		} else {
+			tn.b[0] = -w[i]; tsgn = -1;
+		}
+		_muln(a[i],&tn,wm);
+		if ( !sgn ) {
+			sgn = tsgn;
+			t = wm; wm = sum; sum = t;
+		} else if ( sgn == tsgn ) {
+			_addn(sum,wm,wma);
+			if ( !PL(wma) )
+				sgn = 0;
+			t = wma; wma = sum; sum = t;
+		} else {
+			sgn *= _subn(sum,wm,wma);
+			t = wma; wma = sum; sum = t;
+		}
+	}
+	if ( sgn > 0 ) return 1;
+	else if ( sgn < 0 ) return -1;
+	else return (*cmpdl_tie_breaker)(n,d1,d2);
 }
 
 GeoBucket create_bucket()