===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.77
retrieving revision 1.81
diff -u -p -r1.77 -r1.81
--- OpenXM_contrib2/asir2000/engine/nd.c	2003/10/08 09:09:04	1.77
+++ OpenXM_contrib2/asir2000/engine/nd.c	2003/10/11 02:14:19	1.81
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.76 2003/09/28 09:18:57 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.80 2003/10/10 10:07:18 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -784,10 +784,24 @@ INLINE int ndl_equal(UINT *d1,UINT *d2)
 {
 	int i;
 
-	for ( i = 0; i < nd_wpd; i++ )
-		if ( *d1++ != *d2++ )
-			return 0;
-	return 1;
+	switch ( nd_wpd ) {
+		case 2:
+			if ( TD(d2) != TD(d1) ) return 0;
+			if ( d2[1] != d1[1] ) return 0;
+			return 1;
+			break;
+		case 3:
+			if ( TD(d2) != TD(d1) ) return 0;
+			if ( d2[1] != d1[1] ) return 0;
+			if ( d2[2] != d1[2] ) return 0;
+			return 1;
+			break;
+		default:
+			for ( i = 0; i < nd_wpd; i++ )
+				if ( *d1++ != *d2++ ) return 0;
+			return 1;
+			break;
+	}
 }
 
 INLINE void ndl_copy(UINT *d1,UINT *d2)
@@ -2318,6 +2332,9 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 	NDV b;
 	int ishomo;
 
+	if ( !m && Demand ) nd_demand = 1;
+	else nd_demand = 0;
+
 	ndv_alloc = 0;
 	get_vars((Obj)f,&fv); pltovl(v,&vv);
 	for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
@@ -2367,8 +2384,9 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru
 	nocheck = 0;
 	mindex = 0;
 
-	if ( Demand )
-		nd_demand = 1;
+	if ( Demand ) nd_demand = 1;
+	else nd_demand = 0;
+
 	/* setup modulus */
 	if ( trace < 0 ) {
 		trace = -trace;
@@ -2424,9 +2442,9 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru
 		nd_demand = 0;
 		cand = ndv_reducebase(cand);
 		cand = ndv_reduceall(0,cand);
+		cbpe = nd_bpe;
 		if ( nocheck )
 			break;
-		cbpe = nd_bpe;
 		if ( ndv_check_candidate(in0,obpe,oadv,oepos,cand) )
 			/* success */
 			break;
@@ -2828,31 +2846,30 @@ int nd_get_exporigin(struct order_spec *ord)
 }
 
 void nd_setup_parameters(int nvar,int max) {
-	int i,j,n,elen,ord_o,ord_l,l,s;
+	int i,j,n,elen,ord_o,ord_l,l,s,wpd;
 	struct order_pair *op;
-	int bpe;
 
-	if ( !max ) bpe = nd_bpe;
-	else if ( max < 2 ) bpe = 1;
-	else if ( max < 4 ) bpe = 2;
-	else if ( max < 8 ) bpe = 3;
-	else if ( max < 16 ) bpe = 4;
-	else if ( max < 32 ) bpe = 5;
-	else if ( max < 64 ) bpe = 6;
-	else if ( max < 256 ) bpe = 8;
-	else if ( max < 1024 ) bpe = 10;
-	else if ( max < 65536 ) bpe = 16;
-	else bpe = 32;
-	if ( bpe != nd_bpe || nvar != nd_nvar )
-		nd_free_private_storage();
-	nd_bpe = bpe;
 	nd_nvar = nvar;
+	if ( max ) {
+		if ( max < 2 ) nd_bpe = 1;
+		else if ( max < 4 ) nd_bpe = 2;
+		else if ( max < 8 ) nd_bpe = 3;
+		else if ( max < 16 ) nd_bpe = 4;
+		else if ( max < 32 ) nd_bpe = 5;
+		else if ( max < 64 ) nd_bpe = 6;
+		else if ( max < 256 ) nd_bpe = 8;
+		else if ( max < 1024 ) nd_bpe = 10;
+		else if ( max < 65536 ) nd_bpe = 16;
+		else nd_bpe = 32;
+	}
 	nd_epw = (sizeof(UINT)*8)/nd_bpe;
 	elen = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0);
-
 	nd_exporigin = nd_get_exporigin(nd_ord);
-	nd_wpd = nd_exporigin+elen;
-
+	wpd = nd_exporigin+elen;
+	if ( wpd != nd_wpd ) {
+		nd_free_private_storage();
+		nd_wpd = wpd;
+	}
 	if ( nd_bpe < 32 ) {
 		nd_mask0 = (1<<nd_bpe)-1;
 	} else {
@@ -3820,7 +3837,7 @@ IndArray nm_ind_pair_to_vect_compress(int mod,UINT *s0
 	NDV p;
 	unsigned char *ivc;
 	unsigned short *ivs;
-	UINT *v,*ivi;
+	UINT *v,*ivi,*s0v;
 	int i,j,len,prev,diff,cdiff;
 	IndArray r;
 
@@ -3829,13 +3846,13 @@ IndArray nm_ind_pair_to_vect_compress(int mod,UINT *s0
 	p = nd_ps[pair->index];
 	len = LEN(p);
 	t = (UINT *)ALLOCA(nd_wpd*sizeof(UINT));
-	r = (IndArray)MALLOC(sizeof(struct oIndArray));
 	v = (unsigned int *)ALLOCA(len*sizeof(unsigned int));
 	for ( i = j = 0, s = s0, mr = BDY(p); j < len; j++, NMV_ADV(mr) ) {
 		ndl_add(d,DL(mr),t);	
 		for ( ; !ndl_equal(t,s); s += nd_wpd, i++ );
 		v[j] = i;
 	}
+	r = (IndArray)MALLOC(sizeof(struct oIndArray));
 	r->head = v[0];
 	diff = 0;
 	for ( i = 1; i < len; i++ ) {
@@ -4139,7 +4156,7 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col
 	int **spmat;
 	UINT *svect,*v;
 	int *colstat;
-	struct oEGT eg0,eg1,eg_f4;
+	struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2;
 	NM_ind_pair *rvect;
 	int maxrs;
 	int *spsugar;
@@ -4181,6 +4198,11 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col
 		}
 		nd_free(spol);
 	}
+	get_eg(&eg1); init_eg(&eg_f4_1); add_eg(&eg_f4_1,&eg0,&eg1);
+	if ( DP_Print ) {
+		fprintf(asir_out,"elim1=%fsec,",eg_f4_1.exectime+eg_f4_1.gctime);
+		fflush(asir_out);
+	}
 	/* free index arrays */
 	for ( i = 0; i < nred; i++ ) GC_free(imat[i]->index.c);
 
@@ -4198,8 +4220,10 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col
 		GC_free(spmat[i]);
 	}
 	for ( ; i < sprow; i++ ) GC_free(spmat[i]);
-	get_eg(&eg1); init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg1);
+	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);
 	if ( DP_Print ) {
+		fprintf(asir_out,"elim2=%fsec\n",eg_f4_2.exectime+eg_f4_2.gctime);
 		fprintf(asir_out,"nsp=%d,nred=%d,spmat=(%d,%d),rank=%d  ",
 			nsp,nred,sprow,spcol,rank);
 		fprintf(asir_out,"%fsec\n",eg_f4.exectime+eg_f4.gctime);