=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.187 retrieving revision 1.190 diff -u -p -r1.187 -r1.190 --- OpenXM_contrib2/asir2000/engine/nd.c 2010/04/26 01:06:22 1.187 +++ OpenXM_contrib2/asir2000/engine/nd.c 2010/07/14 04:36:59 1.190 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.186 2010/04/23 07:35:44 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.189 2010/05/06 09:22:09 noro Exp $ */ #include "nd.h" @@ -2316,10 +2316,8 @@ ND_pairs nd_newpairs( NODE g, int t ) if ( t0 >= min && t0 <= max && t >= min && t <= max ) break; } - if ( nd_gbblock[i] >= 0 ) { - fprintf(stderr,"(%d,%d)",t0,t); + if ( nd_gbblock[i] >= 0 ) continue; - } } NEXTND_pairs(r0,r); r->i1 = (long)BDY(h); @@ -6602,24 +6600,16 @@ void nd_det(int mod,MAT f,P *rp) bucket = create_pbucket(); if ( mi[k] ) { nmv = BDY(mjj); len = LEN(mjj); - fprintf(stderr,"len=%d\n",len); for ( a = 0; a < len; a++, NMV_ADV(nmv) ) { - fprintf(stderr,"."); u = ndv_mul_nmv_trunc(mod,nmv,mi[k],DL(BDY(d))); add_pbucket(mod,bucket,u); - if ( !(a%1000) ) - fprintf(stderr,"%d\n",a); } } if ( mj[k] && mij ) { nmv = BDY(mij); len = LEN(mij); - fprintf(stderr,"len=%d\n",len); for ( a = 0; a < len; a++, NMV_ADV(nmv) ) { - fprintf(stderr,"."); u = ndv_mul_nmv_trunc(mod,nmv,mj[k],DL(BDY(d))); add_pbucket(mod,bucket,u); - if ( !(a%1000) ) - fprintf(stderr,"%d\n",a); } } u = nd_quo(mod,bucket,d); @@ -6969,7 +6959,7 @@ void parse_nd_option(NODE opt) if ( !value || OID(value) != O_LIST ) error("nd_* : invalid value for gbblock option"); u = BDY((LIST)value); - nd_gbblock = MALLOC(2*length(t)+1); + nd_gbblock = MALLOC((2*length(u)+1)*sizeof(int)); for ( i = 0; u; u = NEXT(u) ) { p = BDY((LIST)BDY(u)); s = nd_gbblock[i++] = QTOS((Q)BDY(p));