=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.97 retrieving revision 1.103 diff -u -p -r1.97 -r1.103 --- OpenXM_contrib2/asir2000/builtin/dp.c 2016/03/31 07:33:32 1.97 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2017/03/27 09:05:46 1.103 @@ -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.96 2015/09/24 04:43:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.102 2017/02/28 07:06:28 noro Exp $ */ #include "ca.h" #include "base.h" @@ -69,8 +69,10 @@ 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(); + +void Pdp_true_nf_and_quotient(),Pdp_true_nf_and_quotient_mod(); 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(); @@ -88,7 +90,11 @@ void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc void Pdp_weyl_red(); void Pdp_weyl_sp(); + void Pdp_weyl_nf(),Pdp_weyl_nf_mod(); +void Pdp_weyl_true_nf_and_quotient(),Pdp_weyl_true_nf_and_quotient_mod(); +void Pdp_weyl_true_nf_and_quotient_marked(),Pdp_weyl_true_nf_and_quotient_marked_mod(); + void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_weyl_gr_f_main(); void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(),Pdp_weyl_f4_f_main(); void Pdp_weyl_mul(),Pdp_weyl_mul_mod(),Pdp_weyl_act(); @@ -144,15 +150,19 @@ struct ftab dp_tab[] = { /* normal form */ {"dp_nf",Pdp_nf,4}, + {"dp_nf_mod",Pdp_nf_mod,5}, {"dp_nf_f",Pdp_nf_f,4}, + {"dp_true_nf",Pdp_true_nf,4}, - {"dp_true_nf_and_quotient",Pdp_true_nf_and_quotient,4}, + {"dp_true_nf_mod",Pdp_true_nf_mod,5}, {"dp_true_nf_marked",Pdp_true_nf_marked,4}, + {"dp_true_nf_marked_mod",Pdp_true_nf_marked_mod,5}, + + {"dp_true_nf_and_quotient",Pdp_true_nf_and_quotient,3}, + {"dp_true_nf_and_quotient_mod",Pdp_true_nf_and_quotient_mod,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}, + {"dp_lnf_mod",Pdp_lnf_mod,3}, {"dp_nf_tab_f",Pdp_nf_tab_f,2}, {"dp_nf_tab_mod",Pdp_nf_tab_mod,3}, @@ -164,16 +174,16 @@ struct ftab dp_tab[] = { {"dp_gr_mod_main",Pdp_gr_mod_main,5}, {"dp_gr_f_main",Pdp_gr_f_main,4}, {"dp_gr_checklist",Pdp_gr_checklist,2}, - {"nd_f4",Pnd_f4,4}, - {"nd_gr",Pnd_gr,4}, - {"nd_gr_trace",Pnd_gr_trace,5}, - {"nd_f4_trace",Pnd_f4_trace,5}, + {"nd_f4",Pnd_f4,-4}, + {"nd_gr",Pnd_gr,-4}, + {"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_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_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}, @@ -198,6 +208,12 @@ struct ftab dp_tab[] = { {"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5}, {"dp_weyl_nf_f",Pdp_weyl_nf_f,4}, + {"dp_weyl_true_nf_and_quotient",Pdp_weyl_true_nf_and_quotient,3}, + {"dp_weyl_true_nf_and_quotient_mod",Pdp_weyl_true_nf_and_quotient_mod,4}, + {"dp_weyl_true_nf_and_quotient_marked",Pdp_weyl_true_nf_and_quotient_marked,4}, + {"dp_weyl_true_nf_and_quotient_marked_mod",Pdp_weyl_true_nf_and_quotient_marked_mod,5}, + + /* Buchberger algorithm */ {"dp_weyl_gr_main",Pdp_weyl_gr_main,-5}, {"dp_weyl_gr_mod_main",Pdp_weyl_gr_mod_main,5}, @@ -932,36 +948,8 @@ void Pdp_true_nf(NODE arg,LIST *rp) NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -DP *dp_true_nf_and_quotient(NODE b,DP g,DP *ps,DP *rp,P *dnp); +DP *dp_true_nf_and_quotient_marked(NODE b,DP g,DP *ps,DP *hps,DP *rp,P *dnp); -void Pdp_true_nf_and_quotient(NODE arg,LIST *rp) -{ - NODE b,n; - DP *ps; - DP g; - DP nm; - VECT quo; - P dn; - int full; - - do_weyl = 0; dp_fcoeffs = 0; - asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient"); - asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient"); - asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient"); - if ( !(g = (DP)ARG1(arg)) ) { - nm = 0; dn = (P)ONE; - } else { - b = BDY((LIST)ARG0(arg)); - ps = (DP *)BDY((VECT)ARG2(arg)); - NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len; - quo->body = (pointer *)dp_true_nf_and_quotient(b,g,ps,&nm,&dn); - } - n = mknode(3,nm,dn,quo); - MKLIST(*rp,n); -} - -DP *dp_true_nf_and_quotient_marked (NODE b,DP g,DP *ps,DP *hps,DP *rp,P *dnp); - void Pdp_true_nf_and_quotient_marked(NODE arg,LIST *rp) { NODE b,n; @@ -990,6 +978,13 @@ void Pdp_true_nf_and_quotient_marked(NODE arg,LIST *rp MKLIST(*rp,n); } +void Pdp_true_nf_and_quotient(NODE arg,LIST *rp) +{ + NODE narg = mknode(4,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg)); + Pdp_true_nf_and_quotient_marked(narg,rp); +} + + 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(NODE arg,LIST *rp) @@ -1022,6 +1017,12 @@ void Pdp_true_nf_and_quotient_marked_mod(NODE arg,LIST MKLIST(*rp,n); } +void Pdp_true_nf_and_quotient_mod(NODE arg,LIST *rp) +{ + NODE narg = mknode(5,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg),ARG3(arg)); + Pdp_true_nf_and_quotient_marked_mod(narg,rp); +} + void Pdp_true_nf_marked(NODE arg,LIST *rp) { NODE b,n; @@ -1134,6 +1135,78 @@ void Pdp_true_nf_mod(NODE arg,LIST *rp) NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } +void Pdp_weyl_true_nf_and_quotient_marked(NODE arg,LIST *rp) +{ + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + VECT quo; + P dn; + int full; + + do_weyl = 1; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_weyl_true_nf_and_quotient_marked"); + asir_assert(ARG1(arg),O_DP,"dp_weyl_true_nf_and_quotient_marked"); + asir_assert(ARG2(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked"); + asir_assert(ARG3(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked"); + 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)); + NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len; + quo->body = (pointer *)dp_true_nf_and_quotient_marked(b,g,ps,hps,&nm,&dn); + } + n = mknode(3,nm,dn,quo); + MKLIST(*rp,n); +} + +void Pdp_weyl_true_nf_and_quotient(NODE arg,LIST *rp) +{ + NODE narg = mknode(4,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg)); + Pdp_weyl_true_nf_and_quotient_marked(narg,rp); +} + + +void Pdp_weyl_true_nf_and_quotient_marked_mod(NODE arg,LIST *rp) +{ + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + VECT quo; + P dn; + int full,mod; + + do_weyl = 1; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG1(arg),O_DP,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG2(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG3(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG4(arg),O_N,"dp_weyl_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_weyl_true_nf_and_quotient_mod(NODE arg,LIST *rp) +{ + NODE narg = mknode(5,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg),ARG3(arg)); + Pdp_weyl_true_nf_and_quotient_marked_mod(narg,rp); +} + + void Pdp_tdiv(NODE arg,DP *rp) { MP m,mr,mr0; @@ -2028,50 +2101,87 @@ void Pdp_gr_mod_main(NODE arg,LIST *rp) void Pnd_f4(NODE arg,LIST *rp) { LIST f,v; - int m,homo,retdp; + int m,homo,retdp,ac; Obj val; + Q mq; + Num nhomo; + NODE node; struct order_spec *ord; do_weyl = 0; nd_rref2 = 0; - asir_assert(ARG0(arg),O_LIST,"nd_f4"); - asir_assert(ARG1(arg),O_LIST,"nd_f4"); - asir_assert(ARG2(arg),O_N,"nd_f4"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); - f = remove_zero_from_list(f); - if ( !BDY(f) ) { - *rp = f; return; - } - m = QTOS((Q)ARG2(arg)); - create_order_spec(0,ARG3(arg),&ord); - homo = retdp = 0; - if ( get_opt("homo",&val) && val ) homo = 1; - if ( get_opt("dp",&val) && val ) retdp = 1; - if ( get_opt("rref2",&val) && val ) nd_rref2 = 1; + retdp = 0; + if ( (ac = argc(arg)) == 4 ) { + asir_assert(ARG0(arg),O_LIST,"nd_f4"); + asir_assert(ARG1(arg),O_LIST,"nd_f4"); + asir_assert(ARG2(arg),O_N,"nd_f4"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + mq = (Q)ARG2(arg); + if ( mq && (PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30)) ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = QTOS(mq); + create_order_spec(0,ARG3(arg),&ord); + homo = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + if ( get_opt("rref2",&val) && val ) nd_rref2 = 1; + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = QTOS((Q)nhomo); + if ( get_opt("dp",&val) && val ) retdp = 1; + if ( get_opt("rref2",&val) && val ) nd_rref2 = 1; + } else + error("nd_f4 : invalid argument"); nd_gr(f,v,m,homo,retdp,1,ord,rp); } void Pnd_gr(NODE arg,LIST *rp) { LIST f,v; - int m,homo,retdp; + int m,homo,retdp,ac; Obj val; + Q mq; + Num nhomo; + NODE node; struct order_spec *ord; do_weyl = 0; - asir_assert(ARG0(arg),O_LIST,"nd_gr"); - asir_assert(ARG1(arg),O_LIST,"nd_gr"); - asir_assert(ARG2(arg),O_N,"nd_gr"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); - f = remove_zero_from_list(f); - if ( !BDY(f) ) { - *rp = f; return; - } - m = QTOS((Q)ARG2(arg)); - create_order_spec(0,ARG3(arg),&ord); - homo = retdp = 0; - if ( get_opt("homo",&val) && val ) homo = 1; - if ( get_opt("dp",&val) && val ) retdp = 1; + retdp = 0; + if ( (ac=argc(arg)) == 4 ) { + asir_assert(ARG0(arg),O_LIST,"nd_gr"); + asir_assert(ARG1(arg),O_LIST,"nd_gr"); + asir_assert(ARG2(arg),O_N,"nd_gr"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + mq = (Q)ARG2(arg); + if ( mq && (PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30)) ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = QTOS(mq); + create_order_spec(0,ARG3(arg),&ord); + homo = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = QTOS((Q)nhomo); + if ( get_opt("dp",&val) && val ) retdp = 1; + } else + error("nd_gr : invalid argument"); nd_gr(f,v,m,homo,retdp,0,ord,rp); } @@ -2079,6 +2189,9 @@ void Pnd_gr_postproc(NODE arg,LIST *rp) { LIST f,v; int m,do_check; + Q mq; + Obj val; + NODE node; struct order_spec *ord; do_weyl = 0; @@ -2090,7 +2203,13 @@ void Pnd_gr_postproc(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; return; } - m = QTOS((Q)ARG2(arg)); + mq = (Q)ARG2(arg); + if ( mq && (PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30)) ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = QTOS(mq); create_order_spec(0,ARG3(arg),&ord); do_check = ARG4(arg) ? 1 : 0; nd_gr_postproc(f,v,m,ord,do_check,rp); @@ -2165,68 +2284,94 @@ void Pnd_weyl_gr_postproc(NODE arg,LIST *rp) void Pnd_gr_trace(NODE arg,LIST *rp) { LIST f,v; - int m,homo; + int m,homo,ac; + Num nhomo; struct order_spec *ord; do_weyl = 0; - asir_assert(ARG0(arg),O_LIST,"nd_gr_trace"); - asir_assert(ARG1(arg),O_LIST,"nd_gr_trace"); - asir_assert(ARG2(arg),O_N,"nd_gr_trace"); - asir_assert(ARG3(arg),O_N,"nd_gr_trace"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); - f = remove_zero_from_list(f); - if ( !BDY(f) ) { - *rp = f; return; - } - homo = QTOS((Q)ARG2(arg)); - m = QTOS((Q)ARG3(arg)); - create_order_spec(0,ARG4(arg),&ord); + if ( (ac = argc(arg)) == 5 ) { + asir_assert(ARG0(arg),O_LIST,"nd_gr_trace"); + asir_assert(ARG1(arg),O_LIST,"nd_gr_trace"); + asir_assert(ARG2(arg),O_N,"nd_gr_trace"); + asir_assert(ARG3(arg),O_N,"nd_gr_trace"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + homo = QTOS((Q)ARG2(arg)); + m = QTOS((Q)ARG3(arg)); + create_order_spec(0,ARG4(arg),&ord); + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = QTOS((Q)nhomo); + } else + error("nd_gr_trace : invalid argument"); nd_gr_trace(f,v,m,homo,0,ord,rp); } void Pnd_f4_trace(NODE arg,LIST *rp) { LIST f,v; - int m,homo; + int m,homo,ac; + Num nhomo; struct order_spec *ord; do_weyl = 0; - asir_assert(ARG0(arg),O_LIST,"nd_gr_trace"); - asir_assert(ARG1(arg),O_LIST,"nd_gr_trace"); - asir_assert(ARG2(arg),O_N,"nd_gr_trace"); - asir_assert(ARG3(arg),O_N,"nd_gr_trace"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); - f = remove_zero_from_list(f); - if ( !BDY(f) ) { - *rp = f; return; - } - homo = QTOS((Q)ARG2(arg)); - m = QTOS((Q)ARG3(arg)); - create_order_spec(0,ARG4(arg),&ord); + if ( (ac = argc(arg))==5 ) { + asir_assert(ARG0(arg),O_LIST,"nd_f4_trace"); + asir_assert(ARG1(arg),O_LIST,"nd_f4_trace"); + asir_assert(ARG2(arg),O_N,"nd_f4_trace"); + asir_assert(ARG3(arg),O_N,"nd_f4_trace"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + homo = QTOS((Q)ARG2(arg)); + m = QTOS((Q)ARG3(arg)); + create_order_spec(0,ARG4(arg),&ord); + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = QTOS((Q)nhomo); + } else + error("nd_gr_trace : invalid argument"); nd_gr_trace(f,v,m,homo,1,ord,rp); } void Pnd_weyl_gr(NODE arg,LIST *rp) { LIST f,v; - int m,homo,retdp; + int m,homo,retdp,ac; Obj val; + Num nhomo; struct order_spec *ord; do_weyl = 1; - asir_assert(ARG0(arg),O_LIST,"nd_weyl_gr"); - asir_assert(ARG1(arg),O_LIST,"nd_weyl_gr"); - asir_assert(ARG2(arg),O_N,"nd_weyl_gr"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); - f = remove_zero_from_list(f); - if ( !BDY(f) ) { - *rp = f; do_weyl = 0; return; - } - m = QTOS((Q)ARG2(arg)); - create_order_spec(0,ARG3(arg),&ord); - homo = retdp = 0; - if ( get_opt("homo",&val) && val ) homo = 1; - if ( get_opt("dp",&val) && val ) retdp = 1; + retdp = 0; + if ( (ac = argc(arg)) == 4 ) { + asir_assert(ARG0(arg),O_LIST,"nd_weyl_gr"); + asir_assert(ARG1(arg),O_LIST,"nd_weyl_gr"); + asir_assert(ARG2(arg),O_N,"nd_weyl_gr"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; do_weyl = 0; return; + } + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + homo = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = QTOS((Q)nhomo); + if ( get_opt("dp",&val) && val ) retdp = 1; + } else + error("nd_weyl_gr : invalid argument"); nd_gr(f,v,m,homo,retdp,0,ord,rp); do_weyl = 0; } @@ -2234,22 +2379,30 @@ void Pnd_weyl_gr(NODE arg,LIST *rp) void Pnd_weyl_gr_trace(NODE arg,LIST *rp) { LIST f,v; - int m,homo; + int m,homo,ac; + Num nhomo; struct order_spec *ord; do_weyl = 1; - asir_assert(ARG0(arg),O_LIST,"nd_weyl_gr_trace"); - asir_assert(ARG1(arg),O_LIST,"nd_weyl_gr_trace"); - asir_assert(ARG2(arg),O_N,"nd_weyl_gr_trace"); - asir_assert(ARG3(arg),O_N,"nd_weyl_gr_trace"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); - f = remove_zero_from_list(f); - if ( !BDY(f) ) { - *rp = f; do_weyl = 0; return; - } - homo = QTOS((Q)ARG2(arg)); - m = QTOS((Q)ARG3(arg)); - create_order_spec(0,ARG4(arg),&ord); + if ( (ac = argc(arg)) == 5 ) { + asir_assert(ARG0(arg),O_LIST,"nd_weyl_gr_trace"); + asir_assert(ARG1(arg),O_LIST,"nd_weyl_gr_trace"); + asir_assert(ARG2(arg),O_N,"nd_weyl_gr_trace"); + asir_assert(ARG3(arg),O_N,"nd_weyl_gr_trace"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; do_weyl = 0; return; + } + homo = QTOS((Q)ARG2(arg)); + m = QTOS((Q)ARG3(arg)); + create_order_spec(0,ARG4(arg),&ord); + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = QTOS((Q)nhomo); + } else + error("nd_weyl_gr_trace : invalid argument"); nd_gr_trace(f,v,m,homo,0,ord,rp); do_weyl = 0; } @@ -2425,6 +2578,7 @@ void Pdp_weyl_gr_mod_main(NODE arg,LIST *rp) VECT current_dl_weight_vector_obj; int *current_dl_weight_vector; +int dp_negative_weight; void Pdp_set_weight(NODE arg,VECT *rp) { @@ -2437,6 +2591,7 @@ void Pdp_set_weight(NODE arg,VECT *rp) else if ( !ARG0(arg) ) { current_dl_weight_vector_obj = 0; current_dl_weight_vector = 0; + dp_negative_weight = 0; *rp = 0; } else { if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) @@ -2455,6 +2610,12 @@ void Pdp_set_weight(NODE arg,VECT *rp) current_dl_weight_vector = (int *)CALLOC(n,sizeof(int)); for ( i = 0; i < n; i++ ) current_dl_weight_vector[i] = QTOS((Q)v->body[i]); + for ( i = 0; i < n; i++ ) + if ( current_dl_weight_vector[i] < 0 ) break; + if ( i < n ) + dp_negative_weight = 1; + else + dp_negative_weight = 0; *rp = v; } }