===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v
retrieving revision 1.77
retrieving revision 1.83
diff -u -p -r1.77 -r1.83
--- OpenXM_contrib2/asir2000/builtin/dp.c	2009/01/05 02:08:17	1.77
+++ 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.76 2009/01/04 05:44:51 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"
@@ -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();
@@ -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();
@@ -105,6 +105,8 @@ void Pdp_compute_last_t();
 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();
@@ -140,6 +142,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},
@@ -163,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},
@@ -245,6 +249,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},
@@ -262,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}
 };
@@ -1032,6 +1038,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 +1264,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;
@@ -2069,7 +2133,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,homo;
+	int m,find;
+	Obj homo;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2083,7 +2148,8 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
-	nd_gr(f,v,m,1,ord,rp);
+	find = get_opt("homo",&homo);
+	nd_gr(f,v,m,find&&homo,1,ord,rp);
 }
 
 void Pnd_gr(arg,rp)
@@ -2091,7 +2157,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,homo;
+	int m,find;
+	Obj homo;
 	struct order_spec *ord;
 
 	do_weyl = 0;
@@ -2105,7 +2172,8 @@ LIST *rp;
 	}
 	m = QTOS((Q)ARG2(arg));
 	create_order_spec(0,ARG3(arg),&ord);
-	nd_gr(f,v,m,0,ord,rp);
+	find = get_opt("homo",&homo);
+	nd_gr(f,v,m,find&&homo,0,ord,rp);
 }
 
 void Pnd_gr_postproc(arg,rp)
@@ -2146,12 +2214,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)
@@ -2207,7 +2276,8 @@ NODE arg;
 LIST *rp;
 {
 	LIST f,v;
-	int m,homo;
+	int m,find;
+	Obj homo;
 	struct order_spec *ord;
 
 	do_weyl = 1;
@@ -2217,11 +2287,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);
-	nd_gr(f,v,m,0,ord,rp);
+	find = get_opt("homo",&homo);
+	nd_gr(f,v,m,find&&homo,0,ord,rp);
+	do_weyl = 0;
 }
 
 void Pnd_weyl_gr_trace(arg,rp)
@@ -2240,28 +2312,26 @@ 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)
-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;
@@ -2271,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)
@@ -2546,7 +2636,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;
@@ -2558,6 +2652,47 @@ VECT *rp;
 	}
 }
 
+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);
+	}
+}
+
 LIST remove_zero_from_list(LIST l)
 {
 	NODE n,r0,r;
@@ -2722,3 +2857,22 @@ int dpv_hp(DPV p)
 			break;
 	}
 }
+
+int get_opt(char *key0,Obj *r) {
+   NODE tt,p;
+   char *key;
+
+   if ( current_option ) {
+     for ( tt = current_option; tt; tt = NEXT(tt) ) {
+       p = BDY((LIST)BDY(tt));
+       key = BDY((STRING)BDY(p));
+       /*  value = (Obj)BDY(NEXT(p)); */
+       if ( !strcmp(key,key0) )  {
+	     *r = (Obj)BDY(NEXT(p));
+	     return 1;
+	   }
+     }
+   }
+   return 0;
+}
+