===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.136
retrieving revision 1.143
diff -u -p -r1.136 -r1.143
--- OpenXM_contrib2/asir2000/engine/nd.c	2006/06/11 06:01:55	1.136
+++ OpenXM_contrib2/asir2000/engine/nd.c	2006/08/09 02:48:49	1.143
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.135 2006/06/06 09:00:38 noro Exp $ */
+/* $OpenXM$ */
 
 #include "nd.h"
 
@@ -1592,6 +1592,7 @@ NODE nd_gb(int m,int ishomo,int checkonly)
 	NDV nfv;
 	Q q,num,den;
 	union oNDC dn;
+	int diag_count = 0;
 
 	g = 0; d = 0;
 	for ( i = 0; i < nd_psn; i++ ) {
@@ -1604,6 +1605,7 @@ again:
 		l = nd_minp(d,&d);
 		if ( SG(l) != sugar ) {
 			if ( ishomo ) {
+				diag_count = 0;
 				stat = do_diagonalize(sugar,m);
 				if ( !stat ) {
 					NEXT(l) = d; d = l;
@@ -1639,6 +1641,15 @@ again:
 			}
 			nfv = ndtondv(m,nf); nd_free(nf);
 			nh = ndv_newps(m,nfv,0);
+			if ( !m && (ishomo && ++diag_count == diag_period) ) {
+				diag_count = 0;
+				stat = do_diagonalize(sugar,m);
+				if ( !stat ) {
+					NEXT(l) = d; d = l;
+					d = nd_reconstruct(1,d);
+					goto again;
+				}
+			}
 			d = update_pairs(d,g,nh);
 			g = update_base(g,nh);
 			FREENDP(l);
@@ -2083,7 +2094,7 @@ ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *pres
 NODE update_base(NODE nd,int ndp)
 {
 	UINT *dl, *dln;
-	NODE last, p, head, cur, prev;
+	NODE last, p, head;
 
 	dl = DL(nd_psh[ndp]);
 	for ( head = last = 0, p = nd; p; ) {
@@ -2096,17 +2107,7 @@ NODE update_base(NODE nd,int ndp)
 			p = NEXT(last = p);
 		}
 	}
-#if 1
 	head = append_one(head,ndp);
-#else
-	for ( prev = 0, cur = head;  cur; prev = cur, cur = NEXT(cur) )
-		if ( ndv_compare(&(nd_ps[ndp]),&(nd_ps[(int)BDY(cur)]))<0 ) break;
-	MKNODE(p,(pointer)ndp,cur);
-	if ( !prev ) 
-		head = p;
-	else
-		NEXT(prev) = p;
-#endif
 	return head;
 }
 
@@ -2218,9 +2219,15 @@ void ndv_setup(int mod,int trace,NODE f,int dont_sort)
 	for ( nd_psn = 0, s = f; s; s = NEXT(s) ) if ( BDY(s) ) nd_psn++;
 	w = (NDV *)ALLOCA(nd_psn*sizeof(NDV));
 	for ( i = 0, s = f; s; s = NEXT(s) ) if ( BDY(s) ) w[i++] = BDY(s);
-	if ( !dont_sort )
-		qsort(w,nd_psn,sizeof(NDV),
-			(int (*)(const void *,const void *))ndv_compare);
+	if ( !dont_sort ) {
+		/* XXX heuristic */
+		if ( !nd_ord->id && (nd_ord->ord.simple<2) )
+			qsort(w,nd_psn,sizeof(NDV),
+				(int (*)(const void *,const void *))ndv_compare_rev);
+		else
+			qsort(w,nd_psn,sizeof(NDV),
+				(int (*)(const void *,const void *))ndv_compare);
+	}
 	nd_pslen = 2*nd_psn;
 	nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV));
 	nd_ps_trace = (NDV *)MALLOC(nd_pslen*sizeof(NDV));
@@ -4844,6 +4851,7 @@ NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,U
 	struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2;
 	int maxrs;
 	int *spsugar;
+	pointer *w;
 
 	spcol = col-nred;
 	get_eg(&eg0);
@@ -4877,15 +4885,22 @@ NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,U
 	/* elimination (2nd step) */
 	colstat = (int *)ALLOCA(spcol*sizeof(int));
 	rank = nd_gauss_elim_q(spmat,spsugar,sprow,spcol,colstat);
-	r0 = 0;
+	w = (pointer *)ALLOCA(rank*sizeof(pointer));
 	for ( i = 0; i < rank; i++ ) {
-		NEXTNODE(r0,r); BDY(r) = 
-			(pointer)vect_to_ndv_q(spmat[i],spcol,col,rhead,s0vect);
-		SG((NDV)BDY(r)) = spsugar[i];
+		w[rank-i-1] = (pointer)vect_to_ndv_q(spmat[i],spcol,col,rhead,s0vect);
+		SG((NDV)w[rank-i-1]) = spsugar[i];
 /*		GC_free(spmat[i]); */
 	}
-
+#if 0
+	qsort(w,rank,sizeof(NDV),
+		(int (*)(const void *,const void *))ndv_compare);
+#endif
+	r0 = 0;
+	for ( i = 0; i < rank; i++ ) {
+		NEXTNODE(r0,r); BDY(r) = w[i];
+	}
 	if ( r0 ) NEXT(r) = 0;
+
 /*	for ( ; i < sprow; i++ ) GC_free(spmat[i]); */
 	get_eg(&eg2); init_eg(&eg_f4_2); add_eg(&eg_f4_2,&eg1,&eg2);
 	init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg2);