===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.75
retrieving revision 1.79
diff -u -p -r1.75 -r1.79
--- OpenXM_contrib2/asir2000/builtin/dp.c	2008/01/06 00:36:32	1.75
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2009/10/09 04:02:11	1.79
@@ -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.74 2007/10/21 07:47:59 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.78 2009/09/09 08:13:24 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();
@@ -91,7 +91,7 @@ void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_wey
 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_set_weight();
-void Pdp_set_weight(),Pdp_set_top_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();
@@ -140,6 +140,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},
@@ -196,6 +197,7 @@ struct ftab dp_tab[] = {
 	/* misc */
 	{"dp_inv_or_split",Pdp_inv_or_split,3},
 	{"dp_set_weight",Pdp_set_weight,-1},
+	{"dp_set_module_weight",Pdp_set_module_weight,-1},
 	{"dp_set_top_weight",Pdp_set_top_weight,-1},
 	{"dp_weyl_set_weight",Pdp_weyl_set_weight,-1},
 
@@ -1031,6 +1033,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;
@@ -2072,9 +2108,9 @@ LIST *rp;
 	struct order_spec *ord;
 
 	do_weyl = 0;
-	asir_assert(ARG0(arg),O_LIST,"nd_gr");
-	asir_assert(ARG1(arg),O_LIST,"nd_gr");
-	asir_assert(ARG2(arg),O_N,"nd_gr");
+	asir_assert(ARG0(arg),O_LIST,"nd_f4");
+	asir_assert(ARG1(arg),O_LIST,"nd_f4");
+	asir_assert(ARG2(arg),O_N,"nd_f4");
 	f = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
 	f = remove_zero_from_list(f);
 	if ( !BDY(f) ) {
@@ -2447,6 +2483,44 @@ VECT *rp;
 	}
 }
 
+VECT current_module_weight_vector_obj;
+int *current_module_weight_vector;
+
+void Pdp_set_module_weight(arg,rp)
+NODE arg;
+VECT *rp;
+{
+	VECT v;
+	int i,n;
+	NODE node;
+
+	if ( !arg )
+		*rp = current_module_weight_vector_obj;
+	else if ( !ARG0(arg) ) {
+		current_module_weight_vector_obj = 0;
+		current_module_weight_vector = 0;
+		*rp = 0;
+	} else {
+		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
+			error("dp_module_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_module_weight_vector_obj = v;
+		n = v->len;
+		current_module_weight_vector = (int *)CALLOC(n,sizeof(int));
+		for ( i = 0; i < n; i++ )
+			current_module_weight_vector[i] = QTOS((Q)v->body[i]);
+		*rp = v;
+	}
+}
+
 VECT current_top_weight_vector_obj;
 N *current_top_weight_vector;
 
@@ -2507,7 +2581,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;