=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.108 retrieving revision 1.111 diff -u -p -r1.108 -r1.111 --- OpenXM_contrib2/asir2000/builtin/dp.c 2018/03/29 01:32:50 1.108 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2021/03/24 18:28:07 1.111 @@ -45,7 +45,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.107 2017/09/14 01:34:53 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.110 2020/10/04 03:14:07 noro Exp $ */ #include "ca.h" #include "base.h" @@ -59,7 +59,7 @@ extern struct order_spec *dp_current_spec; extern struct modorder_spec *dp_current_modspec; extern int nd_rref2; -int do_weyl; +extern int do_weyl; void Pdp_sort(); void Pdp_mul_trunc(),Pdp_quo(); @@ -130,6 +130,16 @@ void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo NODE dp_inv_or_split(NODE gb,DP f,struct order_spec *spec, DP *inv); LIST remove_zero_from_list(LIST); +void dtodpm(DP d,int pos,DPM *dp); +void dpm_nf_z(NODE b,DPM g,DPM *ps,int full,int multiple,DPM *rp); +void dpm_nf_f(NODE b,DPM g,DPM *ps,int full,DPM *rp); +void weyl_actd(VL vl,DP p1,DP p2,DP *pr); +void dpm_sp(DPM p1,DPM p2,DPM *rp); +void Psetmod_ff(); +int get_opt(char *key0,Obj *r); +void initdpm(struct order_spec *spec,int type); +void dpm_hm(DPM p,DPM *rp); +void dpm_ht(DPM p,DPM *rp); struct ftab dp_tab[] = { /* content reduction */ @@ -2438,15 +2448,24 @@ Obj nd_btog(LIST f,LIST v,int m,struct order_spec *ord void Pnd_btog(NODE arg,Obj *rp) { LIST f,v,tlist; + Q mq; int m,ac,pos; struct order_spec *ord; + NODE node; + pointer val; 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)); + mq = (Q)ARG2(arg); + if ( mq && (PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<31)) ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = QTOS(mq); create_order_spec(0,ARG3(arg),&ord); tlist = (LIST)ARG4(arg); if ( (ac = argc(arg)) == 6 ) {