=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.34 retrieving revision 1.52 diff -u -p -r1.34 -r1.52 --- OpenXM_contrib2/asir2000/builtin/dp.c 2003/07/31 02:56:13 1.34 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2004/05/14 06:02:54 1.52 @@ -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.33 2003/07/18 10:13:11 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.51 2004/04/30 08:25:38 noro Exp $ */ #include "ca.h" #include "base.h" @@ -54,10 +54,12 @@ extern int dp_nelim; extern int dp_order_pair_length; extern struct order_pair *dp_order_pair; -extern struct order_spec dp_current_spec; +extern struct order_spec *dp_current_spec; +extern struct modorder_spec *dp_current_modspec; int do_weyl; +void Pdp_sort(); void Pdp_mul_trunc(),Pdp_quo(); void Pdp_ord(), Pdp_ptod(), Pdp_dtop(); void Pdp_ptozp(), Pdp_ptozp2(), Pdp_red(), Pdp_red2(), Pdp_lcm(), Pdp_redble(); @@ -78,6 +80,7 @@ void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_md void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep(); void Pdp_cont(); void Pdp_gr_checklist(); +void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc(); void Pdp_weyl_red(); void Pdp_weyl_sp(); @@ -89,8 +92,17 @@ void Pdp_weyl_set_weight(); void Pdp_set_weight(); void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdp_lnf_f(); -void Pnd_gr(); +void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(); +void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); +void Pnd_nf(); +void Pdp_initial_term(); +void Pdp_order(); +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); + LIST remove_zero_from_list(LIST); struct ftab dp_tab[] = { @@ -126,11 +138,16 @@ struct ftab dp_tab[] = { {"dp_lnf_f",Pdp_lnf_f,2}, /* Buchberger algorithm */ - {"dp_gr_main",Pdp_gr_main,5}, + {"dp_gr_main",Pdp_gr_main,-5}, {"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_weyl_gr",Pnd_weyl_gr,4}, + {"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5}, + {"nd_nf",Pnd_nf,5}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -153,7 +170,7 @@ struct ftab dp_tab[] = { {"dp_weyl_nf_f",Pdp_weyl_nf_f,4}, /* Buchberger algorithm */ - {"dp_weyl_gr_main",Pdp_weyl_gr_main,5}, + {"dp_weyl_gr_main",Pdp_weyl_gr_main,-5}, {"dp_weyl_gr_mod_main",Pdp_weyl_gr_mod_main,5}, {"dp_weyl_gr_f_main",Pdp_weyl_gr_f_main,4}, @@ -169,7 +186,9 @@ struct ftab dp_tab[] = { struct ftab dp_supp_tab[] = { /* setting flags */ + {"dp_sort",Pdp_sort,1}, {"dp_ord",Pdp_ord,-1}, + {"dpv_ord",Pdpv_ord,-2}, {"dp_set_kara",Pdp_set_kara,-1}, {"dp_nelim",Pdp_nelim,-1}, {"dp_gr_flags",Pdp_gr_flags,-1}, @@ -186,6 +205,7 @@ struct ftab dp_supp_tab[] = { {"dp_mdtod",Pdp_mdtod,1}, {"dp_mod",Pdp_mod,3}, {"dp_rat",Pdp_rat,1}, + {"dp_ltod",Pdp_ltod,2}, /* criteria */ {"dp_cri1",Pdp_cri1,2}, @@ -198,7 +218,12 @@ struct ftab dp_supp_tab[] = { {"dp_hm",Pdp_hm,1}, {"dp_ht",Pdp_ht,1}, {"dp_hc",Pdp_hc,1}, + {"dpv_hm",Pdpv_hm,1}, + {"dpv_ht",Pdpv_ht,1}, + {"dpv_hc",Pdpv_hc,1}, {"dp_rest",Pdp_rest,1}, + {"dp_initial_term",Pdp_initial_term,1}, + {"dp_order",Pdp_order,1}, /* degree and size */ {"dp_td",Pdp_td,1}, @@ -217,6 +242,13 @@ struct ftab dp_supp_tab[] = { {0,0,0} }; +void Pdp_sort(arg,rp) +NODE arg; +DP *rp; +{ + dp_sort((DP)ARG0(arg),rp); +} + void Pdp_mdtod(arg,rp) NODE arg; DP *rp; @@ -400,14 +432,21 @@ void Pdp_ord(arg,rp) NODE arg; Obj *rp; { - struct order_spec spec; - + struct order_spec *spec; + LIST v; + struct oLIST f; + Num homo; + int modular; + + f.id = O_LIST; f.body = 0; if ( !arg ) - *rp = dp_current_spec.obj; - else if ( !create_order_spec((Obj)ARG0(arg),&spec) ) - error("dp_ord : invalid order specification"); + *rp = dp_current_spec->obj; else { - initd(&spec); *rp = spec.obj; + if ( ARG0(arg) && OID(ARG0(arg)) == O_OPTLIST ) + parse_gr_option(&f,BDY((OPTLIST)ARG0(arg)),&v,&homo,&modular,&spec); + else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) ) + error("dp_ord : invalid order specification"); + initd(spec); *rp = spec->obj; } } @@ -433,6 +472,40 @@ DP *rp; ptod(CO,vl,(P)ARG0(arg),rp); } +void Pdp_ltod(arg,rp) +NODE arg; +DPV *rp; +{ + NODE n; + VL vl,tvl; + int sugar,i,len; + DP *e; + NODE nd,t; + + asir_assert(ARG0(arg),O_LIST,"dp_ptod"); + nd = BDY((LIST)ARG0(arg)); + asir_assert(ARG1(arg),O_LIST,"dp_ptod"); + for ( vl = 0, n = BDY((LIST)ARG1(arg)); n; n = NEXT(n) ) { + if ( !vl ) { + NEWVL(vl); tvl = vl; + } else { + NEWVL(NEXT(tvl)); tvl = NEXT(tvl); + } + VR(tvl) = VR((P)BDY(n)); + } + if ( vl ) + NEXT(tvl) = 0; + len = length(nd); + e = (DP *)MALLOC(len*sizeof(DP)); + sugar = 0; + for ( i = 0, t = nd; i < len; i++, t = NEXT(t) ) { + ptod(CO,vl,(P)BDY(t),&e[i]); + if ( e[i] ) + sugar = MAX(sugar,e[i]->sugar); + } + MKDPV(len,e,*rp); +} + void Pdp_dtop(arg,rp) NODE arg; P *rp; @@ -1001,13 +1074,7 @@ DP *rp; MP m,mr; p = (DP)ARG0(arg); asir_assert(p,O_DP,"dp_ht"); - if ( !p ) - *rp = 0; - else { - m = BDY(p); - NEWMP(mr); mr->dl = m->dl; mr->c = (P)ONE; NEXT(mr) = 0; - MKDP(p->nv,mr,*rp); (*rp)->sugar = mr->dl->td; /* XXX */ - } + dp_ht(p,rp); } void Pdp_hc(arg,rp) @@ -1058,6 +1125,62 @@ Q *rp; STOQ(p->sugar,*rp); } +void Pdp_initial_term(arg,rp) +NODE arg; +Obj *rp; +{ + struct order_spec *ord; + Num homo; + int modular,is_list; + LIST v,f,l,initiallist; + NODE n; + + f = (LIST)ARG0(arg); + if ( f && OID(f) == O_LIST ) + is_list = 1; + else { + n = mknode(1,f); MKLIST(l,n); f = l; + is_list = 0; + } + if ( argc(arg) == 2 && OID(ARG1(arg)) == O_OPTLIST ) + parse_gr_option(f,BDY((OPTLIST)ARG1(arg)),&v,&homo,&modular,&ord); + else + ord = dp_current_spec; + initiallist = dp_initial_term(f,ord); + if ( !is_list ) + *rp = (Obj)BDY(BDY(initiallist)); + else + *rp = (Obj)initiallist; +} + +void Pdp_order(arg,rp) +NODE arg; +Obj *rp; +{ + struct order_spec *ord; + Num homo; + int modular,is_list; + LIST v,f,l,ordlist; + NODE n; + + f = (LIST)ARG0(arg); + if ( f && OID(f) == O_LIST ) + is_list = 1; + else { + n = mknode(1,f); MKLIST(l,n); f = l; + is_list = 0; + } + if ( argc(arg) == 2 && OID(ARG1(arg)) == O_OPTLIST ) + parse_gr_option(f,BDY((OPTLIST)ARG1(arg)),&v,&homo,&modular,&ord); + else + ord = dp_current_spec; + ordlist = dp_order(f,ord); + if ( !is_list ) + *rp = (Obj)BDY(BDY(ordlist)); + else + *rp = (Obj)ordlist; +} + void Pdp_set_sugar(arg,rp) NODE arg; Q *rp; @@ -1300,9 +1423,12 @@ Q *rp; case 1: DP_Print = 1; break; - case 2: default: + case 2: DP_Print = 0; DP_PrintShort = 1; break; + default: + DP_Print = s; DP_PrintShort = 0; + break; } } else { if ( DP_Print ) { @@ -1315,36 +1441,148 @@ Q *rp; *rp = q; } +void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo, + int *modular,struct order_spec **ord) +{ + NODE t,p; + Q m; + char *key; + Obj value,dmy; + int ord_is_set = 0; + int modular_is_set = 0; + int homo_is_set = 0; + VL vl,vl0; + LIST vars; + char xiname[BUFSIZ]; + NODE x0,x; + DP d; + P xi; + int nv,i; + + /* extract vars */ + vars = 0; + for ( t = opt; t; t = NEXT(t) ) { + p = BDY((LIST)BDY(t)); + key = BDY((STRING)BDY(p)); + value = (Obj)BDY(NEXT(p)); + if ( !strcmp(key,"v") ) { + /* variable list */ + vars = (LIST)value; + break; + } + } + if ( vars ) { + *v = vars; pltovl(vars,&vl); + } else { + for ( t = BDY(f); t; t = NEXT(t) ) + if ( BDY(t) && OID((Obj)BDY(t))==O_DP ) + break; + if ( t ) { + /* f is DP list */ + /* create dummy var list */ + d = (DP)BDY(t); + nv = NV(d); + for ( i = 0, vl0 = 0, x0 = 0; i < nv; i++ ) { + NEXTVL(vl0,vl); + NEXTNODE(x0,x); + sprintf(xiname,"x%d",i); + makevar(xiname,&xi); + x->body = (pointer)xi; + vl->v = VR((P)xi); + } + if ( vl0 ) { + NEXT(vl) = 0; + NEXT(x) = 0; + } + MKLIST(vars,x0); + *v = vars; + vl = vl0; + } else { + get_vars((Obj)f,&vl); vltopl(vl,v); + } + } + + for ( t = opt; t; t = NEXT(t) ) { + p = BDY((LIST)BDY(t)); + key = BDY((STRING)BDY(p)); + value = (Obj)BDY(NEXT(p)); + if ( !strcmp(key,"v") ) { + /* variable list; ignore */ + } else if ( !strcmp(key,"order") ) { + /* order spec */ + if ( !vl ) + error("parse_gr_option : variables must be specified"); + create_order_spec(vl,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"block") ) { + create_order_spec(0,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"matrix") ) { + create_order_spec(0,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"sugarweight") ) { + /* weight */ + Pdp_set_weight(NEXT(p),&dmy); + } else if ( !strcmp(key,"homo") ) { + *homo = (Num)value; + homo_is_set = 1; + } else if ( !strcmp(key,"trace") ) { + m = (Q)value; + if ( !m ) + *modular = 0; + else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 + && BD(NM(m))[0] >= 0x80000000) ) + error("parse_gr_option : too large modulus"); + else + *modular = QTOS(m); + modular_is_set = 1; + } else + error("parse_gr_option : not implemented"); + } + if ( !ord_is_set ) create_order_spec(0,0,ord); + if ( !modular_is_set ) *modular = 0; + if ( !homo_is_set ) *homo = 0; +} + void Pdp_gr_main(arg,rp) NODE arg; LIST *rp; { LIST f,v; + VL vl; Num homo; Q m; - int modular; - struct order_spec ord; + int modular,ac; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_gr_main"); - asir_assert(ARG1(arg),O_LIST,"dp_gr_main"); - asir_assert(ARG2(arg),O_N,"dp_gr_main"); - asir_assert(ARG3(arg),O_N,"dp_gr_main"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = (LIST)ARG0(arg); f = remove_zero_from_list(f); if ( !BDY(f) ) { *rp = f; return; } - homo = (Num)ARG2(arg); - m = (Q)ARG3(arg); - if ( !m ) - modular = 0; - else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) - error("dp_gr_main : too large modulus"); + if ( argc(arg) == 5 ) { + asir_assert(ARG1(arg),O_LIST,"dp_gr_main"); + asir_assert(ARG2(arg),O_N,"dp_gr_main"); + asir_assert(ARG3(arg),O_N,"dp_gr_main"); + v = (LIST)ARG1(arg); + homo = (Num)ARG2(arg); + m = (Q)ARG3(arg); + if ( !m ) + modular = 0; + else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) + error("dp_gr_main : too large modulus"); + else + modular = QTOS(m); + create_order_spec(0,ARG4(arg),&ord); + } else if ( (ac=argc(arg)) == 2 && OID(ARG1(arg)) == O_OPTLIST ) + parse_gr_option(f,BDY((OPTLIST)ARG1(arg)),&v,&homo,&modular,&ord); + else if ( ac == 1 ) + parse_gr_option(f,0,&v,&homo,&modular,&ord); else - modular = QTOS(m); - create_order_spec(ARG4(arg),&ord); - dp_gr_main(f,v,homo,modular,0,&ord,rp); + error("dp_gr_main : invalid argument"); + dp_gr_main(f,v,homo,modular,0,ord,rp); } void Pdp_gr_f_main(arg,rp) @@ -1354,7 +1592,7 @@ LIST *rp; LIST f,v; Num homo; int m,field,t; - struct order_spec ord; + struct order_spec *ord; NODE n; do_weyl = 0; @@ -1372,10 +1610,10 @@ LIST *rp; m = QTOS((Q)ARG3(arg)); if ( m ) error("dp_gr_f_main : trace lifting is not implemented yet"); - create_order_spec(ARG4(arg),&ord); + create_order_spec(0,ARG4(arg),&ord); #else m = 0; - create_order_spec(ARG3(arg),&ord); + create_order_spec(0,ARG3(arg),&ord); #endif field = 0; for ( n = BDY(f); n; n = NEXT(n) ) { @@ -1389,7 +1627,7 @@ LIST *rp; else if ( t != field ) error("dp_gr_f_main : incosistent coefficients"); } - dp_gr_main(f,v,homo,m?1:0,field,&ord,rp); + dp_gr_main(f,v,homo,m?1:0,field,ord,rp); } void Pdp_f4_main(arg,rp) @@ -1397,7 +1635,7 @@ NODE arg; LIST *rp; { LIST f,v; - struct order_spec ord; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_f4_main"); @@ -1407,8 +1645,8 @@ LIST *rp; if ( !BDY(f) ) { *rp = f; return; } - create_order_spec(ARG2(arg),&ord); - dp_f4_main(f,v,&ord,rp); + create_order_spec(0,ARG2(arg),&ord); + dp_f4_main(f,v,ord,rp); } /* dp_gr_checklist(list of dp) */ @@ -1437,7 +1675,7 @@ LIST *rp; { LIST f,v; int m; - struct order_spec ord; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_f4_mod_main"); @@ -1450,8 +1688,8 @@ LIST *rp; } if ( !m ) error("dp_f4_mod_main : invalid argument"); - create_order_spec(ARG3(arg),&ord); - dp_f4_mod_main(f,v,m,&ord,rp); + create_order_spec(0,ARG3(arg),&ord); + dp_f4_mod_main(f,v,m,ord,rp); } void Pdp_gr_mod_main(arg,rp) @@ -1461,7 +1699,7 @@ LIST *rp; LIST f,v; Num homo; int m; - struct order_spec ord; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_gr_mod_main"); @@ -1476,32 +1714,147 @@ LIST *rp; homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg)); if ( !m ) error("dp_gr_mod_main : invalid argument"); - create_order_spec(ARG4(arg),&ord); - dp_gr_mod_main(f,v,homo,m,&ord,rp); + create_order_spec(0,ARG4(arg),&ord); + dp_gr_mod_main(f,v,homo,m,ord,rp); } +void Pnd_f4(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + int m,homo; + 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); + nd_gr(f,v,m,1,ord,rp); +} + void Pnd_gr(arg,rp) NODE arg; LIST *rp; { LIST f,v; - int m; - struct order_spec ord; + int m,homo; + 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(ARG3(arg),O_N,"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(ARG3(arg),&ord); - nd_gr(f,v,m,&ord,rp); + create_order_spec(0,ARG3(arg),&ord); + nd_gr(f,v,m,0,ord,rp); } +void Pnd_gr_trace(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + int m,homo; + 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); + nd_gr_trace(f,v,m,homo,ord,rp); +} + +void Pnd_weyl_gr(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + int m,homo; + 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; return; + } + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + nd_gr(f,v,m,0,ord,rp); +} + +void Pnd_weyl_gr_trace(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + int m,homo; + 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; 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,ord,rp); +} + +void Pnd_nf(arg,rp) +NODE arg; +P *rp; +{ + P 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); + 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) @@ -1511,29 +1864,38 @@ LIST *rp; LIST f,v; Num homo; Q m; - int modular; - struct order_spec ord; + int modular,ac; + struct order_spec *ord; + asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_main"); - asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main"); - asir_assert(ARG2(arg),O_N,"dp_weyl_gr_main"); - asir_assert(ARG3(arg),O_N,"dp_weyl_gr_main"); - f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = (LIST)ARG0(arg); f = remove_zero_from_list(f); if ( !BDY(f) ) { *rp = f; return; } - homo = (Num)ARG2(arg); - m = (Q)ARG3(arg); - if ( !m ) - modular = 0; - else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) - error("dp_gr_main : too large modulus"); + if ( argc(arg) == 5 ) { + asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main"); + asir_assert(ARG2(arg),O_N,"dp_weyl_gr_main"); + asir_assert(ARG3(arg),O_N,"dp_weyl_gr_main"); + v = (LIST)ARG1(arg); + homo = (Num)ARG2(arg); + m = (Q)ARG3(arg); + if ( !m ) + modular = 0; + else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) + error("dp_weyl_gr_main : too large modulus"); + else + modular = QTOS(m); + create_order_spec(0,ARG4(arg),&ord); + } else if ( (ac=argc(arg)) == 2 && OID(ARG1(arg)) == O_OPTLIST ) + parse_gr_option(f,BDY((OPTLIST)ARG1(arg)),&v,&homo,&modular,&ord); + else if ( ac == 1 ) + parse_gr_option(f,0,&v,&homo,&modular,&ord); else - modular = QTOS(m); - create_order_spec(ARG4(arg),&ord); + error("dp_weyl_gr_main : invalid argument"); do_weyl = 1; - dp_gr_main(f,v,homo,modular,0,&ord,rp); + dp_gr_main(f,v,homo,modular,0,ord,rp); do_weyl = 0; } @@ -1543,7 +1905,7 @@ LIST *rp; { LIST f,v; Num homo; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main"); @@ -1555,9 +1917,9 @@ LIST *rp; *rp = f; return; } homo = (Num)ARG2(arg); - create_order_spec(ARG3(arg),&ord); + create_order_spec(0,ARG3(arg),&ord); do_weyl = 1; - dp_gr_main(f,v,homo,0,1,&ord,rp); + dp_gr_main(f,v,homo,0,1,ord,rp); do_weyl = 0; } @@ -1566,7 +1928,7 @@ NODE arg; LIST *rp; { LIST f,v; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_f4_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_f4_main"); @@ -1575,9 +1937,9 @@ LIST *rp; if ( !BDY(f) ) { *rp = f; return; } - create_order_spec(ARG2(arg),&ord); + create_order_spec(0,ARG2(arg),&ord); do_weyl = 1; - dp_f4_main(f,v,&ord,rp); + dp_f4_main(f,v,ord,rp); do_weyl = 0; } @@ -1587,7 +1949,7 @@ LIST *rp; { LIST f,v; int m; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_f4_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_f4_main"); @@ -1599,9 +1961,9 @@ LIST *rp; } if ( !m ) error("dp_weyl_f4_mod_main : invalid argument"); - create_order_spec(ARG3(arg),&ord); + create_order_spec(0,ARG3(arg),&ord); do_weyl = 1; - dp_f4_mod_main(f,v,m,&ord,rp); + dp_f4_mod_main(f,v,m,ord,rp); do_weyl = 0; } @@ -1612,7 +1974,7 @@ LIST *rp; LIST f,v; Num homo; int m; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_mod_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_mod_main"); @@ -1626,9 +1988,9 @@ LIST *rp; homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg)); if ( !m ) error("dp_weyl_gr_mod_main : invalid argument"); - create_order_spec(ARG4(arg),&ord); + create_order_spec(0,ARG4(arg),&ord); do_weyl = 1; - dp_gr_mod_main(f,v,homo,m,&ord,rp); + dp_gr_mod_main(f,v,homo,m,ord,rp); do_weyl = 0; } @@ -1641,6 +2003,7 @@ VECT *rp; { VECT v; int i,n; + NODE node; if ( !arg ) *rp = current_dl_weight_vector_obj; @@ -1649,8 +2012,17 @@ VECT *rp; current_dl_weight_vector = 0; *rp = 0; } else { - asir_assert(ARG0(arg),O_VECT,"dp_set_weight"); - v = (VECT)ARG0(arg); + if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) + error("dp_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_dl_weight_vector_obj = v; n = v->len; current_dl_weight_vector = (int *)CALLOC(n,sizeof(int)); @@ -1725,5 +2097,126 @@ int get_field_type(P p) return -1; } return type; + } +} + +void Pdpv_ord(NODE arg,Obj *rp) +{ + int ac,id; + LIST shift; + + ac = argc(arg); + if ( ac ) { + id = QTOS((Q)ARG0(arg)); + if ( ac > 1 && ARG1(arg) && OID((Obj)ARG1(arg))==O_LIST ) + shift = (LIST)ARG1(arg); + else + shift = 0; + create_modorder_spec(id,shift,&dp_current_modspec); + } + *rp = dp_current_modspec->obj; +} + +void Pdpv_ht(NODE arg,LIST *rp) +{ + NODE n; + DP ht; + int pos; + DPV p; + Q q; + + asir_assert(ARG0(arg),O_DPV,"dpv_ht"); + p = (DPV)ARG0(arg); + pos = dpv_hp(p); + if ( pos < 0 ) + ht = 0; + else + dp_ht(BDY(p)[pos],&ht); + STOQ(pos,q); + n = mknode(2,q,ht); + MKLIST(*rp,n); +} + +void Pdpv_hm(NODE arg,LIST *rp) +{ + NODE n; + DP ht; + int pos; + DPV p; + Q q; + + asir_assert(ARG0(arg),O_DPV,"dpv_hm"); + p = (DPV)ARG0(arg); + pos = dpv_hp(p); + if ( pos < 0 ) + ht = 0; + else + dp_hm(BDY(p)[pos],&ht); + STOQ(pos,q); + n = mknode(2,q,ht); + MKLIST(*rp,n); +} + +void Pdpv_hc(NODE arg,LIST *rp) +{ + NODE n; + P hc; + int pos; + DPV p; + Q q; + + asir_assert(ARG0(arg),O_DPV,"dpv_hc"); + p = (DPV)ARG0(arg); + pos = dpv_hp(p); + if ( pos < 0 ) + hc = 0; + else + hc = BDY(BDY(p)[pos])->c; + STOQ(pos,q); + n = mknode(2,q,hc); + MKLIST(*rp,n); +} + +int dpv_hp(DPV p) +{ + int len,i,maxp,maxw,w,slen; + int *shift; + DP *e; + + len = p->len; + e = p->body; + slen = dp_current_modspec->len; + shift = dp_current_modspec->degree_shift; + switch ( dp_current_modspec->id ) { + case ORD_REVGRADLEX: + for ( maxp = -1, i = 0; i < len; i++ ) + if ( !e[i] ) continue; + else if ( maxp < 0 ) { + maxw = BDY(e[i])->dl->td+(idl->td+(i= maxw ) { + maxw = w; maxp = i; + } + } + return maxp; + case ORD_GRADLEX: + for ( maxp = -1, i = 0; i < len; i++ ) + if ( !e[i] ) continue; + else if ( maxp < 0 ) { + maxw = BDY(e[i])->dl->td+(idl->td+(i maxw ) { + maxw = w; maxp = i; + } + } + return maxp; + break; + case ORD_LEX: + for ( i = 0; i < len; i++ ) + if ( e[i] ) return i; + return -1; + break; } }