===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.69
retrieving revision 1.74
diff -u -p -r1.69 -r1.74
--- OpenXM_contrib2/asir2000/builtin/dp.c	2007/09/07 00:45:50	1.69
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2007/10/21 07:47:59	1.74
@@ -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.68 2007/09/06 02:23:40 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.73 2007/10/14 02:32:21 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -67,7 +67,8 @@ void Pdp_sp(), Pdp_hm(), Pdp_ht(), Pdp_hc(), Pdp_rest(
 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();
+void Pdp_nf(),Pdp_true_nf(),Pdp_true_nf_marked(),Pdp_true_nf_marked_mod();
+void Pdp_true_nf_and_quotient_marked();
 void Pdp_nf_mod(),Pdp_true_nf_mod();
 void Pdp_criB(),Pdp_nelim();
 void Pdp_minp(),Pdp_sp_mod();
@@ -90,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();
+void Pdp_set_weight(),Pdp_set_top_weight();
 void Pdp_nf_f(),Pdp_weyl_nf_f();
 void Pdp_lnf_f();
 void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace();
@@ -100,7 +101,10 @@ void Pnd_nf();
 void Pdp_initial_term();
 void Pdp_order();
 void Pdp_inv_or_split();
+void Pdp_compute_last_t();
 void Pdp_compute_last_w();
+void Pdp_compute_essential_df();
+void Pdp_get_denomlist();
 
 LIST dp_initial_term();
 LIST dp_order();
@@ -135,6 +139,8 @@ struct ftab dp_tab[] = {
 	{"dp_nf_f",Pdp_nf_f,4},
 	{"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_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},
@@ -189,7 +195,10 @@ struct ftab dp_tab[] = {
 	/* misc */
 	{"dp_inv_or_split",Pdp_inv_or_split,3},
 	{"dp_set_weight",Pdp_set_weight,-1},
+	{"dp_set_top_weight",Pdp_set_top_weight,-1},
 	{"dp_weyl_set_weight",Pdp_weyl_set_weight,-1},
+
+	{"dp_get_denomlist",Pdp_get_denomlist,0},
 	{0,0,0},
 };
 
@@ -249,12 +258,33 @@ struct ftab dp_supp_tab[] = {
 	{"dp_tdiv",Pdp_tdiv,2},
 	{"dp_minp",Pdp_minp,2},
 	{"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},
 
 	{0,0,0}
 };
 
 NODE compute_last_w(NODE g,NODE gh,int n,int **v,int row1,int **m1,int row2,int **m2);
+Q compute_last_t(NODE g,NODE gh,Q t,VECT w1,VECT w2,NODE *homo,VECT *wp);
 
+void Pdp_compute_last_t(NODE arg,LIST *rp)
+{
+	NODE g,gh,homo,n;
+	LIST hlist;
+	VECT v1,v2,w;
+	Q t;
+
+	g = (NODE)BDY((LIST)ARG0(arg));
+	gh = (NODE)BDY((LIST)ARG1(arg));
+	t = (Q)ARG2(arg);
+	v1 = (VECT)ARG3(arg);
+	v2 = (VECT)ARG4(arg);
+	t = compute_last_t(g,gh,t,v1,v2,&homo,&w);
+	MKLIST(hlist,homo);
+	n = mknode(3,t,w,hlist);
+	MKLIST(*rp,n);
+}
+
 void Pdp_compute_last_w(NODE arg,LIST *rp)
 {
 	NODE g,gh,r;
@@ -297,6 +327,19 @@ void Pdp_compute_last_w(NODE arg,LIST *rp)
 	}
 }
 
+NODE compute_essential_df(DP *g,DP *gh,int n);
+
+void Pdp_compute_essential_df(NODE arg,LIST *rp)
+{
+	VECT g,gh;
+	NODE r;
+
+	g = (VECT)ARG0(arg);
+	gh = (VECT)ARG1(arg);
+	r = (NODE)compute_essential_df((DP *)BDY(g),(DP *)BDY(gh),g->len);
+	MKLIST(*rp,r);
+}
+
 void Pdp_inv_or_split(arg,rp)
 NODE arg;
 Obj *rp;
@@ -955,6 +998,68 @@ LIST *rp;
 	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_marked(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	NODE b,n;
+	DP *ps,*hps;
+	DP g;
+	DP nm;
+	VECT quo;
+	P dn;
+	int full;
+
+	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");
+	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_true_nf_marked_mod(arg,rp)
+NODE arg;
+LIST *rp;
+{
+	NODE b,n;
+	DP *ps,*hps;
+	DP g;
+	DP nm;
+	P dn;
+	int mod;
+
+	do_weyl = 0; dp_fcoeffs = 0;
+	asir_assert(ARG0(arg),O_LIST,"dp_true_nf_marked_mod");
+	asir_assert(ARG1(arg),O_DP,"dp_true_nf_marked_mod");
+	asir_assert(ARG2(arg),O_VECT,"dp_true_nf_marked_mod");
+	asir_assert(ARG3(arg),O_VECT,"dp_true_nf_marked_mod");
+	asir_assert(ARG4(arg),O_N,"dp_true_nf_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));
+		dp_true_nf_marked_mod(b,g,ps,hps,mod,&nm,&dn);
+	}
+	n = mknode(2,nm,dn);
+	MKLIST(*rp,n);
+}
+
 void Pdp_weyl_nf_mod(arg,rp)
 NODE arg;
 DP *rp;
@@ -2316,6 +2421,54 @@ VECT *rp;
 			current_dl_weight_vector[i] = QTOS((Q)v->body[i]);
 		*rp = v;
 	}
+}
+
+VECT current_top_weight_vector_obj;
+N *current_top_weight_vector;
+
+void Pdp_set_top_weight(arg,rp)
+NODE arg;
+VECT *rp;
+{
+	VECT v;
+	int i,n;
+	NODE node;
+
+	if ( !arg )
+		*rp = current_top_weight_vector_obj;
+	else if ( !ARG0(arg) ) {
+		current_top_weight_vector = 0;
+		current_top_weight_vector_obj = 0;
+		*rp = 0;
+	} else {
+		if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST )
+			error("dp_set_top_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);
+		}
+		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;
+	}
+}
+
+LIST get_denomlist();
+
+void Pdp_get_denomlist(LIST *rp)
+{
+	*rp = get_denomlist();
 }
 
 static VECT current_weyl_weight_vector_obj;