===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v
retrieving revision 1.42
retrieving revision 1.50
diff -u -p -r1.42 -r1.50
--- OpenXM_contrib2/asir2000/builtin/gr.c	2002/07/17 09:45:49	1.42
+++ OpenXM_contrib2/asir2000/builtin/gr.c	2003/07/01 08:12:38	1.50
@@ -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.41 2002/01/28 00:54:41 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.49 2003/06/21 02:09:15 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -89,6 +89,7 @@ static VL VC;
 
 int PCoeffs;
 int DP_Print = 0;
+int DP_PrintShort = 0;
 int DP_Multiple = 0;
 int DP_NFStat = 0;
 LIST Dist = 0;
@@ -101,7 +102,6 @@ static int NoCriB = 0;
 static int NoGC = 0;
 static int NoMC = 0;
 static int NoRA = 0;
-static int DP_PrintShort = 0;
 static int ShowMag = 0;
 static int Stat = 0;
 static int Denominator = 1;
@@ -619,14 +619,14 @@ 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;
+	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);
@@ -668,14 +668,18 @@ NODE gb_f4_mod(NODE f,int m)
 				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++;
 			}
 		}
 /*		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 +718,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 +776,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 +819,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,11 +1165,9 @@ 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 )
-			*r = f;
-		else if ( PCoeffs )
+		if ( dp_fcoeffs || PCoeffs )
 			dp_prim(f,r);
 		else
 			dp_ptozp(f,r);
@@ -1604,7 +1608,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
@@ -2067,6 +2071,7 @@ void dp_set_flag(Obj name,Obj value)
 {
 	char *n;
 	int v;
+	Q ratio;
 
 	if ( OID(name) != O_STR )
 		return;
@@ -2077,6 +2082,16 @@ void dp_set_flag(Obj name,Obj value)
 	if ( !strcmp(n,"Dist") ) {
 		Dist = (LIST)value; return;
 	}
+	if ( !strcmp(n,"Content") ) {
+		ratio = (Q)value;
+		if ( ratio ) {
+			DP_Multiple = BD(NM(ratio))[0];
+			Denominator = INT(ratio) ? 1 : BD(DN(ratio))[0];
+		} else {
+			DP_Multiple = 0;
+			Denominator = 1;
+		}
+	}
 	if ( value && OID(value) != O_N )
 		return;
 	v = QTOS((Q)value);
@@ -2120,12 +2135,20 @@ void dp_set_flag(Obj name,Obj value)
 
 void dp_make_flaglist(LIST *list)
 {
-	Q v;
+	Q v,nm,dn;
 	STRING name,path;
 	NODE n,n1;
 
+#if 0
 	STOQ(DP_Multiple,v); MKNODE(n,v,0); MKSTR(name,"DP_Multiple"); MKNODE(n1,name,n); n = n1;
 	STOQ(Denominator,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Denominator"); MKNODE(n1,name,n); n = n1;
+#else
+	if ( DP_Multiple ) {
+		STOQ(DP_Multiple,nm); STOQ(Denominator,dn); divq(nm,dn,&v);
+	} else
+		v = 0;
+	MKNODE(n,v,0); MKSTR(name,"Content"); MKNODE(n1,name,n); n = n1;
+#endif
 	MKNODE(n1,Dist,n); n = n1; MKSTR(name,"Dist"); MKNODE(n1,name,n); n = n1;
 	STOQ(Reverse,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Reverse"); MKNODE(n1,name,n); n = n1;
 	STOQ(Stat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Stat"); MKNODE(n1,name,n); n = n1;
@@ -2178,7 +2201,11 @@ void dp_load(int index,DP *p)
 		sprintf(path,"%s%c%d",Demand,DELIM,index);
 		if ( !(fp = fopen(path,"rb") ) )
 			error("dp_load : cannot open a file");
-		skipvl(fp); loadobj(fp,(Obj *)p); fclose(fp);
+		if ( PCoeffs )
+			loadvl(fp);
+		else
+			skipvl(fp);
+		loadobj(fp,(Obj *)p); fclose(fp);
 	}
 }
 
@@ -2191,7 +2218,11 @@ int dp_load_t(int index,DP *p)
 	if ( !(fp = fopen(path,"rb") ) )
 		return 0;
 	else {
-		skipvl(fp); loadobj(fp,(Obj *)p); fclose(fp); return 1;
+		if ( PCoeffs )
+			loadvl(fp);
+		else
+			skipvl(fp);
+		loadobj(fp,(Obj *)p); fclose(fp); return 1;
 	}
 }