=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.85 retrieving revision 1.87 diff -u -p -r1.85 -r1.87 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/10/28 03:23:40 1.85 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/11/05 08:02:45 1.87 @@ -1,8 +1,9 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.84 2003/10/18 01:39:42 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.86 2003/10/28 08:47:01 noro Exp $ */ #include "ca.h" #include "parse.h" #include "ox.h" +#include "base.h" #include "inline.h" #include @@ -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; @@ -4183,6 +4188,7 @@ NODE nd_f4(int m) d = nd_reconstruct(m,0,d); continue; } + if ( bucket->m < 0 ) continue; col = nd_symbolic_preproc(bucket,&s0vect,&rp0); if ( !col ) { for ( t = l; NEXT(t); t = NEXT(t) );