===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.62
retrieving revision 1.67
diff -u -p -r1.62 -r1.67
--- OpenXM_contrib2/asir2000/builtin/dp.c	2006/06/05 08:11:10	1.62
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2007/08/21 23:53:00	1.67
@@ -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.61 2005/11/12 09:43:01 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.66 2006/10/26 10:49:16 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -62,19 +62,20 @@ 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();
 void Pdp_cri1(),Pdp_cri2(),Pdp_subd(),Pdp_mod(),Pdp_red_mod(),Pdp_tdiv();
 void Pdp_prim(),Pdp_red_coef(),Pdp_mag(),Pdp_set_kara(),Pdp_rat();
-void Pdp_nf(),Pdp_true_nf();
+void Pdp_nf(),Pdp_true_nf(),Pdp_true_nf_marked();
 void Pdp_nf_mod(),Pdp_true_nf_mod();
 void Pdp_criB(),Pdp_nelim();
 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();
@@ -99,6 +100,7 @@ void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
 void Pnd_nf();
 void Pdp_initial_term();
 void Pdp_order();
+void Pdp_inv_or_split();
 
 LIST dp_initial_term();
 LIST dp_order();
@@ -132,6 +134,7 @@ struct ftab dp_tab[] = {
 	{"dp_nf",Pdp_nf,4},
 	{"dp_nf_f",Pdp_nf_f,4},
 	{"dp_true_nf",Pdp_true_nf,4},
+	{"dp_true_nf_marked",Pdp_true_nf_marked,4},
 	{"dp_nf_mod",Pdp_nf_mod,5},
 	{"dp_true_nf_mod",Pdp_true_nf_mod,5},
 	{"dp_lnf_mod",Pdp_lnf_mod,3},
@@ -141,6 +144,7 @@ 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},
@@ -183,6 +187,7 @@ struct ftab dp_tab[] = {
 	{"dp_weyl_f4_mod_main",Pdp_weyl_f4_mod_main,4},
 
 	/* misc */
+	{"dp_inv_or_split",Pdp_inv_or_split,3},
 	{"dp_set_weight",Pdp_set_weight,-1},
 	{"dp_weyl_set_weight",Pdp_weyl_set_weight,-1},
 	{0,0,0},
@@ -199,6 +204,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},
@@ -246,6 +252,32 @@ struct ftab dp_supp_tab[] = {
 	{0,0,0}
 };
 
+void Pdp_inv_or_split(arg,rp)
+NODE arg;
+Obj *rp;
+{
+	NODE gb,newgb;
+	DP f,inv;
+	struct order_spec *spec;
+	LIST list;
+
+	do_weyl = 0; dp_fcoeffs = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_inv_or_split");
+	asir_assert(ARG1(arg),O_DP,"dp_inv_or_split");
+	if ( !create_order_spec(0,(Obj)ARG2(arg),&spec) )
+		error("dp_inv_or_split : invalid order specification");
+	gb = BDY((LIST)ARG0(arg));
+	f = (DP)ARG1(arg);
+	newgb = (NODE)dp_inv_or_split(gb,f,spec,&inv);
+	if ( !newgb ) {
+		/* invertible */
+		*rp = (Obj)inv;
+	} else {
+		MKLIST(list,newgb);
+		*rp = (Obj)list;
+	}
+}
+
 void Pdp_sort(arg,rp)
 NODE arg;
 DP *rp;
@@ -495,6 +527,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;
@@ -812,6 +881,35 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
+void Pdp_true_nf_marked(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	NODE b,n;
+	DP *ps,*hps;
+	DP g;
+	DP nm;
+	P dn;
+	int full;
+
+	do_weyl = 0; dp_fcoeffs = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_true_nf_marked");
+	asir_assert(ARG1(arg),O_DP,"dp_true_nf_marked");
+	asir_assert(ARG2(arg),O_VECT,"dp_true_nf_marked");
+	asir_assert(ARG3(arg),O_VECT,"dp_true_nf_marked");
+	if ( !(g = (DP)ARG1(arg)) ) {
+		nm = 0; dn = (P)ONE;
+	} else {
+		b = BDY((LIST)ARG0(arg)); 
+		ps = (DP *)BDY((VECT)ARG2(arg));
+		hps = (DP *)BDY((VECT)ARG3(arg));
+		dp_true_nf_marked(b,g,ps,hps,&nm,&dn);
+	}
+	NEWNODE(n); BDY(n) = (pointer)nm;
+	NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)dn;
+	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
+}
+
 void Pdp_weyl_nf_mod(arg,rp)
 NODE arg;
 DP *rp;
@@ -1657,6 +1755,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;
@@ -1948,7 +2070,7 @@ 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_nf(arg,rp)