===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.77
retrieving revision 1.80
diff -u -p -r1.77 -r1.80
--- OpenXM_contrib2/asir2000/builtin/dp.c	2009/01/05 02:08:17	1.77
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2010/01/19 06:17:22	1.80
@@ -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.76 2009/01/04 05:44:51 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.79 2009/10/09 04:02:11 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -68,7 +68,7 @@ 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_marked();
+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();
@@ -105,6 +105,7 @@ void Pdp_compute_last_t();
 void Pdp_compute_last_w();
 void Pdp_compute_essential_df();
 void Pdp_get_denomlist();
+void Pdp_symb_add();
 
 LIST dp_initial_term();
 LIST dp_order();
@@ -140,6 +141,7 @@ struct ftab dp_tab[] = {
 	{"dp_true_nf",Pdp_true_nf,4},
 	{"dp_true_nf_marked",Pdp_true_nf_marked,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},
@@ -245,6 +247,7 @@ struct ftab dp_supp_tab[] = {
 	{"dp_rest",Pdp_rest,1},
 	{"dp_initial_term",Pdp_initial_term,1},
 	{"dp_order",Pdp_order,1},
+	{"dp_symb_add",Pdp_symb_add,2},
 
 	/* degree and size */
 	{"dp_td",Pdp_td,1},
@@ -1032,6 +1035,40 @@ LIST *rp;
 	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_marked_mod(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	NODE b,n;
+	DP *ps,*hps;
+	DP g;
+	DP nm;
+	VECT quo;
+	P dn;
+	int full,mod;
+
+	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");
+	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_true_nf_marked_mod(arg,rp)
 NODE arg;
 LIST *rp;
@@ -1224,6 +1261,30 @@ DP *rp;
 	dp_subd(p1,p2,rp);
 }
 
+void Pdp_symb_add(arg,rp)
+NODE arg;
+DP *rp;
+{
+	DP p1,p2,r;
+	NODE s0;
+	MP mp0,mp;
+	int nv;
+
+	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->nv != p2->nv )
+		error("dp_sumb_add : invalid input");
+	nv = p1->nv;
+	s0 = symb_merge(dp_dllist(p1),dp_dllist(p2),nv);
+	for ( mp0 = 0; s0; s0 = NEXT(s0) ) {
+		NEXTMP(mp0,mp); mp->dl = (DL)BDY(s0); mp->c = (P)ONE;
+	}
+	NEXT(mp) = 0;
+	MKDP(nv,mp0,r); r->sugar = MAX(p1->sugar,p2->sugar);
+	*rp = r;
+}
+
 void Pdp_mul_trunc(arg,rp)
 NODE arg;
 DP *rp;
@@ -2146,12 +2207,13 @@ LIST *rp;
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	f = remove_zero_from_list(f);
 	if ( !BDY(f) ) {
-		*rp = f; return;
+		*rp = f; do_weyl = 0; return;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
 	do_check = ARG4(arg) ? 1 : 0;
 	nd_gr_postproc(f,v,m,ord,do_check,rp);
+	do_weyl = 0;
 }
 
 void Pnd_gr_trace(arg,rp)
@@ -2217,11 +2279,12 @@ LIST *rp;
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	f = remove_zero_from_list(f);
 	if ( !BDY(f) ) {
-		*rp = f; return;
+		*rp = f; do_weyl = 0; return;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
 	nd_gr(f,v,m,0,ord,rp);
+	do_weyl = 0;
 }
 
 void Pnd_weyl_gr_trace(arg,rp)
@@ -2240,12 +2303,13 @@ LIST *rp;
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	f = remove_zero_from_list(f);
 	if ( !BDY(f) ) {
-		*rp = f; return;
+		*rp = f; do_weyl = 0; 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,0,ord,rp);
+	do_weyl = 0;
 }
 
 void Pnd_nf(arg,rp)
@@ -2546,7 +2610,11 @@ VECT *rp;
 
 	if ( !arg )
 		*rp = current_weyl_weight_vector_obj;
-	else {
+	else if ( !ARG0(arg) ) {
+		current_weyl_weight_vector_obj = 0;
+		current_weyl_weight_vector = 0;
+		*rp = 0;
+	} else {
 		asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight");
 		v = (VECT)ARG0(arg);
 		current_weyl_weight_vector_obj = v;