===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -p -r1.127 -r1.128
--- OpenXM_contrib2/asir2000/engine/nd.c	2005/08/03 05:01:01	1.127
+++ OpenXM_contrib2/asir2000/engine/nd.c	2005/08/03 06:10:47	1.128
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.126 2005/02/09 14:30:47 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.127 2005/08/03 05:01:01 noro Exp $ */
 
 #include "nd.h"
 
@@ -1284,7 +1284,7 @@ int ndv_check_candidate(NODE input,int obpe,int oadv,E
 	NODE t,s;
 	union oNDC dn;
 
-	ndv_setup(0,0,cand);
+	ndv_setup(0,0,cand,0);
 	n = length(cand);
 
 	/* membercheck : list is a subset of Id(cand) ? */
@@ -1839,7 +1839,7 @@ NODE ndv_reduceall(int m,NODE f)
 		(int (*)(const void *,const void *))ndv_compare);
 	for ( t = f, i = 0; t; i++, t = NEXT(t) ) BDY(t) = (pointer)w[i];
 #endif
-	ndv_setup(m,0,f);
+	ndv_setup(m,0,f,0);
 	for ( i = 0; i < n; ) {
 		g = ndvtond(m,nd_ps[i]);
 		g = nd_separate_head(g,&head);
@@ -2179,7 +2179,7 @@ int ndv_newps(int m,NDV a,NDV aq)
 	return nd_psn++;
 }
 
-void ndv_setup(int mod,int trace,NODE f)
+void ndv_setup(int mod,int trace,NODE f,int dont_sort)
 {
 	int i,j,td,len,max;
 	NODE s,s0,f0;
@@ -2193,8 +2193,9 @@ void ndv_setup(int mod,int trace,NODE f)
 	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);
-	qsort(w,nd_psn,sizeof(NDV),
-		(int (*)(const void *,const void *))ndv_compare);
+	if ( !dont_sort )
+		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));
@@ -2396,7 +2397,7 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 		if ( b ) { NEXTNODE(fd0,fd); BDY(fd) = (pointer)b; }
 	}
 	if ( fd0 ) NEXT(fd) = 0;
-	ndv_setup(m,0,fd0);
+	ndv_setup(m,0,fd0,0);
 	x = f4?nd_f4(m):nd_gb(m,ishomo,0);
 	nd_demand = 0;
 	x = ndv_reducebase(x);
@@ -2469,7 +2470,7 @@ void nd_gr_postproc(LIST f,LIST v,int m,struct order_s
 		if ( b ) { NEXTNODE(fd0,fd); BDY(fd) = (pointer)b; }
 	}
 	if ( fd0 ) NEXT(fd) = 0;
-	ndv_setup(m,0,fd0);
+	ndv_setup(m,0,fd0,0);
 	for ( x = 0, i = 0; i < nd_psn; i++ )
 		x = update_base(x,i);
 	if ( do_check ) {
@@ -2581,7 +2582,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru
 	while ( 1 ) {
 		if ( Demand )
 			nd_demand = 1;
-		ndv_setup(m,1,fd0);
+		ndv_setup(m,1,fd0,0);
 		cand = nd_gb_trace(m,ishomo || homo);
 		if ( !cand ) {
 			/* failure */
@@ -4032,7 +4033,8 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec
 	if ( m ) ndv_mod(m,(NDV)BDY(in));
 	NEXT(in) = 0;
 
-	ndv_setup(m,0,in0);
+	/* dont sort */
+	ndv_setup(m,0,in0,1);
 	nd_psn--;
 	nd_scale=2;
 	while ( 1 ) {