=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.82 retrieving revision 1.90 diff -u -p -r1.82 -r1.90 --- OpenXM_contrib2/asir2000/builtin/dp.c 2010/05/01 02:17:49 1.82 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2013/09/09 09:47:09 1.90 @@ -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.81 2010/04/16 07:13:42 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.89 2013/09/09 07:29:25 noro Exp $ */ #include "ca.h" #include "base.h" @@ -96,8 +96,9 @@ 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(), Pnd_btog(); 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(); @@ -107,11 +108,13 @@ 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(); void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo, int *modular,struct order_spec **ord); +NODE dp_inv_or_split(NODE gb,DP f,struct order_spec *spec, DP *inv); LIST remove_zero_from_list(LIST); @@ -162,10 +165,15 @@ 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}, +#if 0 + {"nd_gr_recompute_trace",Pnd_gr_recompute_trace,5}, +#endif + {"nd_btog",Pnd_btog,-6}, {"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}, {"nd_nf",Pnd_nf,5}, + {"nd_weyl_nf",Pnd_weyl_nf,5}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -267,6 +275,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} }; @@ -2132,8 +2141,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; @@ -2147,8 +2156,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) @@ -2156,8 +2167,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; @@ -2171,8 +2182,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) @@ -2198,6 +2211,56 @@ LIST *rp; nd_gr_postproc(f,v,m,ord,do_check,rp); } +#if 0 +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); +} +#endif + +Obj nd_btog_one(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,int pos); +Obj nd_btog(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist); + +void Pnd_btog(arg,rp) +NODE arg; +Obj *rp; +{ + LIST f,v,tlist; + int m,ac,pos; + struct order_spec *ord; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"nd_btog"); + asir_assert(ARG1(arg),O_LIST,"nd_btog"); + asir_assert(ARG2(arg),O_N,"nd_btog"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + tlist = (LIST)ARG4(arg); + if ( (ac = argc(arg)) == 6 ) { + asir_assert(ARG5(arg),O_N,"nd_btog"); + pos = QTOS((Q)ARG5(arg)); + *rp = nd_btog_one(f,v,m,ord,tlist,pos); + } else if ( ac == 5 ) + *rp = nd_btog(f,v,m,ord,tlist); + else + error("nd_btog : argument mismatch"); +} + void Pnd_weyl_gr_postproc(arg,rp) NODE arg; LIST *rp; @@ -2275,8 +2338,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; @@ -2290,8 +2353,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; } @@ -2320,20 +2385,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; @@ -2343,6 +2405,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) @@ -2614,6 +2696,7 @@ NODE arg; VECT *rp; { VECT v; + NODE node; int i,n; if ( !arg ) @@ -2623,8 +2706,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)); @@ -2673,6 +2765,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)