===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v
retrieving revision 1.46
retrieving revision 1.54
diff -u -p -r1.46 -r1.54
--- OpenXM_contrib2/asir2000/builtin/gr.c	2003/04/21 02:49:40	1.46
+++ OpenXM_contrib2/asir2000/builtin/gr.c	2003/10/08 09:09:04	1.54
@@ -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.45 2003/03/14 06:28:48 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.53 2003/07/18 10:13:12 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -97,7 +97,7 @@ int NoGCD = 0;
 int GenTrace = 0;
 int OXCheck = -1;
 
-static int NoSugar = 0;
+int NoSugar = 0;
 static int NoCriB = 0;
 static int NoGC = 0;
 static int NoMC = 0;
@@ -105,11 +105,11 @@ static int NoRA = 0;
 static int ShowMag = 0;
 static int Stat = 0;
 static int Denominator = 1;
-static int Top = 0;
-static int Reverse = 0;
+int Top = 0;
+int Reverse = 0;
 static int Max_mag = 0;
 static int Max_coef = 0;
-static char *Demand = 0;
+char *Demand = 0;
 static int PtozpRA = 0;
 
 int doing_f4;
@@ -123,17 +123,70 @@ void Pox_pop_local(NODE,Obj *);
 INLINE int eqdl(int nv,DL dl1,DL dl2)
 {
 	int i;
-	int *b1,*b2;
+	int *p1,*p2;
 
 	if ( dl1->td != dl2->td )
 		return 0;
-	for ( i = 0, b1 = dl1->d, b2 = dl2->d; i < nv; i++ )
-		if ( b1[i] != b2[i] )
-			break;
-	if ( i == nv )
-		return 1;
-	else
-		return 0;
+	i = nv-1;
+	p1 = dl1->d;
+	p2 = dl2->d;
+	while ( i >= 7 ) {
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		if ( *p1++ != *p2++ ) return 0;
+		i -= 8;
+	}
+	switch ( i ) {
+		case 6:
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		case 5:
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		case 4:
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		case 3:
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		case 2:
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		case 1:
+			if ( *p1++ != *p2++ ) return 0;
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		case 0:
+			if ( *p1++ != *p2++ ) return 0;
+			return 1;
+		default:
+			return 1;
+	}
 }
 
 /* b[] should be cleared */
@@ -601,6 +654,8 @@ NODE gb_f4(NODE f)
 /* initial bases are monic */
 
 unsigned int **psca;
+GeoBucket create_bucket();
+DL remove_head_bucket(GeoBucket,int);
 
 NODE gb_f4_mod(NODE f,int m)
 {
@@ -619,14 +674,16 @@ NODE gb_f4_mod(NODE f,int m)
 	int *indred,*isred;
 	CDP ri;
 	int pscalen;
-	struct oEGT tmp0,tmp1,eg_split_symb,eg_split_elim1,eg_split_elim2;
-	extern struct oEGT eg_symb,eg_elim1,eg_elim2;
+	GeoBucket bucket;
+	DL head;
+	struct oEGT tmp0,tmp1,eg_split_symb,eg_split_conv,eg_split_elim1,eg_split_elim2;
+	extern struct oEGT eg_symb,eg_conv,eg_elim1,eg_elim2;
 
 	/* initialize coeffcient array list of ps[] */
 	pscalen = pslen;
 	psca = (unsigned int **)MALLOC(pscalen*sizeof(unsigned int *));
 
-	init_eg(&eg_symb); init_eg(&eg_elim1); init_eg(&eg_elim2);
+	init_eg(&eg_symb); init_eg(&eg_conv); 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);
@@ -641,41 +698,57 @@ NODE gb_f4_mod(NODE f,int m)
 		minsugar(d,&dm,&dr); d = dr;
 		if ( DP_Print )
 			fprintf(asir_out,"sugar=%d\n",dm->sugar);
-		blist = 0; s0 = 0;
+		blist = 0;
+		bucket = create_bucket();
 		/* 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);
+				add_bucket(bucket,dp_dllist(sp),nv);
 /*				fprintf(stderr,"%d-",length(s0)); */
 			}
 		}
+#if 0
 		if ( DP_Print )
 			fprintf(asir_out,"initial spmat : %d x %d ",length(blist),length(s0));
+#endif
 		/* s0 : all the terms appeared in symbolic reduction */
-		for ( s = s0, nred = 0; s; s = NEXT(s) ) {
+		nred = 0;
+		s0 = 0;
+		while ( 1 ) {
+			head = remove_head_bucket(bucket,nv);
+			if ( !head ) break;
+			else {
+				NEXTNODE(s0,s);
+				BDY(s) = (pointer)head;
+			}
 			for ( r = gall;	r; r = NEXT(r) )
-				if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(s),nv) )
+				if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,head,nv) )
 					break;
 			if ( r ) {
-				dltod(BDY(s),nv,&tdp);
+				dltod(head,nv,&tdp);
 				dp_subd(tdp,ps[(int)BDY(r)],&sd);
 				dt = mul_dllist(BDY(sd)->dl,ps[(int)BDY(r)]);
+				add_bucket(bucket,NEXT(dt),nv);
 /*				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)); */
+/*				fprintf(stderr,"%d-",length(s0));  */
 				nred++;
 			}
 		}
+		if ( s0 ) NEXT(s) = 0;
 /*		fprintf(stderr,"\n"); */
+		get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1);
+		init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1);
+
 		if ( DP_Print )
 			fprintf(asir_out,"number of reducers : %d\n",nred);
 
+		get_eg(&tmp0);
 		/* 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++ );
@@ -714,8 +787,8 @@ NODE gb_f4_mod(NODE f,int m)
 		for ( j = 0, k = 0; j < col; j++ )
 			if ( !isred[j] )
 				st[k++] = at[j];
-		get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1);
-		init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1);
+		get_eg(&tmp1); add_eg(&eg_conv,&tmp0,&tmp1);
+		init_eg(&eg_split_conv); add_eg(&eg_split_conv,&tmp0,&tmp1);
 
 		get_eg(&tmp1);
 		/* spoly matrix; stored in reduced form; terms in ht[] are omitted */
@@ -772,6 +845,7 @@ NODE gb_f4_mod(NODE f,int m)
 		if ( DP_Print ) {
 			fprintf(asir_out,"done rank = %d\n",rank,row,col);
 			print_eg("Symb",&eg_split_symb);
+			print_eg("Conv",&eg_split_conv);
 			print_eg("Elim1",&eg_split_elim1);
 			print_eg("Elim2",&eg_split_elim2);
 			fprintf(asir_out,"\n");
@@ -814,6 +888,7 @@ NODE gb_f4_mod(NODE f,int m)
 	}
 	if ( DP_Print ) {
 		print_eg("Symb",&eg_symb);
+		print_eg("Conv",&eg_conv);
 		print_eg("Elim1",&eg_elim1);
 		print_eg("Elim2",&eg_elim2);
 		fflush(asir_out);
@@ -1159,7 +1234,7 @@ void prim_part(DP f,int m,DP *r)
 		if ( PCoeffs )
 			dp_prim_mod(f,m,r);
 		else
-			*r = f;
+			_dp_monic(f,m,r);
 	} else {
 		if ( dp_fcoeffs || PCoeffs )
 			dp_prim(f,r);
@@ -1602,7 +1677,7 @@ NODE gb(NODE f,int m,NODE subst)
 				_dp_nf(gall,h,ps,!Top,&nf);
 			else
 				_dp_nf_z(gall,h,ps,!Top,DP_Multiple,&nf);
-			if ( DP_Print )
+			if ( DP_Print && nf )
 				fprintf(asir_out,"(%.3g)",get_rtime()-t_0);
 			get_eg(&tnf1); add_eg(&eg_nf,&tnf0,&tnf1);
 		} else
@@ -1899,7 +1974,7 @@ DP_pairs criterion_F( DP_pairs d1 )
 	for ( head = last = 0, p = d1; NEXT(p); ) {
 		s = (r = w = collect_pairs_of_hdlcm( p, &rest ))->sugar;
 		while ( w = NEXT(w) )
-			if ( criterion_2( w->dp1, w->dp2 ) ) {
+			if ( !do_weyl && criterion_2( w->dp1, w->dp2 ) ) {
 				r = w;
 				break;
 			} else if ( w->sugar < s ) s = (r = w)->sugar;