===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.81
retrieving revision 1.83
diff -u -p -r1.81 -r1.83
--- OpenXM_contrib2/asir2000/builtin/dp.c	2010/04/16 07:13:42	1.81
+++ OpenXM_contrib2/asir2000/builtin/dp.c	2010/09/27 05:05:58	1.83
@@ -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.82 2010/05/01 02:17:49 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -97,7 +97,7 @@ 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_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,6 +106,7 @@ void Pdp_compute_last_w();
 void Pdp_compute_essential_df();
 void Pdp_get_denomlist();
 void Pdp_symb_add();
+void Pdp_mono_raddec();
 
 LIST dp_initial_term();
 LIST dp_order();
@@ -165,6 +166,7 @@ struct ftab dp_tab[] = {
 	{"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},
@@ -265,6 +267,7 @@ 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},
 
 	{0,0,0}
 };
@@ -2318,20 +2321,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,6 +2341,26 @@ 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)
@@ -2629,6 +2649,47 @@ VECT *rp;
 		for ( i = 0; i < n; i++ )
 			current_weyl_weight_vector[i] = QTOS((Q)v->body[i]);
 		*rp = v;
+	}
+}
+
+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);
 	}
 }