===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v
retrieving revision 1.33
retrieving revision 1.35
diff -u -p -r1.33 -r1.35
--- OpenXM_contrib2/asir2000/builtin/gr.c	2001/09/17 08:37:30	1.33
+++ OpenXM_contrib2/asir2000/builtin/gr.c	2001/09/18 00:56:05	1.35
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.32 2001/09/17 07:16:58 noro Exp $
+ * $OpenXM$
 */
 #include "ca.h"
 #include "parse.h"
@@ -60,9 +60,6 @@
 #define INLINE
 #endif
 
-#define ITOS(p) (((unsigned int)(p))&0x7fffffff)
-#define STOI(i) ((P)((unsigned int)(i)|0x80000000))
-
 #define NEXTVL(r,c) \
 if(!(r)){NEWVL(r);(c)=(r);}else{NEWVL(NEXT(c));(c)=NEXT(c);}
 
@@ -251,7 +248,7 @@ CDP *b;
 	r->psindex = (int)BDY(NEXT(tf));
 	r->body = (unsigned int *)MALLOC_ATOMIC(sizeof(unsigned int)*len);
 
-	NEWDL(s,nv);
+	NEWDL_NOINIT(s,nv);
 	for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) {
 		d1 = m->dl;
 		s->td = t->td+d1->td;
@@ -309,7 +306,7 @@ DP f;
 	mp0 = 0;
 	for ( m = BDY(f); m; m = NEXT(m) ) {
 		NEXTNODE(mp0,mp);
-		NEWDL(t,nv);
+		NEWDL_NOINIT(t,nv);
 		d1 = m->dl;
 		t->td = d->td+d1->td;
 		for ( i = 0; i < nv; i++ )
@@ -572,6 +569,7 @@ LIST *rp;
 	}
 	if ( fd0 ) NEXT(fd) = 0;
 	setup_arrays(fd0,m,&s);
+	init_stat();
 	x = gb_f4_mod(s,m);
 	if ( !homogen ) {
 		reduceall_mod(x,m,&xx); x = xx;
@@ -581,6 +579,7 @@ LIST *rp;
 	}
 	if ( r0 ) NEXT(r) = 0;
 	MKLIST(*rp,r0);
+	print_stat();
 }
 
 NODE gb_f4(f)
@@ -721,7 +720,7 @@ int m;
 	int **spmat;
 	CDP *redmat;
 	int *colstat,*w,*w1;
-	int rank,nred,nsp,nonzero,spcol;
+	int rank,nred,nsp,nsp0,nonzero,spcol;
 	int *indred,*isred;
 	CDP ri;
 	int pscalen;
@@ -756,6 +755,8 @@ int m;
 				s0 = symb_merge(s0,dp_dllist(sp),nv);
 			}
 		}
+		if ( DP_Print )
+			fprintf(asir_out,"initial spmat : %d x %d ",length(blist),length(s0));
 		/* s0 : all the terms appeared in symbolic reduction */
 		for ( s = s0, nred = 0; s; s = NEXT(s) ) {
 			for ( r = gall;	r; r = NEXT(r) )
@@ -772,6 +773,8 @@ int m;
 				nred++;
 			}
 		}
+		if ( DP_Print )
+			fprintf(asir_out,"number of reducers : %d\n",nred);
 
 		/* the first nred polys in blist are reducers */
 		/* row = the number of all the polys */
@@ -838,6 +841,7 @@ int m;
 			}
 		}
 		/* update nsp */
+		nsp0 = nsp;
 		nsp = i;
 
 		/* XXX free redmat explicitly */
@@ -873,6 +877,9 @@ int m;
 			fprintf(asir_out,"\n");
 		}
 
+		NZR += rank;
+		ZR += nsp0-rank;
+
 		if ( !rank )
 			continue;
 
@@ -2162,7 +2169,7 @@ void init_stat() {
 	init_eg(&eg_nf); init_eg(&eg_nfm); init_eg(&eg_znfm);
 	init_eg(&eg_pz); init_eg(&eg_np);
 	init_eg(&eg_ra); init_eg(&eg_mc); init_eg(&eg_gc);
-	ZR = NZR = TP = NBP = NFP = NDP = 0;
+	ZR = NZR = TP = NMP = NBP = NFP = NDP = 0;
 }
 
 void print_stat() {