===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.83
retrieving revision 1.87
diff -u -p -r1.83 -r1.87
--- OpenXM_contrib2/asir2000/builtin/dp.c	2010/09/27 05:05:58	1.83
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2012/08/27 05:38:00	1.87
@@ -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.82 2010/05/01 02:17:49 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.86 2012/04/10 07:15:07 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -96,6 +96,7 @@ 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();
 void Pnd_weyl_gr(),Pnd_weyl_gr_trace();
 void Pnd_nf(),Pnd_weyl_nf();
 void Pdp_initial_term();
@@ -107,6 +108,7 @@ void Pdp_compute_essential_df();
 void Pdp_get_denomlist();
 void Pdp_symb_add();
 void Pdp_mono_raddec();
+void Pdp_mono_reduce();
 
 LIST dp_initial_term();
 LIST dp_order();
@@ -162,6 +164,7 @@ 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_weyl_gr_postproc",Pnd_weyl_gr_postproc,5},
 	{"nd_weyl_gr",Pnd_weyl_gr,4},
 	{"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5},
@@ -268,6 +271,7 @@ struct ftab dp_supp_tab[] = {
 	{"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},
 
 	{0,0,0}
 };
@@ -2133,8 +2137,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2148,8 +2152,10 @@ 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,1,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,1,ord,rp);
 }
 
 void Pnd_gr(arg,rp)
@@ -2157,8 +2163,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,find;
-	Obj homo;
+	int m,homo,retdp;
+	Obj val;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2172,8 +2178,10 @@ 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);
 }
 
 void Pnd_gr_postproc(arg,rp)
@@ -2199,6 +2207,25 @@ LIST *rp;
 	nd_gr_postproc(f,v,m,ord,do_check,rp);
 }
 
+void Pnd_gr_recompute_trace(arg,rp)
+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);
+}
+
 void Pnd_weyl_gr_postproc(arg,rp)
 NODE arg;
 LIST *rp;
@@ -2276,8 +2303,8 @@ 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;
@@ -2291,8 +2318,10 @@ 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;
 }
 
@@ -2632,6 +2661,7 @@ NODE arg;
 VECT *rp;
 {
 	VECT v;
+	NODE node;
 	int i,n;
 
 	if ( !arg )
@@ -2641,8 +2671,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));
@@ -2691,6 +2730,29 @@ void Pdp_mono_raddec(NODE arg,LIST *rp)
 		}
 		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);
 }
 
 LIST remove_zero_from_list(LIST l)