===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.61
retrieving revision 1.64
diff -u -p -r1.61 -r1.64
--- OpenXM_contrib2/asir2000/builtin/dp.c	2005/11/12 09:43:01	1.61
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2006/06/13 04:13:26	1.64
@@ -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/dp.c,v 1.60 2005/08/25 18:59:11 ohara Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.63 2006/06/09 09:59:12 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -62,7 +62,7 @@ int do_weyl;
 
 void Pdp_sort();
 void Pdp_mul_trunc(),Pdp_quo();
-void Pdp_ord(), Pdp_ptod(), Pdp_dtop();
+void Pdp_ord(), Pdp_ptod(), Pdp_dtop(), Phomogenize();
 void Pdp_ptozp(), Pdp_ptozp2(), Pdp_red(), Pdp_red2(), Pdp_lcm(), Pdp_redble();
 void Pdp_sp(), Pdp_hm(), Pdp_ht(), Pdp_hc(), Pdp_rest(), Pdp_td(), Pdp_sugar();
 void Pdp_set_sugar();
@@ -75,6 +75,7 @@ void Pdp_minp(),Pdp_sp_mod();
 void Pdp_homo(),Pdp_dehomo();
 void Pdp_gr_mod_main(),Pdp_gr_f_main();
 void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags();
+void Pdp_interreduce();
 void Pdp_f4_main(),Pdp_f4_mod_main(),Pdp_f4_f_main();
 void Pdp_gr_print();
 void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod(), Pdp_nf_tab_f();
@@ -93,7 +94,7 @@ void Pdp_weyl_set_weight();
 void Pdp_set_weight();
 void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdp_lnf_f();
-void Pnd_gr(),Pnd_gr_trace(),Pnd_f4();
+void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace();
 void Pnd_gr_postproc();
 void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
 void Pnd_nf();
@@ -141,12 +142,14 @@ struct ftab dp_tab[] = {
 
 	/* Buchberger algorithm */
 	{"dp_gr_main",Pdp_gr_main,-5},
+	{"dp_interreduce",Pdp_interreduce,3},
 	{"dp_gr_mod_main",Pdp_gr_mod_main,5},
 	{"dp_gr_f_main",Pdp_gr_f_main,4},
 	{"dp_gr_checklist",Pdp_gr_checklist,2},
 	{"nd_f4",Pnd_f4,4},
 	{"nd_gr",Pnd_gr,4},
 	{"nd_gr_trace",Pnd_gr_trace,5},
+	{"nd_f4_trace",Pnd_f4_trace,5},
 	{"nd_gr_postproc",Pnd_gr_postproc,5},
 	{"nd_weyl_gr",Pnd_weyl_gr,4},
 	{"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},
@@ -198,6 +201,7 @@ struct ftab dp_supp_tab[] = {
 	{"dp_gr_print",Pdp_gr_print,-1},
 
 	/* converters */
+	{"homogenize",Phomogenize,3},
 	{"dp_ptod",Pdp_ptod,-2},
 	{"dp_dtop",Pdp_dtop,2},
 	{"dp_homo",Pdp_homo,1},
@@ -494,6 +498,43 @@ DP *rp;
 	ptod(CO,vl,p,rp);
 }
 
+void Phomogenize(arg,rp)
+NODE arg;
+P *rp;
+{
+	P p;
+	DP d,h;
+	NODE n;
+	V hv;
+	VL vl,tvl,last;
+	struct oLIST f;
+	LIST v;
+
+	asir_assert(ARG0(arg),O_P,"homogenize");
+	p = (P)ARG0(arg);
+	asir_assert(ARG1(arg),O_LIST,"homogenize");
+	v = (LIST)ARG1(arg);
+	asir_assert(ARG2(arg),O_P,"homogenize");
+	hv = VR((P)ARG2(arg));
+	for ( vl = 0, n = BDY(v); n; n = NEXT(n) ) {
+		if ( !vl ) {
+			NEWVL(vl); tvl = vl;
+		} else {
+			NEWVL(NEXT(tvl)); tvl = NEXT(tvl);
+		}
+		VR(tvl) = VR((P)BDY(n));
+	}
+	if ( vl ) {
+		last = tvl;
+		NEXT(tvl) = 0;
+	}
+	ptod(CO,vl,p,&d);
+	dp_homo(d,&h);
+	NEWVL(NEXT(last)); last = NEXT(last);
+	VR(last) = hv; NEXT(last) = 0;
+	dtop(CO,vl,h,rp);
+}
+
 void Pdp_ltod(arg,rp)
 NODE arg;
 DPV *rp;
@@ -1656,6 +1697,30 @@ LIST *rp;
 	dp_gr_main(f,v,homo,modular,0,ord,rp);
 }
 
+void Pdp_interreduce(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v;
+	VL vl;
+	int ac;
+	struct order_spec *ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_interreduce");
+	f = (LIST)ARG0(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
+	if ( (ac = argc(arg)) == 3 ) {
+		asir_assert(ARG1(arg),O_LIST,"dp_interreduce");
+		v = (LIST)ARG1(arg);
+		create_order_spec(0,ARG2(arg),&ord);
+	}
+	dp_interreduce(f,v,0,ord,rp);
+}
+
 void Pdp_gr_f_main(arg,rp)
 NODE arg;
 LIST *rp;
@@ -1877,7 +1942,31 @@ LIST *rp;
 	homo = QTOS((Q)ARG2(arg));
 	m = QTOS((Q)ARG3(arg));
 	create_order_spec(0,ARG4(arg),&ord);
-	nd_gr_trace(f,v,m,homo,ord,rp);
+	nd_gr_trace(f,v,m,homo,0,ord,rp);
+}
+
+void Pnd_f4_trace(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	LIST f,v;
+	int m,homo;
+	struct order_spec *ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"nd_gr_trace");
+	asir_assert(ARG1(arg),O_LIST,"nd_gr_trace");
+	asir_assert(ARG2(arg),O_N,"nd_gr_trace");
+	asir_assert(ARG3(arg),O_N,"nd_gr_trace");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	f = remove_zero_from_list(f);
+	if ( !BDY(f) ) {
+		*rp = f; return;
+	}
+	homo = QTOS((Q)ARG2(arg));
+	m = QTOS((Q)ARG3(arg));
+	create_order_spec(0,ARG4(arg),&ord);
+	nd_gr_trace(f,v,m,homo,1,ord,rp);
 }
 
 void Pnd_weyl_gr(arg,rp)