===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.81
retrieving revision 1.100
diff -u -p -r1.81 -r1.100
--- OpenXM_contrib2/asir2000/builtin/dp.c	2010/04/16 07:13:42	1.81
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2017/02/27 05:14:53	1.100
@@ -44,7 +44,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.80 2010/01/19 06:17:22 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.99 2016/12/02 02:12:00 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -56,6 +56,7 @@ extern int dp_order_pair_length;
 extern struct order_pair *dp_order_pair;
 extern struct order_spec *dp_current_spec;
 extern struct modorder_spec *dp_current_modspec;
+extern int nd_rref2;
 
 int do_weyl;
 
@@ -68,7 +69,10 @@ 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(),Pdp_true_nf_marked(),Pdp_true_nf_marked_mod();
+
+void Pdp_true_nf_and_quotient(),Pdp_true_nf_and_quotient_mod();
 void Pdp_true_nf_and_quotient_marked(),Pdp_true_nf_and_quotient_marked_mod();
+
 void Pdp_nf_mod(),Pdp_true_nf_mod();
 void Pdp_criB(),Pdp_nelim();
 void Pdp_minp(),Pdp_sp_mod();
@@ -86,18 +90,23 @@ void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc
 
 void Pdp_weyl_red();
 void Pdp_weyl_sp();
+
 void Pdp_weyl_nf(),Pdp_weyl_nf_mod();
+void Pdp_weyl_true_nf_and_quotient(),Pdp_weyl_true_nf_and_quotient_mod();
+void Pdp_weyl_true_nf_and_quotient_marked(),Pdp_weyl_true_nf_and_quotient_marked_mod();
+
 void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_weyl_gr_f_main();
 void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(),Pdp_weyl_f4_f_main();
-void Pdp_weyl_mul(),Pdp_weyl_mul_mod();
+void Pdp_weyl_mul(),Pdp_weyl_mul_mod(),Pdp_weyl_act();
 void Pdp_weyl_set_weight();
 void Pdp_set_weight(),Pdp_set_top_weight(),Pdp_set_module_weight();
 void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdp_lnf_f();
 void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace();
 void Pnd_gr_postproc(), Pnd_weyl_gr_postproc();
+void Pnd_gr_recompute_trace(), Pnd_btog();
 void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
-void Pnd_nf();
+void Pnd_nf(),Pnd_weyl_nf();
 void Pdp_initial_term();
 void Pdp_order();
 void Pdp_inv_or_split();
@@ -106,11 +115,15 @@ void Pdp_compute_last_w();
 void Pdp_compute_essential_df();
 void Pdp_get_denomlist();
 void Pdp_symb_add();
+void Pdp_mono_raddec();
+void Pdp_mono_reduce();
+void Pdp_rref2(),Psumi_updatepairs(),Psumi_symbolic();
 
 LIST dp_initial_term();
 LIST dp_order();
 void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo,
 	int *modular,struct order_spec **ord);
+NODE dp_inv_or_split(NODE gb,DP f,struct order_spec *spec, DP *inv);
 
 LIST remove_zero_from_list(LIST);
 
@@ -137,14 +150,19 @@ struct ftab dp_tab[] = {
 
 	/* normal form */
 	{"dp_nf",Pdp_nf,4},
+	{"dp_nf_mod",Pdp_nf_mod,5},
 	{"dp_nf_f",Pdp_nf_f,4},
+
 	{"dp_true_nf",Pdp_true_nf,4},
+	{"dp_true_nf_mod",Pdp_true_nf_mod,5},
 	{"dp_true_nf_marked",Pdp_true_nf_marked,4},
+	{"dp_true_nf_marked_mod",Pdp_true_nf_marked_mod,5},
+
+	{"dp_true_nf_and_quotient",Pdp_true_nf_and_quotient,3},
+	{"dp_true_nf_and_quotient_mod",Pdp_true_nf_and_quotient_mod,4},
 	{"dp_true_nf_and_quotient_marked",Pdp_true_nf_and_quotient_marked,4},
 	{"dp_true_nf_and_quotient_marked_mod",Pdp_true_nf_and_quotient_marked_mod,5},
-	{"dp_true_nf_marked_mod",Pdp_true_nf_marked_mod,5},
-	{"dp_nf_mod",Pdp_nf_mod,5},
-	{"dp_true_nf_mod",Pdp_true_nf_mod,5},
+
 	{"dp_lnf_mod",Pdp_lnf_mod,3},
 	{"dp_nf_tab_f",Pdp_nf_tab_f,2},
 	{"dp_nf_tab_mod",Pdp_nf_tab_mod,3},
@@ -161,10 +179,13 @@ struct ftab dp_tab[] = {
 	{"nd_gr_trace",Pnd_gr_trace,5},
 	{"nd_f4_trace",Pnd_f4_trace,5},
 	{"nd_gr_postproc",Pnd_gr_postproc,5},
+	{"nd_gr_recompute_trace",Pnd_gr_recompute_trace,5},
+	{"nd_btog",Pnd_btog,-6},
 	{"nd_weyl_gr_postproc",Pnd_weyl_gr_postproc,5},
 	{"nd_weyl_gr",Pnd_weyl_gr,4},
 	{"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},
 	{"nd_nf",Pnd_nf,5},
+	{"nd_weyl_nf",Pnd_weyl_nf,5},
 
 	/* F4 algorithm */
 	{"dp_f4_main",Pdp_f4_main,3},
@@ -174,6 +195,7 @@ struct ftab dp_tab[] = {
 	/* multiplication */
 	{"dp_weyl_mul",Pdp_weyl_mul,2},
 	{"dp_weyl_mul_mod",Pdp_weyl_mul_mod,3},
+	{"dp_weyl_act",Pdp_weyl_act,2},
 
 	/* s-poly */
 	{"dp_weyl_sp",Pdp_weyl_sp,2},
@@ -186,6 +208,12 @@ struct ftab dp_tab[] = {
 	{"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5},
 	{"dp_weyl_nf_f",Pdp_weyl_nf_f,4},
 
+	{"dp_weyl_true_nf_and_quotient",Pdp_weyl_true_nf_and_quotient,3},
+	{"dp_weyl_true_nf_and_quotient_mod",Pdp_weyl_true_nf_and_quotient_mod,4},
+	{"dp_weyl_true_nf_and_quotient_marked",Pdp_weyl_true_nf_and_quotient_marked,4},
+	{"dp_weyl_true_nf_and_quotient_marked_mod",Pdp_weyl_true_nf_and_quotient_marked_mod,5},
+
+
 	/* Buchberger algorithm */
 	{"dp_weyl_gr_main",Pdp_weyl_gr_main,-5},
 	{"dp_weyl_gr_mod_main",Pdp_weyl_gr_mod_main,5},
@@ -265,7 +293,13 @@ struct ftab dp_supp_tab[] = {
 	{"dp_compute_last_w",Pdp_compute_last_w,5},
 	{"dp_compute_last_t",Pdp_compute_last_t,5},
 	{"dp_compute_essential_df",Pdp_compute_essential_df,2},
+	{"dp_mono_raddec",Pdp_mono_raddec,2},
+	{"dp_mono_reduce",Pdp_mono_reduce,2},
 
+	{"dp_rref2",Pdp_rref2,2},
+	{"sumi_updatepairs",Psumi_updatepairs,3},
+	{"sumi_symbolic",Psumi_symbolic,5},
+
 	{0,0,0}
 };
 
@@ -345,9 +379,7 @@ void Pdp_compute_essential_df(NODE arg,LIST *rp)
 	MKLIST(*rp,r);
 }
 
-void Pdp_inv_or_split(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdp_inv_or_split(NODE arg,Obj *rp)
 {
 	NODE gb,newgb;
 	DP f,inv;
@@ -371,16 +403,12 @@ Obj *rp;
 	}
 }
 
-void Pdp_sort(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_sort(NODE arg,DP *rp)
 {
 	dp_sort((DP)ARG0(arg),rp);
 }
 
-void Pdp_mdtod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_mdtod(NODE arg,DP *rp)
 {
 	MP m,mr,mr0;
 	DP p;
@@ -397,9 +425,7 @@ DP *rp;
 	}
 }
 
-void Pdp_sep(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_sep(NODE arg,VECT *rp)
 {
 	DP p,r;
 	MP m,t;
@@ -426,30 +452,22 @@ VECT *rp;
 	}
 }
 
-void Pdp_idiv(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_idiv(NODE arg,DP *rp)
 {
 	dp_idiv((DP)ARG0(arg),(Q)ARG1(arg),rp);
 }
 
-void Pdp_cont(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_cont(NODE arg,Q *rp)
 {
 	dp_cont((DP)ARG0(arg),rp);
 }
 
-void Pdp_dtov(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_dtov(NODE arg,VECT *rp)
 {
 	dp_dtov((DP)ARG0(arg),rp);
 }
 
-void Pdp_mbase(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_mbase(NODE arg,LIST *rp)
 {
 	NODE mb;
 
@@ -458,9 +476,7 @@ LIST *rp;
 	MKLIST(*rp,mb);
 }
 
-void Pdp_etov(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_etov(NODE arg,VECT *rp)
 {
 	DP dp;
 	int n,i;
@@ -478,9 +494,7 @@ VECT *rp;
 	*rp = v;
 }
 
-void Pdp_vtoe(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_vtoe(NODE arg,DP *rp)
 {
 	DP dp;
 	DL dl;
@@ -502,9 +516,7 @@ DP *rp;
 	*rp = dp;
 }
 
-void Pdp_lnf_mod(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_lnf_mod(NODE arg,LIST *rp)
 {
 	DP r1,r2;
 	NODE b,g,n;
@@ -521,9 +533,7 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_lnf_f(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_lnf_f(NODE arg,LIST *rp)
 {
 	DP r1,r2;
 	NODE b,g,n;
@@ -537,9 +547,7 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_nf_tab_mod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_nf_tab_mod(NODE arg,DP *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_nf_tab_mod");
 	asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_mod");
@@ -548,18 +556,14 @@ DP *rp;
 		QTOS((Q)ARG2(arg)),rp);
 }
 
-void Pdp_nf_tab_f(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_nf_tab_f(NODE arg,DP *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_nf_tab_f");
 	asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_f");
 	dp_nf_tab_f((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)),rp);
 }
 
-void Pdp_ord(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdp_ord(NODE arg,Obj *rp)
 {
 	struct order_spec *spec;
 	LIST v;
@@ -579,9 +583,7 @@ Obj *rp;
 	}
 }
 
-void Pdp_ptod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_ptod(NODE arg,DP *rp)
 {
 	P p;
 	NODE n;
@@ -620,9 +622,7 @@ DP *rp;
 	ptod(CO,vl,p,rp);
 }
 
-void Phomogenize(arg,rp)
-NODE arg;
-P *rp;
+void Phomogenize(NODE arg,P *rp)
 {
 	P p;
 	DP d,h;
@@ -657,9 +657,7 @@ P *rp;
 	dtop(CO,vl,h,rp);
 }
 
-void Pdp_ltod(arg,rp)
-NODE arg;
-DPV *rp;
+void Pdp_ltod(NODE arg,DPV *rp)
 {
 	NODE n;
 	VL vl,tvl;
@@ -706,9 +704,7 @@ DPV *rp;
 	MKDPV(len,e,*rp);
 }
 
-void Pdp_dtop(arg,rp)
-NODE arg;
-P *rp;
+void Pdp_dtop(NODE arg,P *rp)
 {
 	NODE n;
 	VL vl,tvl;
@@ -730,9 +726,7 @@ P *rp;
 
 extern LIST Dist;
 
-void Pdp_ptozp(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdp_ptozp(NODE arg,Obj *rp)
 {
 	Q t;
     NODE tt,p;
@@ -770,9 +764,7 @@ Obj *rp;
       *rp = (Obj)pp;
 }
 	
-void Pdp_ptozp2(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_ptozp2(NODE arg,LIST *rp)
 {
 	DP p0,p1,h,r;
 	NODE n0;
@@ -787,9 +779,7 @@ LIST *rp;
 	MKLIST(*rp,n0);
 }
 
-void Pdp_prim(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_prim(NODE arg,DP *rp)
 {
 	DP t;
 
@@ -797,9 +787,7 @@ DP *rp;
 	dp_prim((DP)ARG0(arg),&t); dp_ptozp(t,rp);
 }
 	
-void Pdp_mod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_mod(NODE arg,DP *rp)
 {
 	DP p;
 	int mod;
@@ -813,9 +801,7 @@ DP *rp;
 	dp_mod(p,mod,subst,rp);
 }
 
-void Pdp_rat(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_rat(NODE arg,DP *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_rat");
 	dp_rat((DP)ARG0(arg),rp);
@@ -823,9 +809,7 @@ DP *rp;
 
 extern int DP_Multiple;
 
-void Pdp_nf(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_nf(NODE arg,DP *rp)
 {
 	NODE b;
 	DP *ps;
@@ -845,9 +829,7 @@ DP *rp;
 	dp_nf_z(b,g,ps,full,DP_Multiple,rp);
 }
 
-void Pdp_weyl_nf(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_nf(NODE arg,DP *rp)
 {
 	NODE b;
 	DP *ps;
@@ -870,9 +852,7 @@ DP *rp;
 
 /* nf computation using field operations */
 
-void Pdp_nf_f(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_nf_f(NODE arg,DP *rp)
 {
 	NODE b;
 	DP *ps;
@@ -892,9 +872,7 @@ DP *rp;
 	dp_nf_f(b,g,ps,full,rp);
 }
 
-void Pdp_weyl_nf_f(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_nf_f(NODE arg,DP *rp)
 {
 	NODE b;
 	DP *ps;
@@ -915,9 +893,7 @@ DP *rp;
 	do_weyl = 0;
 }
 
-void Pdp_nf_mod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_nf_mod(NODE arg,DP *rp)
 {
 	NODE b;
 	DP g;
@@ -946,9 +922,7 @@ DP *rp;
 	dp_nf_mod(n0,g,ps,mod,full,rp);
 }
 
-void Pdp_true_nf(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_true_nf(NODE arg,LIST *rp)
 {
 	NODE b,n;
 	DP *ps;
@@ -974,40 +948,46 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_true_nf_marked(arg,rp)
-NODE arg;
-LIST *rp;
+DP *dp_true_nf_and_quotient_marked(NODE b,DP g,DP *ps,DP *hps,DP *rp,P *dnp);
+
+void Pdp_true_nf_and_quotient_marked(NODE arg,LIST *rp)
 {
 	NODE b,n;
 	DP *ps,*hps;
 	DP g;
 	DP nm;
-	Q cont;
+	VECT quo;
 	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");
+	asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient_marked");
+	asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient_marked");
+	asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient_marked");
+	asir_assert(ARG3(arg),O_VECT,"dp_true_nf_and_quotient_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,&cont,&dn);
+		NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len;
+		quo->body = (pointer *)dp_true_nf_and_quotient_marked(b,g,ps,hps,&nm,&dn);
 	}
-	n = mknode(3,nm,cont,dn);
+	n = mknode(3,nm,dn,quo);
 	MKLIST(*rp,n);
 }
 
-DP *dp_true_nf_and_quotient_marked (NODE b,DP g,DP *ps,DP *hps,DP *rp,P *dnp);
+void Pdp_true_nf_and_quotient(NODE arg,LIST *rp)
+{
+  NODE narg = mknode(4,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg));
+  Pdp_true_nf_and_quotient_marked(narg,rp);
+}
 
-void Pdp_true_nf_and_quotient_marked(arg,rp)
-NODE arg;
-LIST *rp;
+
+DP *dp_true_nf_and_quotient_marked_mod (NODE b,DP g,DP *ps,DP *hps,int mod,DP *rp,P *dnp);
+
+void Pdp_true_nf_and_quotient_marked_mod(NODE arg,LIST *rp)
 {
 	NODE b,n;
 	DP *ps,*hps;
@@ -1015,63 +995,62 @@ LIST *rp;
 	DP nm;
 	VECT quo;
 	P dn;
-	int full;
+	int full,mod;
 
 	do_weyl = 0; dp_fcoeffs = 0;
-	asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient_marked");
-	asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient_marked");
-	asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient_marked");
-	asir_assert(ARG3(arg),O_VECT,"dp_true_nf_and_quotient_marked");
+	asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG3(arg),O_VECT,"dp_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG4(arg),O_N,"dp_true_nf_and_quotient_marked_mod");
 	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));
+		mod = QTOS((Q)ARG4(arg));
 		NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len;
-		quo->body = (pointer *)dp_true_nf_and_quotient_marked(b,g,ps,hps,&nm,&dn);
+		quo->body = (pointer *)dp_true_nf_and_quotient_marked_mod(b,g,ps,hps,mod,&nm,&dn);
 	}
 	n = mknode(3,nm,dn,quo);
 	MKLIST(*rp,n);
 }
 
-DP *dp_true_nf_and_quotient_marked_mod (NODE b,DP g,DP *ps,DP *hps,int mod,DP *rp,P *dnp);
+void Pdp_true_nf_and_quotient_mod(NODE arg,LIST *rp)
+{
+  NODE narg = mknode(5,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg),ARG3(arg));
+  Pdp_true_nf_and_quotient_marked_mod(narg,rp);
+}
 
-void Pdp_true_nf_and_quotient_marked_mod(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_true_nf_marked(NODE arg,LIST *rp)
 {
 	NODE b,n;
 	DP *ps,*hps;
 	DP g;
 	DP nm;
-	VECT quo;
+	Q cont;
 	P dn;
-	int full,mod;
+	int full;
 
 	do_weyl = 0; dp_fcoeffs = 0;
-	asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient_marked_mod");
-	asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient_marked_mod");
-	asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient_marked_mod");
-	asir_assert(ARG3(arg),O_VECT,"dp_true_nf_and_quotient_marked_mod");
-	asir_assert(ARG4(arg),O_N,"dp_true_nf_and_quotient_marked_mod");
+	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));
-		mod = QTOS((Q)ARG4(arg));
-		NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len;
-		quo->body = (pointer *)dp_true_nf_and_quotient_marked_mod(b,g,ps,hps,mod,&nm,&dn);
+		dp_true_nf_marked(b,g,ps,hps,&nm,&cont,&dn);
 	}
-	n = mknode(3,nm,dn,quo);
+	n = mknode(3,nm,cont,dn);
 	MKLIST(*rp,n);
 }
 
-void Pdp_true_nf_marked_mod(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_true_nf_marked_mod(NODE arg,LIST *rp)
 {
 	NODE b,n;
 	DP *ps,*hps;
@@ -1099,9 +1078,7 @@ LIST *rp;
 	MKLIST(*rp,n);
 }
 
-void Pdp_weyl_nf_mod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_nf_mod(NODE arg,DP *rp)
 {
 	NODE b;
 	DP g;
@@ -1131,9 +1108,7 @@ DP *rp;
 	do_weyl = 0;
 }
 
-void Pdp_true_nf_mod(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_true_nf_mod(NODE arg,LIST *rp)
 {
 	NODE b;
 	DP g,nm;
@@ -1160,10 +1135,80 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_tdiv(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_true_nf_and_quotient_marked(NODE arg,LIST *rp)
 {
+	NODE b,n;
+	DP *ps,*hps;
+	DP g;
+	DP nm;
+	VECT quo;
+	P dn;
+	int full;
+
+	do_weyl = 1; dp_fcoeffs = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_weyl_true_nf_and_quotient_marked");
+	asir_assert(ARG1(arg),O_DP,"dp_weyl_true_nf_and_quotient_marked");
+	asir_assert(ARG2(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked");
+	asir_assert(ARG3(arg),O_VECT,"dp_weyl_true_nf_and_quotient_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));
+		NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len;
+		quo->body = (pointer *)dp_true_nf_and_quotient_marked(b,g,ps,hps,&nm,&dn);
+	}
+	n = mknode(3,nm,dn,quo);
+	MKLIST(*rp,n);
+}
+
+void Pdp_weyl_true_nf_and_quotient(NODE arg,LIST *rp)
+{
+  NODE narg = mknode(4,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg));
+  Pdp_weyl_true_nf_and_quotient_marked(narg,rp);
+}
+
+
+void Pdp_weyl_true_nf_and_quotient_marked_mod(NODE arg,LIST *rp)
+{
+	NODE b,n;
+	DP *ps,*hps;
+	DP g;
+	DP nm;
+	VECT quo;
+	P dn;
+	int full,mod;
+
+	do_weyl = 1; dp_fcoeffs = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_weyl_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG1(arg),O_DP,"dp_weyl_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG2(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG3(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked_mod");
+	asir_assert(ARG4(arg),O_N,"dp_weyl_true_nf_and_quotient_marked_mod");
+	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));
+		mod = QTOS((Q)ARG4(arg));
+		NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len;
+		quo->body = (pointer *)dp_true_nf_and_quotient_marked_mod(b,g,ps,hps,mod,&nm,&dn);
+	}
+	n = mknode(3,nm,dn,quo);
+	MKLIST(*rp,n);
+}
+
+void Pdp_weyl_true_nf_and_quotient_mod(NODE arg,LIST *rp)
+{
+  NODE narg = mknode(5,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg),ARG3(arg));
+  Pdp_weyl_true_nf_and_quotient_marked_mod(narg,rp);
+}
+
+
+void Pdp_tdiv(NODE arg,DP *rp)
+{
 	MP m,mr,mr0;
 	DP p;
 	Q c;
@@ -1189,9 +1234,7 @@ DP *rp;
 	}
 }
 
-void Pdp_red_coef(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_red_coef(NODE arg,DP *rp)
 {
 	MP m,mr,mr0;
 	P q,r;
@@ -1217,9 +1260,7 @@ DP *rp;
 	}
 }
 
-void Pdp_redble(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_redble(NODE arg,Q *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_redble");
 	asir_assert(ARG1(arg),O_DP,"dp_redble");
@@ -1229,9 +1270,7 @@ Q *rp;
 		*rp = 0;
 }
 
-void Pdp_red_mod(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_red_mod(NODE arg,LIST *rp)
 {
 	DP h,r;
 	P dmy;
@@ -1249,9 +1288,7 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_subd(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_subd(NODE arg,DP *rp)
 {
 	DP p1,p2;
 
@@ -1261,9 +1298,7 @@ DP *rp;
 	dp_subd(p1,p2,rp);
 }
 
-void Pdp_symb_add(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_symb_add(NODE arg,DP *rp)
 {
 	DP p1,p2,r;
 	NODE s0;
@@ -1273,6 +1308,8 @@ DP *rp;
 	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg);
 	asir_assert(p1,O_DP,"dp_symb_add");
 	asir_assert(p2,O_DP,"dp_symb_add");
+	if ( !p1 ) { *rp = p2; return; }
+	else if ( !p2 ) { *rp = p1; return; }
 	if ( p1->nv != p2->nv )
 		error("dp_sumb_add : invalid input");
 	nv = p1->nv;
@@ -1285,9 +1322,7 @@ DP *rp;
 	*rp = r;
 }
 
-void Pdp_mul_trunc(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_mul_trunc(NODE arg,DP *rp)
 {
 	DP p1,p2,p;
 
@@ -1298,9 +1333,7 @@ DP *rp;
 	comm_muld_trunc(CO,p1,p2,BDY(p)->dl,rp);
 }
 
-void Pdp_quo(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_quo(NODE arg,DP *rp)
 {
 	DP p1,p2;
 
@@ -1310,9 +1343,7 @@ DP *rp;
 	comm_quod(CO,p1,p2,rp);
 }
 
-void Pdp_weyl_mul(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_mul(NODE arg,DP *rp)
 {
 	DP p1,p2;
 
@@ -1323,11 +1354,19 @@ DP *rp;
 	do_weyl = 0;
 }
 
-void Pdp_weyl_mul_mod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_act(NODE arg,DP *rp)
 {
 	DP p1,p2;
+
+	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg);
+	asir_assert(p1,O_DP,"dp_weyl_act"); asir_assert(p2,O_DP,"dp_weyl_act");
+	weyl_actd(CO,p1,p2,rp);
+}
+
+
+void Pdp_weyl_mul_mod(NODE arg,DP *rp)
+{
+	DP p1,p2;
 	Q m;
 
 	p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); m = (Q)ARG2(arg);
@@ -1339,9 +1378,7 @@ DP *rp;
 	do_weyl = 0;
 }
 
-void Pdp_red(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_red(NODE arg,LIST *rp)
 {
 	NODE n;
 	DP head,rest,dmy1;
@@ -1357,9 +1394,7 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_weyl_red(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_weyl_red(NODE arg,LIST *rp)
 {
 	NODE n;
 	DP head,rest,dmy1;
@@ -1376,9 +1411,7 @@ LIST *rp;
 	NEXT(NEXT(n)) = 0; MKLIST(*rp,n);
 }
 
-void Pdp_sp(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_sp(NODE arg,DP *rp)
 {
 	DP p1,p2;
 
@@ -1388,9 +1421,7 @@ DP *rp;
 	dp_sp(p1,p2,rp);
 }
 
-void Pdp_weyl_sp(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_weyl_sp(NODE arg,DP *rp)
 {
 	DP p1,p2;
 
@@ -1401,9 +1432,7 @@ DP *rp;
 	do_weyl = 0;
 }
 
-void Pdp_sp_mod(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_sp_mod(NODE arg,DP *rp)
 {
 	DP p1,p2;
 	int mod;
@@ -1416,9 +1445,7 @@ DP *rp;
 	dp_sp_mod(p1,p2,mod,rp);
 }
 
-void Pdp_lcm(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_lcm(NODE arg,DP *rp)
 {
 	int i,n,td;
 	DL d1,d2,d;
@@ -1437,9 +1464,7 @@ DP *rp;
 	MKDP(n,m,*rp); (*rp)->sugar = td;	/* XXX */
 }
 
-void Pdp_hm(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_hm(NODE arg,DP *rp)
 {
 	DP p;
 
@@ -1447,9 +1472,7 @@ DP *rp;
 	dp_hm(p,rp);
 }
 
-void Pdp_ht(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_ht(NODE arg,DP *rp)
 {
 	DP p;
 	MP m,mr;
@@ -1458,9 +1481,7 @@ DP *rp;
 	dp_ht(p,rp);
 }
 
-void Pdp_hc(arg,rp)
-NODE arg;
-P *rp;
+void Pdp_hc(NODE arg,P *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_hc");
 	if ( !ARG0(arg) )
@@ -1469,9 +1490,7 @@ P *rp;
 		*rp = BDY((DP)ARG0(arg))->c;
 }
 
-void Pdp_rest(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_rest(NODE arg,DP *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_rest");
 	if ( !ARG0(arg) )
@@ -1480,9 +1499,7 @@ DP *rp;
 		dp_rest((DP)ARG0(arg),rp);
 }
 
-void Pdp_td(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_td(NODE arg,Q *rp)
 {
 	DP p;
 
@@ -1493,9 +1510,7 @@ Q *rp;
 		STOQ(BDY(p)->dl->td,*rp);
 }
 
-void Pdp_sugar(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_sugar(NODE arg,Q *rp)
 {
 	DP p;
 
@@ -1506,9 +1521,7 @@ Q *rp;
 		STOQ(p->sugar,*rp);
 }
 
-void Pdp_initial_term(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdp_initial_term(NODE arg,Obj *rp)
 {
 	struct order_spec *ord;
 	Num homo;
@@ -1535,9 +1548,7 @@ Obj *rp;
 		*rp = (Obj)initiallist;
 }
 
-void Pdp_order(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdp_order(NODE arg,Obj *rp)
 {
 	struct order_spec *ord;
 	Num homo;
@@ -1564,9 +1575,7 @@ Obj *rp;
 		*rp = (Obj)ordlist;
 }
 
-void Pdp_set_sugar(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_set_sugar(NODE arg,Q *rp)
 {
 	DP p;
 	Q q;
@@ -1585,9 +1594,7 @@ Q *rp;
 	*rp = 0;
 }
 
-void Pdp_cri1(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_cri1(NODE arg,Q *rp)
 {
 	DP p1,p2;
 	int *d1,*d2;
@@ -1602,9 +1609,7 @@ Q *rp;
 	*rp = i == n ? ONE : 0;
 }
 
-void Pdp_cri2(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_cri2(NODE arg,Q *rp)
 {
 	DP p1,p2;
 	int *d1,*d2;
@@ -1619,9 +1624,7 @@ Q *rp;
 	*rp = i == n ? ONE : 0;
 }
 
-void Pdp_minp(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_minp(NODE arg,LIST *rp)
 {
 	NODE tn,tn1,d,dd,dd0,p,tp;
 	LIST l,minp;
@@ -1666,9 +1669,7 @@ LIST *rp;
 	MKLIST(l,dd0); MKNODE(tn,l,0); MKNODE(tn1,minp,tn); MKLIST(*rp,tn1);
 }
 
-void Pdp_criB(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_criB(NODE arg,LIST *rp)
 {
 	NODE d,ij,dd,ddd;
 	int i,j,s,n;
@@ -1704,9 +1705,7 @@ LIST *rp;
 	}
 }
 
-void Pdp_nelim(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_nelim(NODE arg,Q *rp)
 {
 	if ( arg ) {
 		asir_assert(ARG0(arg),O_N,"dp_nelim");
@@ -1715,9 +1714,7 @@ Q *rp;
 	STOQ(dp_nelim,*rp);
 }
 
-void Pdp_mag(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_mag(NODE arg,Q *rp)
 {
 	DP p;
 	int s;
@@ -1736,9 +1733,7 @@ Q *rp;
 
 extern int kara_mag;
 
-void Pdp_set_kara(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_set_kara(NODE arg,Q *rp)
 {
 	if ( arg ) {
 		asir_assert(ARG0(arg),O_N,"dp_set_kara");
@@ -1747,25 +1742,19 @@ Q *rp;
 	STOQ(kara_mag,*rp);
 }
 
-void Pdp_homo(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_homo(NODE arg,DP *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_homo");
 	dp_homo((DP)ARG0(arg),rp);
 }
 
-void Pdp_dehomo(arg,rp)
-NODE arg;
-DP *rp;
+void Pdp_dehomo(NODE arg,DP *rp)
 {
 	asir_assert(ARG0(arg),O_DP,"dp_dehomo");
 	dp_dehomo((DP)ARG0(arg),rp);
 }
 
-void Pdp_gr_flags(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_gr_flags(NODE arg,LIST *rp)
 {
 	Obj name,value;
 	NODE n;
@@ -1788,9 +1777,7 @@ LIST *rp;
 
 extern int DP_Print, DP_PrintShort;
 
-void Pdp_gr_print(arg,rp)
-NODE arg;
-Q *rp;
+void Pdp_gr_print(NODE arg,Q *rp)
 {
 	Q q;
 	int s;
@@ -1927,9 +1914,7 @@ void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo
 	if ( !homo_is_set ) *homo = 0;
 }
 
-void Pdp_gr_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_gr_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	VL vl;
@@ -1968,9 +1953,7 @@ LIST *rp;
 	dp_gr_main(f,v,homo,modular,0,ord,rp);
 }
 
-void Pdp_interreduce(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_interreduce(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	VL vl;
@@ -1992,9 +1975,7 @@ LIST *rp;
 	dp_interreduce(f,v,0,ord,rp);
 }
 
-void Pdp_gr_f_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_gr_f_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	Num homo;
@@ -2037,9 +2018,7 @@ LIST *rp;
 	dp_gr_main(f,v,homo,m?1:0,field,ord,rp);
 }
 
-void Pdp_f4_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_f4_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	struct order_spec *ord;
@@ -2058,9 +2037,7 @@ LIST *rp;
 
 /* dp_gr_checklist(list of dp) */
 
-void Pdp_gr_checklist(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_gr_checklist(NODE arg,LIST *rp)
 {
 	VECT g;
 	LIST dp;
@@ -2076,9 +2053,7 @@ LIST *rp;
 	MKLIST(*rp,r);
 }
 
-void Pdp_f4_mod_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_f4_mod_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	int m;
@@ -2099,9 +2074,7 @@ LIST *rp;
 	dp_f4_mod_main(f,v,m,ord,rp);
 }
 
-void Pdp_gr_mod_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_gr_mod_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	Num homo;
@@ -2125,16 +2098,17 @@ LIST *rp;
 	dp_gr_mod_main(f,v,homo,m,ord,rp);
 }
 
-void Pnd_f4(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_f4(NODE arg,LIST *rp)
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
+    Q mq;
+    NODE node;
 	struct order_spec *ord;
 
 	do_weyl = 0;
+	nd_rref2 = 0;
 	asir_assert(ARG0(arg),O_LIST,"nd_f4");
 	asir_assert(ARG1(arg),O_LIST,"nd_f4");
 	asir_assert(ARG2(arg),O_N,"nd_f4");
@@ -2143,19 +2117,27 @@ LIST *rp;
 	if ( !BDY(f) ) {
 		*rp = f; return;
 	}
-	m = QTOS((Q)ARG2(arg));
+    mq = (Q)ARG2(arg);
+    if ( PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30) ) {
+      node = mknode(1,mq);
+      Psetmod_ff(node,&val);
+      m = -2;
+    }
 	create_order_spec(0,ARG3(arg),&ord);
-	find = get_opt("homo",&homo);
-	nd_gr(f,v,m,find&&homo,1,ord,rp);
+	homo = retdp = 0;
+	if ( get_opt("homo",&val) && val ) homo = 1;
+	if ( get_opt("dp",&val) && val ) retdp = 1;
+	if ( get_opt("rref2",&val) && val ) nd_rref2 = 1;
+	nd_gr(f,v,m,homo,retdp,1,ord,rp);
 }
 
-void Pnd_gr(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_gr(NODE arg,LIST *rp)
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
+    Q mq;
+    NODE node;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2167,15 +2149,20 @@ LIST *rp;
 	if ( !BDY(f) ) {
 		*rp = f; return;
 	}
-	m = QTOS((Q)ARG2(arg));
+    mq = (Q)ARG2(arg);
+    if ( PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30) ) {
+      node = mknode(1,mq);
+      Psetmod_ff(node,&val);
+      m = -2;
+    }
 	create_order_spec(0,ARG3(arg),&ord);
-	find = get_opt("homo",&homo);
-	nd_gr(f,v,m,find&&homo,0,ord,rp);
+	homo = retdp = 0;
+	if ( get_opt("homo",&val) && val ) homo = 1;
+	if ( get_opt("dp",&val) && val ) retdp = 1;
+	nd_gr(f,v,m,homo,retdp,0,ord,rp);
 }
 
-void Pnd_gr_postproc(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_gr_postproc(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	int m,do_check;
@@ -2196,10 +2183,52 @@ LIST *rp;
 	nd_gr_postproc(f,v,m,ord,do_check,rp);
 }
 
-void Pnd_weyl_gr_postproc(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_gr_recompute_trace(NODE arg,LIST *rp)
 {
+	LIST f,v,tlist;
+	int m;
+	struct order_spec *ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"nd_gr_recompute_trace");
+	asir_assert(ARG1(arg),O_LIST,"nd_gr_recompute_trace");
+	asir_assert(ARG2(arg),O_N,"nd_gr_recompute_trace");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	m = QTOS((Q)ARG2(arg));
+	create_order_spec(0,ARG3(arg),&ord);
+	tlist = (LIST)ARG4(arg);
+	nd_gr_recompute_trace(f,v,m,ord,tlist,rp);
+}
+
+Obj nd_btog_one(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,int pos);
+Obj nd_btog(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist);
+
+void Pnd_btog(NODE arg,Obj *rp)
+{
+	LIST f,v,tlist;
+	int m,ac,pos;
+	struct order_spec *ord;
+
+	do_weyl = 0;
+	asir_assert(ARG0(arg),O_LIST,"nd_btog");
+	asir_assert(ARG1(arg),O_LIST,"nd_btog");
+	asir_assert(ARG2(arg),O_N,"nd_btog");
+	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
+	m = QTOS((Q)ARG2(arg));
+	create_order_spec(0,ARG3(arg),&ord);
+	tlist = (LIST)ARG4(arg);
+	if ( (ac = argc(arg)) == 6 ) {
+		asir_assert(ARG5(arg),O_N,"nd_btog");
+		pos = QTOS((Q)ARG5(arg));
+		*rp = nd_btog_one(f,v,m,ord,tlist,pos);
+	} else if ( ac == 5 )
+		*rp = nd_btog(f,v,m,ord,tlist);
+	else
+		error("nd_btog : argument mismatch");
+}
+
+void Pnd_weyl_gr_postproc(NODE arg,LIST *rp)
+{
 	LIST f,v;
 	int m,do_check;
 	struct order_spec *ord;
@@ -2220,9 +2249,7 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-void Pnd_gr_trace(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_gr_trace(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	int m,homo;
@@ -2244,9 +2271,7 @@ LIST *rp;
 	nd_gr_trace(f,v,m,homo,0,ord,rp);
 }
 
-void Pnd_f4_trace(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_f4_trace(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	int m,homo;
@@ -2268,13 +2293,11 @@ LIST *rp;
 	nd_gr_trace(f,v,m,homo,1,ord,rp);
 }
 
-void Pnd_weyl_gr(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_weyl_gr(NODE arg,LIST *rp)
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
 	struct order_spec *ord;
 
 	do_weyl = 1;
@@ -2288,14 +2311,14 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
-	find = get_opt("homo",&homo);
-	nd_gr(f,v,m,find&&homo,0,ord,rp);
+	homo = retdp = 0;
+	if ( get_opt("homo",&val) && val ) homo = 1;
+	if ( get_opt("dp",&val) && val ) retdp = 1;
+	nd_gr(f,v,m,homo,retdp,0,ord,rp);
 	do_weyl = 0;
 }
 
-void Pnd_weyl_gr_trace(arg,rp)
-NODE arg;
-LIST *rp;
+void Pnd_weyl_gr_trace(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	int m,homo;
@@ -2318,20 +2341,17 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-void Pnd_nf(arg,rp)
-NODE arg;
-P *rp;
+void Pnd_nf(NODE arg,Obj *rp)
 {
-	P f;
+	Obj f;
 	LIST g,v;
 	struct order_spec *ord;
 
 	do_weyl = 0;
-	asir_assert(ARG0(arg),O_P,"nd_nf");
 	asir_assert(ARG1(arg),O_LIST,"nd_nf");
 	asir_assert(ARG2(arg),O_LIST,"nd_nf");
 	asir_assert(ARG4(arg),O_N,"nd_nf");
-	f = (P)ARG0(arg);
+	f = (Obj)ARG0(arg);
 	g = (LIST)ARG1(arg); g = remove_zero_from_list(g);
 	if ( !BDY(g) ) {
 		*rp = f; return;
@@ -2341,11 +2361,29 @@ P *rp;
 	nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),ord,rp);
 }
 
+void Pnd_weyl_nf(NODE arg,Obj *rp)
+{
+	Obj f;
+	LIST g,v;
+	struct order_spec *ord;
+
+	do_weyl = 1;
+	asir_assert(ARG1(arg),O_LIST,"nd_weyl_nf");
+	asir_assert(ARG2(arg),O_LIST,"nd_weyl_nf");
+	asir_assert(ARG4(arg),O_N,"nd_weyl_nf");
+	f = (Obj)ARG0(arg);
+	g = (LIST)ARG1(arg); g = remove_zero_from_list(g);
+	if ( !BDY(g) ) {
+		*rp = f; return;
+	}
+	v = (LIST)ARG2(arg);
+	create_order_spec(0,ARG3(arg),&ord);
+	nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),ord,rp);
+}
+
 /* for Weyl algebra */
 
-void Pdp_weyl_gr_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_weyl_gr_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	Num homo;
@@ -2385,9 +2423,7 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-void Pdp_weyl_gr_f_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_weyl_gr_f_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	Num homo;
@@ -2409,9 +2445,7 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-void Pdp_weyl_f4_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_weyl_f4_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	struct order_spec *ord;
@@ -2429,9 +2463,7 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-void Pdp_weyl_f4_mod_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_weyl_f4_mod_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	int m;
@@ -2453,9 +2485,7 @@ LIST *rp;
 	do_weyl = 0;
 }
 
-void Pdp_weyl_gr_mod_main(arg,rp)
-NODE arg;
-LIST *rp;
+void Pdp_weyl_gr_mod_main(NODE arg,LIST *rp)
 {
 	LIST f,v;
 	Num homo;
@@ -2482,10 +2512,9 @@ LIST *rp;
 
 VECT current_dl_weight_vector_obj;
 int *current_dl_weight_vector;
+int dp_negative_weight;
 
-void Pdp_set_weight(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_set_weight(NODE arg,VECT *rp)
 {
 	VECT v;
 	int i,n;
@@ -2496,6 +2525,7 @@ VECT *rp;
 	else if ( !ARG0(arg) ) {
 		current_dl_weight_vector_obj = 0;
 		current_dl_weight_vector = 0;
+        dp_negative_weight = 0;
 		*rp = 0;
 	} else {
 		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
@@ -2514,6 +2544,12 @@ VECT *rp;
 		current_dl_weight_vector = (int *)CALLOC(n,sizeof(int));
 		for ( i = 0; i < n; i++ )
 			current_dl_weight_vector[i] = QTOS((Q)v->body[i]);
+        for ( i = 0; i < n; i++ )
+            if ( current_dl_weight_vector[i] < 0 ) break;
+        if ( i < n )
+            dp_negative_weight = 1;
+        else
+            dp_negative_weight = 0;
 		*rp = v;
 	}
 }
@@ -2521,9 +2557,7 @@ VECT *rp;
 VECT current_module_weight_vector_obj;
 int *current_module_weight_vector;
 
-void Pdp_set_module_weight(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_set_module_weight(NODE arg,VECT *rp)
 {
 	VECT v;
 	int i,n;
@@ -2556,44 +2590,51 @@ VECT *rp;
 	}
 }
 
-VECT current_top_weight_vector_obj;
-N *current_top_weight_vector;
+extern Obj current_top_weight;
+extern Obj nd_top_weight;
 
-void Pdp_set_top_weight(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_set_top_weight(NODE arg,Obj *rp)
 {
 	VECT v;
-	int i,n;
+	MAT m;
+	Obj obj;
+	int i,j,n,id,row,col;
+	Q *mi;
 	NODE node;
 
 	if ( !arg )
-		*rp = current_top_weight_vector_obj;
+		*rp = current_top_weight;
 	else if ( !ARG0(arg) ) {
-		current_top_weight_vector = 0;
-		current_top_weight_vector_obj = 0;
+		reset_top_weight();
 		*rp = 0;
 	} else {
-		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
+		id = OID(ARG0(arg));
+		if ( id != O_VECT && id != O_MAT && id != O_LIST )
 			error("dp_set_top_weight : invalid argument");
-		if ( OID(ARG0(arg)) == O_VECT )
-			v = (VECT)ARG0(arg);
-		else {
+		if ( id == O_LIST ) {
 			node = (NODE)BDY((LIST)ARG0(arg));
 			n = length(node);
 			MKVECT(v,n);
 			for ( i = 0; i < n; i++, node = NEXT(node) )
 				BDY(v)[i] = BDY(node);
+		    obj = (Obj)v;
+		} else
+		    obj = ARG0(arg);
+		if ( OID(obj) == O_VECT ) {
+			v = (VECT)obj;
+		    for ( i = 0; i < v->len; i++ )
+			    if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) )
+				    error("dp_set_top_weight : each element must be a non-negative integer");
+		} else {
+			m = (MAT)obj; row = m->row; col = m->col;
+		    for ( i = 0; i < row; i++ )
+				for ( j = 0, mi = (Q *)BDY(m)[i]; j < col; j++ )
+			        if ( !INT(mi[j]) || (mi[j] && SGN((Q)mi[j]) < 0) )
+				        error("dp_set_top_weight : each element must be a non-negative integer");
 		}
-		for ( i = 0; i < v->len; i++ )
-			if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) )
-				error("dp_set_top_weight : each element must be a non-negative integer");
-		current_top_weight_vector_obj = v;
-		current_top_weight_vector = (N *)MALLOC(v->len*sizeof(N));
-		for ( i = 0; i < v->len; i++ ) {
-			current_top_weight_vector[i] = !BDY(v)[i]?0:NM((Q)BDY(v)[i]);
-		}
-		*rp = current_top_weight_vector_obj;
+        current_top_weight = obj;
+		nd_top_weight = obj;
+		*rp = current_top_weight;
 	}
 }
 
@@ -2607,11 +2648,10 @@ void Pdp_get_denomlist(LIST *rp)
 static VECT current_weyl_weight_vector_obj;
 int *current_weyl_weight_vector;
 
-void Pdp_weyl_set_weight(arg,rp)
-NODE arg;
-VECT *rp;
+void Pdp_weyl_set_weight(NODE arg,VECT *rp)
 {
 	VECT v;
+	NODE node;
 	int i,n;
 
 	if ( !arg )
@@ -2621,8 +2661,17 @@ VECT *rp;
 		current_weyl_weight_vector = 0;
 		*rp = 0;
 	} else {
-		asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight");
-		v = (VECT)ARG0(arg);
+		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
+			error("dp_weyl_set_weight : invalid argument");
+		if ( OID(ARG0(arg)) == O_VECT )
+			v = (VECT)ARG0(arg);
+		else {
+			node = (NODE)BDY((LIST)ARG0(arg));
+			n = length(node);
+			MKVECT(v,n);
+			for ( i = 0; i < n; i++, node = NEXT(node) )
+				BDY(v)[i] = BDY(node);
+		}
 		current_weyl_weight_vector_obj = v;
 		n = v->len;
 		current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int));
@@ -2632,6 +2681,419 @@ VECT *rp;
 	}
 }
 
+NODE mono_raddec(NODE ideal);
+
+void Pdp_mono_raddec(NODE arg,LIST *rp)
+{
+	NODE ideal,rd,t,t1,r,r1,u;
+	VL vl0,vl;
+	int nv,i,bpi;
+	int *s;
+	DP dp;
+	P *v;
+	LIST l;
+
+	ideal = BDY((LIST)ARG0(arg));
+	if ( !ideal ) *rp = (LIST)ARG0(arg);
+	else {
+		t = BDY((LIST)ARG1(arg));
+		nv = length(t);
+		v = (P *)MALLOC(nv*sizeof(P));
+		for ( vl0 = 0, i = 0; t; t = NEXT(t), i++ ) {
+			NEXTVL(vl0,vl); VR(vl) = VR((P)BDY(t));
+			MKV(VR(vl),v[i]);
+		}
+		if ( vl0 ) NEXT(vl) = 0;
+		for ( t = 0, r = ideal; r; r = NEXT(r) ) {
+			ptod(CO,vl0,BDY(r),&dp); MKNODE(t1,dp,t); t = t1;
+		}
+		rd = mono_raddec(t);
+		r = 0;
+		bpi = (sizeof(int)/sizeof(char))*8;
+		for ( u = rd; u; u = NEXT(u) ) {
+			s = (int *)BDY(u);
+			for ( i = nv-1, t = 0; i >= 0; i-- )
+				if ( s[i/bpi]&(1<<(i%bpi)) ) {
+					MKNODE(t1,v[i],t); t = t1;
+				}
+			MKLIST(l,t); MKNODE(r1,l,r); r = r1;
+		}
+		MKLIST(*rp,r);
+	}
+}
+
+void Pdp_mono_reduce(NODE arg,LIST *rp)
+{
+	NODE t,t0,t1,r0,r;
+	int i,n;
+	DP m;
+	DP *a;
+
+	t0 = BDY((LIST)ARG0(arg));
+	t1 = BDY((LIST)ARG1(arg));
+	n = length(t0);
+	a = (DP *)MALLOC(n*sizeof(DP));
+	for ( i = 0; i < n; i++, t0 = NEXT(t0) ) a[i] = (DP)BDY(t0);
+	for ( t = t1; t; t = NEXT(t) ) {
+		m = (DP)BDY(t);
+		for ( i = 0; i < n; i++ )
+			if ( a[i] && dp_redble(a[i],m) ) a[i] = 0;
+	}
+	for ( i = n-1, r0 = 0; i >= 0; i-- )
+		if ( a[i] ) { NEXTNODE(r0,r); BDY(r) = a[i]; }
+	if ( r0 ) NEXT(r) = 0;
+	MKLIST(*rp,r0);
+}
+
+#define BLEN (8*sizeof(unsigned long))
+
+void showmat2(unsigned long **a,int row,int col)
+{
+  int i,j;
+
+  for ( i = 0; i < row; i++, putchar('\n') )
+    for ( j = 0; j < col; j++ )
+	    if ( a[i][j/BLEN] & (1L<<(j%BLEN)) ) putchar('1');
+      else putchar('0');
+}
+
+int rref2(unsigned long **a,int row,int col)
+{
+  int i,j,k,l,s,wcol,wj;
+  unsigned long bj;
+  unsigned long *ai,*ak,*as,*t;
+  int *pivot;
+
+  wcol = (col+BLEN-1)/BLEN; 
+  pivot = (int *)MALLOC_ATOMIC(row*sizeof(int));
+  i = 0;
+  for ( j = 0; j < col; j++ ) {
+	  wj = j/BLEN; bj = 1L<<(j%BLEN);
+    for ( k = i; k < row; k++ )
+  	  if ( a[k][wj] & bj ) break;
+    if ( k == row ) continue;
+    pivot[i] = j;
+    if ( k != i ) {
+     t = a[i]; a[i] = a[k]; a[k] = t;
+	  }
+	  ai = a[i];
+    for ( k = i+1; k < row; k++ ) {
+	    ak = a[k];
+	    if ( ak[wj] & bj ) {
+	      for ( l = wj; l < wcol; l++ )
+		      ak[l] ^= ai[l];
+	    }
+	  }
+  	i++;
+  }
+  for ( k = i-1; k >= 0; k-- ) {
+    j = pivot[k]; wj = j/BLEN; bj = 1L<<(j%BLEN);
+	  ak = a[k];
+    for ( s = 0; s < k; s++ ) {
+	    as = a[s];
+      if ( as[wj] & bj ) {
+        for ( l = wj; l < wcol; l++ )
+		      as[l] ^= ak[l];
+	    }
+	  }
+  }
+  return i;
+}
+
+void Pdp_rref2(NODE arg,VECT *rp)
+{
+  VECT f,term,ret;
+  int row,col,wcol,size,nv,i,j,rank,td;
+  unsigned long **mat;
+  unsigned long *v;
+  DL d;
+  DL *t;
+  DP dp;
+  MP m,m0;
+
+  f = (VECT)ARG0(arg);
+  row = f->len;
+  term = (VECT)ARG1(arg);
+  col = term->len; 
+  mat = (unsigned long **)MALLOC(row*sizeof(unsigned long *));
+  size = sizeof(unsigned long)*((col+BLEN-1)/BLEN);
+  nv = ((DP)term->body[0])->nv;
+  t = (DL *)MALLOC(col*sizeof(DL));
+  for ( i = 0; i < col; i++ ) t[i] = BDY((DP)BDY(term)[i])->dl;
+  for ( i = 0; i < row; i++ ) {
+    v = mat[i] = (unsigned long *)MALLOC_ATOMIC_IGNORE_OFF_PAGE(size);
+	bzero(v,size);
+	for ( j = 0, m = BDY((DP)BDY(f)[i]); m; m = NEXT(m) ) {
+	  d = m->dl;
+	  for ( ; !dl_equal(nv,d,t[j]); j++ );
+	  v[j/BLEN] |= 1L <<(j%BLEN);
+	}
+  }
+  rank = rref2(mat,row,col);
+  MKVECT(ret,rank);
+  *rp = ret;
+  for ( i = 0; i < rank; i++ ) {
+    v = mat[i];
+	m0 = 0;
+	td = 0;
+    for ( j = 0; j < col; j++ ) {
+	  if ( v[j/BLEN] & (1L<<(j%BLEN)) ) {
+	    NEXTMP(m0,m);
+		m->dl = t[j];
+		m->c = (P)ONE;
+	    td = MAX(td,m->dl->td);
+	  }
+	}
+	NEXT(m) = 0;
+	MKDP(nv,m0,dp);
+	dp->sugar = td;
+    BDY(ret)[i] = (pointer)dp;
+  }
+}
+
+#define HDL(f) (BDY(f)->dl)
+
+NODE sumi_criB(int nv,NODE d,DP *f,int m)
+{
+ LIST p;
+ NODE r0,r;
+ int p0,p1;
+ DL p2,lcm;
+
+ NEWDL(lcm,nv);
+ r0 = 0;
+ for ( ; d; d = NEXT(d) ) {
+	p = (LIST)BDY(d);
+	p0 = QTOS((Q)ARG0(BDY(p)));
+	p1 = QTOS((Q)ARG1(BDY(p)));
+	p2 = HDL((DP)ARG2(BDY(p)));
+    if(!_dl_redble(HDL((DP)f[m]),p2,nv) ||
+     dl_equal(nv,lcm_of_DL(nv,HDL(f[p0]),HDL(f[m]),lcm),p2) ||
+     dl_equal(nv,lcm_of_DL(nv,HDL(f[p1]),HDL(f[m]),lcm),p2) ) {
+	  NEXTNODE(r0,r);
+	  BDY(r) = p;
+	}
+ }
+ if ( r0 ) NEXT(r) = 0;
+ return r0;
+}
+
+NODE sumi_criFMD(int nv,DP *f,int m)
+{
+  DL *a;
+  DL l1,dl1,dl2;
+  int i,j,k,k2;
+  NODE r,r1,nd;
+  MP mp;
+  DP u;
+  Q iq,mq;
+  LIST list;
+
+  /* a[i] = lcm(LT(f[i]),LT(f[m])) */
+  a = (DL *)ALLOCA(m*sizeof(DL));
+  for ( i = 0; i < m; i++ ) {
+   a[i] = lcm_of_DL(nv,HDL(f[i]),HDL(f[m]),0);
+  }
+  r = 0;
+  for( i = 0; i < m; i++) {
+   l1 = a[i];
+   if ( !l1 ) continue;
+   /* Tkm = Tim (k<i) */
+   for( k = 0; k < i; k++)
+     if( dl_equal(nv,l1,a[k]) ) break;
+   if( k == i ){
+     /* Tk|Tim && Tkm != Tim (k<m) */
+	 for ( k2 = 0; k2 < m; k2++ )
+	   if ( _dl_redble(HDL(f[k2]),l1,nv) &&
+	     !dl_equal(nv,l1,a[k2]) ) break;
+	 if ( k2 == m ) {
+       dl1 = HDL(f[i]); dl2 = HDL(f[m]);
+       for ( k2 = 0; k2 < nv; k2++ )
+         if ( dl1->d[k2] && dl2->d[k2] ) break;
+       if ( k2 < nv ) {
+         NEWMP(mp); mp->dl = l1; C(mp) = (P)ONE;
+         NEXT(mp) = 0; MKDP(nv,mp,u); u->sugar = l1->td;
+	     STOQ(i,iq); STOQ(m,mq);
+	     nd = mknode(3,iq,mq,u);
+	     MKLIST(list,nd);
+	     MKNODE(r1,list,r);
+	     r = r1;
+	  }
+	}
+   }
+ } 
+ return r;
+}
+
+LIST sumi_updatepairs(LIST d,DP *f,int m)
+{
+  NODE old,new,t;
+  LIST l;
+  int nv;
+
+  nv = f[0]->nv;
+  old = sumi_criB(nv,BDY(d),f,m);
+  new = sumi_criFMD(nv,f,m);
+  if ( !new ) new = old;
+  else {
+    for ( t = new ; NEXT(t); t = NEXT(t) );
+	NEXT(t) = old;
+  }
+  MKLIST(l,new);
+  return l;
+}
+
+VECT ltov(LIST l)
+{
+  NODE n;
+  int i,len;
+  VECT v;
+
+  n = BDY(l);
+  len = length(n);
+  MKVECT(v,len);
+  for ( i = 0; i < len; i++, n = NEXT(n) )
+    BDY(v)[i] = BDY(n);
+  return v;
+}
+
+DL subdl(int nv,DL d1,DL d2)
+{
+  int i;
+  DL d;
+
+  NEWDL(d,nv);
+  d->td = d1->td-d2->td;
+  for ( i = 0; i < nv; i++ )
+    d->d[i] = d1->d[i]-d2->d[i];
+  return d;
+}
+
+DP dltodp(int nv,DL d)
+{
+  MP mp;
+  DP dp;
+
+  NEWMP(mp); mp->dl = d; C(mp) = (P)ONE;
+  NEXT(mp) = 0; MKDP(nv,mp,dp); dp->sugar = d->td;
+  return dp;
+}
+
+LIST sumi_simplify(int nv,DL t,DP p,NODE f2,int simp)
+{
+  DL d,h,hw;
+  DP u,w,dp;
+  int n,i,last;
+  LIST *v;
+  LIST list;
+  NODE s,r;
+
+  d = t; u = p;
+  /* only the last history is used */
+  if ( f2 && simp && t->td != 0 ) {
+    adddl(nv,t,HDL(p),&h);
+    n = length(f2);
+    last = 1;
+    if ( simp > 1 ) last = n;
+    v = (LIST *)ALLOCA(n*sizeof(LIST));
+    for ( r = f2, i = 0; r; r = NEXT(r), i++ ) v[n-i-1] = BDY(r);
+    for ( i = 0; i < last; i++ ) {
+      for ( s = BDY((LIST)v[i]); s; s = NEXT(s) ) {
+	    w = (DP)BDY(s); hw = HDL(w);
+        if ( _dl_redble(hw,h,nv) ) {
+		  u = w;
+		  d = subdl(nv,h,hw);
+		  goto fin;
+	    }
+      }
+    }
+  }
+fin:
+  dp = dltodp(nv,d);
+  r = mknode(2,dp,u);
+  MKLIST(list,r);
+  return list;
+}
+
+LIST sumi_symbolic(NODE l,int q,NODE f2,DP *g,int simp)
+{
+   int nv;
+   NODE t,r;
+   NODE f0,f,fd0,fd,done0,done,red0,red;
+   DL h,d;
+   DP mul;
+   int m;
+   LIST tp,l0,l1,l2,l3,list;
+   VECT v0,v1,v2,v3;
+
+   nv = ((DP)BDY(l))->nv;
+   t = 0;
+
+   f0 = 0; fd0 = 0; done0 = 0; red0 = 0;
+
+   for ( ; l; l = NEXT(l) ) {
+     t = symb_merge(t,dp_dllist((DP)BDY(l)),nv);
+     NEXTNODE(fd0,fd); BDY(fd) = BDY(l);
+   }
+
+   while ( t ) {
+	 h = (DL)BDY(t);
+	 NEXTNODE(done0,done); BDY(done) = dltodp(nv,h);
+	 t = NEXT(t);
+     for(m = 0; m < q; m++)
+	   if ( _dl_redble(HDL(g[m]),h,nv) ) break;
+     if ( m == q ) { 
+     } else {
+	   d = subdl(nv,h,HDL(g[m]));
+       tp = sumi_simplify(nv,d,g[m],f2,simp);
+
+	   muldm(CO,ARG1(BDY(tp)),BDY((DP)ARG0(BDY(tp))),&mul);
+       t = symb_merge(t,NEXT(dp_dllist(mul)),nv);
+
+	   NEXTNODE(f0,f); BDY(f) = tp;
+	   NEXTNODE(fd0,fd); BDY(fd) = mul;
+	   NEXTNODE(red0,red); BDY(red) = mul;
+     }
+   }
+   if ( fd0 ) NEXT(fd) = 0; MKLIST(l0,fd0);
+   v0 = ltov(l0);
+   if ( done0 ) NEXT(done) = 0; MKLIST(l1,done0);
+   v1 = ltov(l1);
+   if ( f0 ) NEXT(f) = 0; MKLIST(l2,f0);
+   v2 = ltov(l2);
+   if ( red0 ) NEXT(red) = 0; MKLIST(l3,red0);
+   v3 = ltov(l3);
+   r = mknode(4,v0,v1,v2,v3);
+   MKLIST(list,r);
+   return list;
+}
+
+void Psumi_symbolic(NODE arg,LIST *rp)
+{
+  NODE l,f2;
+  DP *g;
+  int q,simp;
+
+  l = BDY((LIST)ARG0(arg));
+  q = QTOS((Q)ARG1(arg));
+  f2 = BDY((LIST)ARG2(arg));
+  g = (DP *)BDY((VECT)ARG3(arg));
+  simp = QTOS((Q)ARG4(arg));
+  *rp = sumi_symbolic(l,q,f2,g,simp);
+}
+
+void Psumi_updatepairs(NODE arg,LIST *rp)
+{
+   LIST d,l;
+   DP *f;
+   int m;
+
+   d = (LIST)ARG0(arg); 
+   f = (DP *)BDY((VECT)ARG1(arg)); 
+   m = QTOS((Q)ARG2(arg)); 
+   *rp = sumi_updatepairs(d,f,m);
+}
+
 LIST remove_zero_from_list(LIST l)
 {
 	NODE n,r0,r;
@@ -2814,4 +3276,3 @@ int get_opt(char *key0,Obj *r) {
    }
    return 0;
 }
-