===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.82
retrieving revision 1.88
diff -u -p -r1.82 -r1.88
--- OpenXM_contrib2/asir2000/engine/nd.c	2003/10/15 03:21:44	1.82
+++ OpenXM_contrib2/asir2000/engine/nd.c	2003/12/24 02:20:19	1.88
@@ -1,8 +1,9 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.81 2003/10/11 02:14:19 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.87 2003/11/05 08:02:45 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
 #include "ox.h"
+#include "base.h"
 #include "inline.h"
 #include <time.h>
 
@@ -117,7 +118,11 @@ typedef struct oIndArray
 int (*ndl_compare_function)(UINT *a1,UINT *a2);
 
 static int ndv_alloc;
+#if 1
 static int nd_f4_nsp=0x7fffffff;
+#else
+static int nd_f4_nsp=50;
+#endif
 static double nd_scale=2;
 static UINT **nd_bound;
 static struct order_spec *nd_ord;
@@ -1768,7 +1773,7 @@ NODE nd_gb(int m,int ishomo,int checkonly)
 	ND_pairs l;
 	ND h,nf,s,head;
 	NDV nfv;
-	Q q;
+	Q q,num,den;
 	union oNDC dn;
 
 	g = 0; d = 0;
@@ -1782,7 +1787,7 @@ again:
 		l = nd_minp(d,&d);
 		if ( SG(l) != sugar ) {
 			if ( ishomo ) {
-				for ( i = nd_psn-1; SG(nd_psh[i]) == sugar; i-- ) {
+				for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) {
 					if ( nd_demand )
 						nfv = ndv_load(i);
 					else
@@ -1790,7 +1795,14 @@ again:
 					s = ndvtond(m,nfv);
 					s = nd_separate_head(s,&head);
 					nd_nf(m,s,nd_ps,1,&dn,&nf);
-					if ( !m ) { mulq(HCQ(head),dn.z,&q); HCQ(head) = q; }
+					if ( !m ) { 
+						NTOQ(NM(dn.z),SGN(dn.z),num);
+						mulq(HCQ(head),num,&q); HCQ(head) = q;
+						if ( DN(dn.z) ) {
+							NTOQ(DN(dn.z),1,den);
+							nd_mul_c_q(nf,den);
+						}
+					}
 					nf = nd_add(m,head,nf);
 					ndv_free(nfv);
 					nd_removecont(m,nf);
@@ -1853,7 +1865,7 @@ NODE nd_gb_trace(int m,int ishomo)
 	ND_pairs l;
 	ND h,nf,nfq,s,head;
 	NDV nfv,nfqv;
-	Q q;
+	Q q,den,num;
 	union oNDC dn;
 
 	g = 0; d = 0;
@@ -1867,7 +1879,7 @@ again:
 		l = nd_minp(d,&d);
 		if ( SG(l) != sugar ) {
 			if ( ishomo ) {
-				for ( i = nd_psn-1; SG(nd_psh[i]) == sugar; i-- ) {
+				for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) {
 					/* for nd_ps */
 					s = ndvtond(m,nd_ps[i]);
 					s = nd_separate_head(s,&head);
@@ -1885,7 +1897,12 @@ again:
 					s = ndvtond(0,nfv);
 					s = nd_separate_head(s,&head);
 					nd_nf(0,s,nd_ps_trace,1,&dn,&nf);
-					mulq(HCQ(head),dn.z,&q); HCQ(head) = q;
+					NTOQ(NM(dn.z),SGN(dn.z),num);
+					mulq(HCQ(head),num,&q); HCQ(head) = q;
+					if ( DN(dn.z) ) {
+						NTOQ(DN(dn.z),1,den);
+						nd_mul_c_q(nf,den);
+					}
 					nf = nd_add(0,head,nf);
 					ndv_free(nfv);
 					nd_removecont(0,nf);
@@ -1974,7 +1991,7 @@ NODE ndv_reduceall(int m,NODE f)
 	NODE t,a0,a;
 	union oNDC dn;
 	NDV *w;
-	Q q;
+	Q q,num,den;
 
 	n = length(f);
 #if 0
@@ -1993,7 +2010,14 @@ NODE ndv_reduceall(int m,NODE f)
 			nd_reconstruct(m,0,0);
 		else {
 			if ( DP_Print ) { printf("."); fflush(stdout); }
-			if ( !m ) { mulq(HCQ(head),dn.z,&q); HCQ(head) = q; }
+			if ( !m ) { 
+				NTOQ(NM(dn.z),SGN(dn.z),num);
+				mulq(HCQ(head),num,&q); HCQ(head) = q;
+				if ( DN(dn.z) ) {
+					NTOQ(DN(dn.z),1,den);
+					nd_mul_c_q(nf,den);
+				}
+			}
 			nf = nd_add(m,head,nf);
 			ndv_free(nd_ps[i]);
 			nd_removecont(m,nf);
@@ -2382,6 +2406,14 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 	ndv_alloc = 0;
 	get_vars((Obj)f,&fv); pltovl(v,&vv);
 	for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
+	switch ( ord->id ) {
+		case 1:
+			if ( ord->nv != nvar )
+				error("nd_{gr,f4} : invalid order specification");
+			break;
+		default:
+			break;
+	}
 	nd_init_ord(ord);
 	for ( t = BDY(f), max = 0; t; t = NEXT(t) )
 		for ( tv = vv; tv; tv = NEXT(tv) ) {
@@ -2426,6 +2458,14 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru
 
 	get_vars((Obj)f,&fv); pltovl(v,&vv);
 	for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
+	switch ( ord->id ) {
+		case 1:
+			if ( ord->nv != nvar )
+				error("nd_gr_trace : invalid order specification");
+			break;
+		default:
+			break;
+	}
 	nocheck = 0;
 	mindex = 0;
 
@@ -2899,7 +2939,9 @@ void nd_setup_parameters(int nvar,int max) {
 
 	nd_nvar = nvar;
 	if ( max ) {
-		if ( max < 2 ) nd_bpe = 1;
+		/* XXX */
+		if ( do_weyl ) nd_bpe = 32;
+		else 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;
@@ -4129,7 +4171,7 @@ NODE nd_f4(int m)
 	ND spol,red;
 	NDV nf,redv;
 	NM s0,s;
-	NODE rp0,sp0,srp0,nflist;
+	NODE rp0,srp0,nflist;
 	int nsp,nred,col,rank,len,k,j,a;
 	UINT c;
 	UINT **spmat;
@@ -4162,7 +4204,7 @@ NODE nd_f4(int m)
 			d = nd_reconstruct(m,0,d);
 			continue;
 		}
-		if ( !sp0 ) continue;
+		if ( bucket->m < 0 ) continue;
 		col = nd_symbolic_preproc(bucket,&s0vect,&rp0);
 		if ( !col ) {
 			for ( t = l; NEXT(t); t = NEXT(t) );