===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v
retrieving revision 1.32
retrieving revision 1.36
diff -u -p -r1.32 -r1.36
--- OpenXM_contrib2/asir2000/builtin/gr.c	2001/09/17 07:16:58	1.32
+++ OpenXM_contrib2/asir2000/builtin/gr.c	2001/10/01 01:58:02	1.36
@@ -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.31 2001/09/17 02:47:07 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.35 2001/09/18 00:56:05 noro Exp $
 */
 #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);}
 
@@ -123,6 +120,7 @@ NODE gbd(NODE,int,NODE,NODE);
 NODE gb(NODE,int,NODE);
 NODE gb_f4(NODE);
 NODE gb_f4_mod(NODE,int);
+NODE gb_f4_mod_old(NODE,int);
 DP_pairs minp(DP_pairs, DP_pairs *);
 void minsugar(DP_pairs,DP_pairs *,DP_pairs *);
 NODE append_one(NODE,int);
@@ -249,9 +247,9 @@ CDP *b;
 	r = (CDP)MALLOC(sizeof(struct oCDP));
  	r->len = len;
 	r->psindex = (int)BDY(NEXT(tf));
-	r->body = (unsigned short *)MALLOC_ATOMIC(sizeof(unsigned short)*len);
+	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 +307,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,7 +570,11 @@ LIST *rp;
 	}
 	if ( fd0 ) NEXT(fd) = 0;
 	setup_arrays(fd0,m,&s);
-	x = gb_f4_mod(s,m);
+	init_stat();
+	if ( do_weyl )
+		x = gb_f4_mod_old(s,m);
+	else
+		x = gb_f4_mod(s,m);
 	if ( !homogen ) {
 		reduceall_mod(x,m,&xx); x = xx;
 	}
@@ -581,6 +583,7 @@ LIST *rp;
 	}
 	if ( r0 ) NEXT(r) = 0;
 	MKLIST(*rp,r0);
+	print_stat();
 }
 
 NODE gb_f4(f)
@@ -721,7 +724,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;
@@ -751,11 +754,15 @@ int m;
 		/* asph : sum of all head terms of spoly */
 		for ( t = dm; t; t = NEXT(t) ) {
 			_dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp);
+/*			fprintf(stderr,"splen=%d-",dp_nt(sp)); */
 			if ( sp ) {
 				MKNODE(bt,sp,blist); blist = bt;
 				s0 = symb_merge(s0,dp_dllist(sp),nv);
+/*				fprintf(stderr,"%d-",length(s0)); */
 			}
 		}
+		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) )
@@ -765,13 +772,18 @@ int m;
 				dltod(BDY(s),nv,&tdp);
 				dp_subd(tdp,ps[(int)BDY(r)],&sd);
 				dt = mul_dllist(BDY(sd)->dl,ps[(int)BDY(r)]);
+/*				fprintf(stderr,"[%d]",length(dt)); */
 				/* list of [t,f] */
 				bt1 = mknode(2,BDY(sd)->dl,BDY(r));
 				MKNODE(bt,bt1,blist); blist = bt;
 				symb_merge(s,dt,nv);
+/*				fprintf(stderr,"%d-",length(s)); */
 				nred++;
 			}
 		}
+/*		fprintf(stderr,"\n"); */
+		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 +850,7 @@ int m;
 			}
 		}
 		/* update nsp */
+		nsp0 = nsp;
 		nsp = i;
 
 		/* XXX free redmat explicitly */
@@ -873,6 +886,9 @@ int m;
 			fprintf(asir_out,"\n");
 		}
 
+		NZR += rank;
+		ZR += nsp0-rank;
+
 		if ( !rank )
 			continue;
 
@@ -914,6 +930,176 @@ int m;
 	return g;
 }
 
+NODE gb_f4_mod_old(f,m)
+NODE f;
+int m;
+{
+	int i,j,k,nh,row,col,nv;
+	NODE r,g,gall;
+	NODE s,s0;
+	DP_pairs d,dm,dr,t;
+	DP h,nf,f1,f2,f21,f21r,sp,sp1,sd,sdm,tdp;
+	MP mp,mp0;
+	NODE blist,bt,nt;
+	DL *ht,*at,*st;
+	int **spmat,**redmat;
+	int *colstat,*w;
+	int rank,nred,nsp,nonzero,spcol;
+	int *indred,*isred,*ri;
+	struct oEGT tmp0,tmp1,tmp2,eg_split_symb,eg_split_elim1,eg_split_elim2;
+	extern struct oEGT eg_symb,eg_elim1,eg_elim2;
+
+	init_eg(&eg_symb); init_eg(&eg_elim1); init_eg(&eg_elim2);
+	for ( gall = g = 0, d = 0, r = f; r; r = NEXT(r) ) {
+		i = (int)BDY(r);
+		d = updpairs(d,g,i);
+		g = updbase(g,i);
+		gall = append_one(gall,i);
+	}
+	if ( gall )
+		nv = ((DP)ps[(int)BDY(gall)])->nv;
+	while ( d ) {
+		get_eg(&tmp0);
+		minsugar(d,&dm,&dr); d = dr;
+		if ( DP_Print )
+			fprintf(asir_out,"sugar=%d\n",dm->sugar);
+		blist = 0; s0 = 0;
+		/* asph : sum of all head terms of spoly */
+		for ( t = dm; t; t = NEXT(t) ) {
+			_dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp);
+			if ( sp ) {
+				MKNODE(bt,sp,blist); blist = bt;
+				s0 = symb_merge(s0,dp_dllist(sp),nv);
+			}
+		}
+		/* s0 : all the terms appeared in symbolic redunction */
+		for ( s = s0, nred = 0; s; s = NEXT(s) ) {
+			for ( r = gall;	r; r = NEXT(r) )
+				if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(s),nv) )
+					break;
+			if ( r ) {
+				dltod(BDY(s),nv,&tdp);
+				dp_subd(tdp,ps[(int)BDY(r)],&sd);
+				_dp_mod(sd,m,0,&sdm);
+				mulmd_dup(m,sdm,ps[(int)BDY(r)],&f2);
+				MKNODE(bt,f2,blist); blist = bt;
+				s = symb_merge(s,dp_dllist(f2),nv);
+				nred++;
+			}
+		}
+		
+		get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1);
+		init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1);
+
+		/* the first nred polys in blist are reducers */
+		/* row = the number of all the polys */
+		for ( r = blist, row = 0; r; r = NEXT(r), row++ );
+
+		/* head terms of reducers */
+		ht = (DL *)MALLOC(nred*sizeof(DL));
+		for ( r = blist, i = 0; i < nred; r = NEXT(r), i++ )
+			ht[i] = BDY((DP)BDY(r))->dl;
+
+		/* col = number of all terms */
+		for ( s = s0, col = 0; s; s = NEXT(s), col++ );
+
+		/* head terms of all terms */
+		at = (DL *)MALLOC(col*sizeof(DL));
+		for ( s = s0, i = 0; i < col; s = NEXT(s), i++ )
+			at[i] = (DL)BDY(s);
+
+		/* store coefficients separately in spmat and redmat */
+		nsp = row-nred;
+
+		/* reducer matrix */
+		redmat = (int **)almat(nred,col);
+		for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ )
+			_dpmod_to_vect(BDY(r),at,redmat[i]);
+		/* XXX */
+/*		reduce_reducers_mod(redmat,nred,col,m); */
+		/* register the position of the head term */
+		indred = (int *)MALLOC(nred*sizeof(int));
+		bzero(indred,nred*sizeof(int));
+		isred = (int *)MALLOC(col*sizeof(int));
+		bzero(isred,col*sizeof(int));
+		for ( i = 0; i < nred; i++ ) {
+			ri = redmat[i];
+			for ( j = 0; j < col && !ri[j]; j++ );
+			indred[i] = j;
+			isred[j] = 1;
+		}
+
+		spcol = col-nred;
+		/* head terms not in ht */
+		st = (DL *)MALLOC(spcol*sizeof(DL));
+		for ( j = 0, k = 0; j < col; j++ )
+			if ( !isred[j] )
+				st[k++] = at[j];
+
+		/* spoly matrix; stored in reduced form; terms in ht[] are omitted */
+		spmat = almat(nsp,spcol);
+		w = (int *)MALLOC(col*sizeof(int));
+		for ( ; i < row; r = NEXT(r), i++ ) {
+			bzero(w,col*sizeof(int));
+			_dpmod_to_vect(BDY(r),at,w);
+			reduce_sp_by_red_mod(w,redmat,indred,nred,col,m);
+			for ( j = 0, k = 0; j < col; j++ )
+				if ( !isred[j] )
+					spmat[i-nred][k++] = w[j];
+		}
+
+		get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0);
+		init_eg(&eg_split_elim1); add_eg(&eg_split_elim1,&tmp1,&tmp0);
+
+		colstat = (int *)MALLOC_ATOMIC(spcol*sizeof(int));
+		for ( i = 0, nonzero=0; i < nsp; i++ )
+			for ( j = 0; j < spcol; j++ )
+				if ( spmat[i][j] )
+					nonzero++;
+		if ( DP_Print && nsp )
+			fprintf(asir_out,"spmat : %d x %d (nonzero=%f%%)...",
+				nsp,spcol,((double)nonzero*100)/(nsp*spcol));
+		if ( nsp )
+			rank = generic_gauss_elim_mod(spmat,nsp,spcol,m,colstat);
+		else
+			rank = 0;
+		get_eg(&tmp1); add_eg(&eg_elim2,&tmp0,&tmp1);
+		init_eg(&eg_split_elim2); add_eg(&eg_split_elim2,&tmp0,&tmp1);
+
+		if ( DP_Print ) {
+			fprintf(asir_out,"done rank = %d\n",rank,row,col);
+			print_eg("Symb",&eg_split_symb);
+			print_eg("Elim1",&eg_split_elim1);
+			print_eg("Elim2",&eg_split_elim2);
+			fprintf(asir_out,"\n");
+		}
+		for ( j = 0, i = 0; j < spcol; j++ )
+			if ( colstat[j] ) {
+				mp0 = 0;
+				NEXTMP(mp0,mp); mp->dl = st[j]; mp->c = STOI(1);
+				for ( k = j+1; k < spcol; k++ )
+					if ( !colstat[k] && spmat[i][k] ) {
+						NEXTMP(mp0,mp); mp->dl = st[k];
+						mp->c = STOI(spmat[i][k]);
+				}
+				NEXT(mp) = 0;
+				MKDP(nv,mp0,nf); nf->sugar = dm->sugar;
+				nh = newps_mod(nf,m);
+				d = updpairs(d,g,nh);
+				g = updbase(g,nh);
+				gall = append_one(gall,nh);
+				i++;
+			}
+	}
+	if ( DP_Print ) {
+		print_eg("Symb",&eg_symb);
+		print_eg("Elim1",&eg_elim1);
+		print_eg("Elim2",&eg_elim2);
+		fflush(asir_out);
+	}
+	return g;
+}
+
 int DPPlength(n)
 DP_pairs n;
 {
@@ -2162,7 +2348,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() {