===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v
retrieving revision 1.59
retrieving revision 1.70
diff -u -p -r1.59 -r1.70
--- OpenXM_contrib2/asir2000/builtin/gr.c	2005/02/17 06:27:35	1.59
+++ OpenXM_contrib2/asir2000/builtin/gr.c	2015/08/06 10:01:51	1.70
@@ -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.58 2004/04/22 09:45:24 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.69 2013/11/05 11:36:58 ohara Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,8 +53,8 @@
 #include "ox.h"
 
 #if defined(__GNUC__)
-#define INLINE inline
-#elif defined(VISUAL)
+#define INLINE static inline
+#elif defined(VISUAL) || defined(__MINGW32__) || defined(__MINGW64__)
 #define INLINE __inline
 #else
 #define INLINE
@@ -69,7 +69,7 @@ double get_rtime();	
 
 struct oEGT eg_nf,eg_nfm;
 struct oEGT eg_znfm,eg_pz,eg_np,eg_ra,eg_mc,eg_gc;
-int TP,NBP,NMP,NFP,NDP,ZR,NZR;
+int TP,N_BP,NMP,NFP,NDP,ZR,NZR;
 
 extern int (*cmpdl)();
 extern int do_weyl;
@@ -95,7 +95,9 @@ int DP_NFStat = 0;
 LIST Dist = 0;
 int NoGCD = 0;
 int GenTrace = 0;
+int GenSyz = 0;
 int OXCheck = -1;
+int OneZeroHomo = 0;
 
 int NoSugar = 0;
 static int NoCriB = 0;
@@ -104,7 +106,7 @@ static int NoMC = 0;
 static int NoRA = 0;
 static int ShowMag = 0;
 static int Stat = 0;
-static int Denominator = 1;
+int Denominator = 1;
 int Top = 0;
 int Reverse = 0;
 static int Max_mag = 0;
@@ -407,6 +409,52 @@ void dp_gr_main(LIST f,LIST v,Num homo,int modular,int
 		fprintf(asir_out,"\nMax_mag=%d, Max_coef=%d\n",Max_mag, Max_coef);
 }
 
+void dp_interreduce(LIST f,LIST v,int field,struct order_spec *ord,LIST *rp)
+{
+	int i,mindex,m,nochk;
+	struct order_spec *ord1;
+	Q q;
+	VL fv,vv,vc;
+	NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx;
+	NODE ind,ind0;
+	LIST trace,gbindex;
+	int input_is_dp = 0;
+
+	mindex = 0; nochk = 0; dp_fcoeffs = field;
+	get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc);
+	NVars = length((NODE)vv); PCoeffs = vc ? 1 : 0; VC = vc;
+	CNVars = NVars;
+	if ( ord->id && NVars != ord->nv )
+		error("dp_interreduce : invalid order specification");
+	initd(ord);
+	for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) {
+		NEXTNODE(fd0,fd);
+		if ( BDY(t) && OID(BDY(t)) == O_DP ) {
+			dp_sort((DP)BDY(t),(DP *)&BDY(fd)); input_is_dp = 1;
+		} else
+			ptod(CO,vv,(P)BDY(t),(DP *)&BDY(fd));
+	}
+	if ( fd0 ) NEXT(fd) = 0;
+	fi0 = fd0;
+	setup_arrays(fd0,0,&s);
+	init_stat();
+	x = s;
+	reduceall(x,&xx); x = xx;
+	for ( r0 = 0, ind0 = 0; x; x = NEXT(x) ) {
+		NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]);
+		if ( input_is_dp )
+			BDY(r) = (pointer)ps[(int)BDY(x)];
+		else
+			dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r));
+		NEXTNODE(ind0,ind);
+		STOQ((int)BDY(x),q); BDY(ind) = q;
+	}
+	if ( r0 ) NEXT(r) = 0;
+	if ( ind0 ) NEXT(ind) = 0;
+	MKLIST(*rp,r0);
+	MKLIST(gbindex,ind0);
+}
+
 void dp_gr_mod_main(LIST f,LIST v,Num homo,int m,struct order_spec *ord,LIST *rp)
 {
 	struct order_spec *ord1;
@@ -863,8 +911,8 @@ NODE gb_f4_mod(NODE f,int m)
 
 		/* XXX free redmat explicitly */
 		for ( k = 0; k < nred; k++ ) {
-			GC_free(BDY(redmat[k]));
-			GC_free(redmat[k]);
+			GCFREE(BDY(redmat[k]));
+			GCFREE(redmat[k]);
 		}
 
 		get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0);
@@ -927,7 +975,7 @@ NODE gb_f4_mod(NODE f,int m)
 
 		/* XXX free spmat[] explicitly */
 		for ( j = 0; j < nsp; j++ ) {
-			GC_free(spmat[j]);
+			GCFREE(spmat[j]);
 		}
 	}
 	if ( DP_Print ) {
@@ -1608,7 +1656,7 @@ void reducebase_dehomo(NODE f,NODE *g)
 				NODE node;
 
 				STOQ(r[i],q);
-				node = mknode(4,0,q,0,0);
+				node = mknode(4,NULLP,q,NULLP,NULLP);
 				MKLIST(hist,node);
 				MKNODE(TraceList,hist,0);
 			}
@@ -1700,6 +1748,7 @@ NODE gb(NODE f,int m,NODE subst)
 	Max_coef = 0;
 	prev = 1;
 	doing_f4 = 0;
+	init_denomlist();
 	if ( m ) {
 		psm = (DP *)MALLOC(pslen*sizeof(DP));
 		for ( i = 0; i < psn; i++ )
@@ -1760,6 +1809,7 @@ skip_nf:
 			get_eg(&tpz0);
 			prim_part(nf,0,&h);
 			get_eg(&tpz1); add_eg(&eg_pz,&tpz0,&tpz1);
+			add_denomlist(BDY(h)->c);
 			get_eg(&tnp0);
 			if ( Demand && skip_nf_flag )
 				nh = newps_nosave(h,m,subst);
@@ -1884,7 +1934,7 @@ DP_pairs updpairs( DP_pairs d, NODE /* of index */ g, 
 	if ( !NoCriB && d ) {
 		dl = DPPlength(d);
 		d = criterion_B( d, t );
-		dl -= DPPlength(d); NBP += dl;
+		dl -= DPPlength(d); N_BP += dl;
 	}
 	d1 = newpairs( g, t );
 	if ( NEXT(d1) ) {
@@ -2272,6 +2322,10 @@ void dp_set_flag(Obj name,Obj value)
 		GenTrace = v;
 	else if ( !strcmp(n,"OXCheck") )
 		OXCheck = v;
+	else if ( !strcmp(n,"GenSyz") )
+		GenSyz = v;
+	else if ( !strcmp(n,"OneZeroHomo") )
+		OneZeroHomo = v;
 }
 
 void dp_make_flaglist(LIST *list)
@@ -2298,6 +2352,7 @@ void dp_make_flaglist(LIST *list)
 	STOQ(DP_NFStat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"NFStat"); MKNODE(n1,name,n); n = n1;
 	STOQ(OXCheck,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OXCheck"); MKNODE(n1,name,n); n = n1;
 	STOQ(GenTrace,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenTrace"); MKNODE(n1,name,n); n = n1;
+	STOQ(GenSyz,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenSyz"); MKNODE(n1,name,n); n = n1;
 	STOQ(PtozpRA,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PtozpRA"); MKNODE(n1,name,n); n = n1;
 	STOQ(ShowMag,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"ShowMag"); MKNODE(n1,name,n); n = n1;
 	STOQ(Top,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Top"); MKNODE(n1,name,n); n = n1;
@@ -2371,7 +2426,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 = NMP = NBP = NFP = NDP = 0;
+	ZR = NZR = TP = NMP = N_BP = NFP = NDP = 0;
 }
 
 void print_stat() {
@@ -2380,7 +2435,7 @@ void print_stat() {
 	print_eg("NF",&eg_nf); print_eg("NFM",&eg_nfm); print_eg("ZNFM",&eg_znfm);
 	print_eg("PZ",&eg_pz); print_eg("NP",&eg_np);
 	print_eg("RA",&eg_ra); print_eg("MC",&eg_mc); print_eg("GC",&eg_gc);
-	fprintf(asir_out,"T=%d,B=%d M=%d F=%d D=%d ZR=%d NZR=%d\n",TP,NBP,NMP,NFP,NDP,ZR,NZR);
+	fprintf(asir_out,"T=%d,B=%d M=%d F=%d D=%d ZR=%d NZR=%d\n",TP,N_BP,NMP,NFP,NDP,ZR,NZR);
 }
 
 /*
@@ -2515,7 +2570,7 @@ void _dp_nf_z(NODE b,DP g,DP *ps,int full,int multiple
 				if ( GenTrace ) {
 					/* u = cr*rp + (-cred)*shift*red */ 
 					STOQ((int)BDY(l),cq);
-					node = mknode(4,cr,cq,0,0);
+					node = mknode(4,cr,cq,NULLP,NULLP);
 					mulq(cred,rc,&rcred);
 					chsgnnum((Num)rcred,(Num *)&mrcred);
 					muldc(CO,shift,(P)mrcred,(DP *)&ARG2(node));