=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.28 retrieving revision 1.47 diff -u -p -r1.28 -r1.47 --- OpenXM_contrib2/asir2000/builtin/dp.c 2003/01/15 04:53:03 1.28 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2004/03/09 08:31:47 1.47 @@ -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.27 2003/01/06 01:16:37 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.46 2004/02/03 23:31:57 noro Exp $ */ #include "ca.h" #include "base.h" @@ -54,13 +54,16 @@ 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; 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(); void Pdp_sp(), Pdp_hm(), Pdp_ht(), Pdp_hc(), Pdp_rest(), Pdp_td(), Pdp_sugar(); +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(); @@ -87,6 +90,9 @@ void Pdp_weyl_set_weight(); void Pdp_set_weight(); void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdp_lnf_f(); +void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(); +void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); +void Pnd_nf(); LIST remove_zero_from_list(LIST); @@ -99,6 +105,10 @@ struct ftab dp_tab[] = { {"dp_cont",Pdp_cont,1}, /* polynomial ring */ + /* special operations */ + {"dp_mul_trunc",Pdp_mul_trunc,3}, + {"dp_quo",Pdp_quo,2}, + /* s-poly */ {"dp_sp",Pdp_sp,2}, {"dp_sp_mod",Pdp_sp_mod,3}, @@ -119,10 +129,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}, @@ -161,6 +177,7 @@ struct ftab dp_tab[] = { struct ftab dp_supp_tab[] = { /* setting flags */ + {"dp_sort",Pdp_sort,1}, {"dp_ord",Pdp_ord,-1}, {"dp_set_kara",Pdp_set_kara,-1}, {"dp_nelim",Pdp_nelim,-1}, @@ -196,6 +213,7 @@ struct ftab dp_supp_tab[] = { {"dp_td",Pdp_td,1}, {"dp_mag",Pdp_mag,1}, {"dp_sugar",Pdp_sugar,1}, + {"dp_set_sugar",Pdp_set_sugar,2}, /* misc */ {"dp_mbase",Pdp_mbase,1}, @@ -208,6 +226,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; @@ -391,14 +416,14 @@ void Pdp_ord(arg,rp) NODE arg; Obj *rp; { - struct order_spec spec; + struct order_spec *spec; if ( !arg ) - *rp = dp_current_spec.obj; - else if ( !create_order_spec((Obj)ARG0(arg),&spec) ) + *rp = dp_current_spec->obj; + else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) ) error("dp_ord : invalid order specification"); else { - initd(&spec); *rp = spec.obj; + initd(spec); *rp = spec->obj; } } @@ -822,6 +847,31 @@ DP *rp; dp_subd(p1,p2,rp); } +void Pdp_mul_trunc(arg,rp) +NODE arg; +DP *rp; +{ + DP p1,p2,p; + + p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); p = (DP)ARG2(arg); + asir_assert(p1,O_DP,"dp_mul_trunc"); + asir_assert(p2,O_DP,"dp_mul_trunc"); + asir_assert(p,O_DP,"dp_mul_trunc"); + comm_muld_trunc(CO,p1,p2,BDY(p)->dl,rp); +} + +void Pdp_quo(arg,rp) +NODE arg; +DP *rp; +{ + DP p1,p2; + + p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); + asir_assert(p1,O_DP,"dp_quo"); + asir_assert(p2,O_DP,"dp_quo"); + comm_quod(CO,p1,p2,rp); +} + void Pdp_weyl_mul(arg,rp) NODE arg; DP *rp; @@ -829,7 +879,7 @@ DP *rp; DP p1,p2; p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); - asir_assert(p1,O_DP,"dp_weyl_mul"); asir_assert(p2,O_DP,"dp_mul"); + asir_assert(p1,O_DP,"dp_weyl_mul"); asir_assert(p2,O_DP,"dp_weyl_mul"); do_weyl = 1; muld(CO,p1,p2,rp); do_weyl = 0; @@ -1024,6 +1074,27 @@ Q *rp; STOQ(p->sugar,*rp); } +void Pdp_set_sugar(arg,rp) +NODE arg; +Q *rp; +{ + DP p; + Q q; + int i; + + p = (DP)ARG0(arg); + q = (Q)ARG1(arg); + if ( p && q) { + asir_assert(p,O_DP,"dp_set_sugar"); + asir_assert(q,O_N, "dp_set_sugar"); + i = QTOS(q); + if (p->sugar < i) { + p->sugar = i; + } + } + *rp = 0; +} + void Pdp_cri1(arg,rp) NODE arg; Q *rp; @@ -1225,52 +1296,181 @@ LIST *rp; dp_make_flaglist(rp); } -extern int DP_Print; +extern int DP_Print, DP_PrintShort; void Pdp_gr_print(arg,rp) NODE arg; Q *rp; { Q q; + int s; if ( arg ) { asir_assert(ARG0(arg),O_N,"dp_gr_print"); - q = (Q)ARG0(arg); DP_Print = QTOS(q); - } else - STOQ(DP_Print,q); + q = (Q)ARG0(arg); + s = QTOS(q); + switch ( s ) { + case 0: + DP_Print = 0; DP_PrintShort = 0; + break; + case 1: + DP_Print = 1; + break; + case 2: + DP_Print = 0; DP_PrintShort = 1; + break; + default: + DP_Print = s; DP_PrintShort = 0; + break; + } + } else { + if ( DP_Print ) { + STOQ(1,q); + } else if ( DP_PrintShort ) { + STOQ(2,q); + } else + q = 0; + } *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; + } + } + 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 if ( !vars ) { + get_vars((Obj)f,&vl); vltopl(vl,v); + } else { + *v = vars; pltovl(vars,&vl); + } + + 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 */ + create_order_spec(vl,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"block") ) { + create_order_spec(0,value,ord); + } else if ( !strcmp(key,"matrix") ) { + create_order_spec(0,value,ord); + } else if ( !strcmp(key,"sugarweight") ) { + /* weight */ + Pdp_set_weight(NEXT(p),&dmy); + ord_is_set = 1; + } 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"); + f = (LIST)ARG0(arg); 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) @@ -1280,7 +1480,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; @@ -1298,10 +1498,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) ) { @@ -1315,7 +1515,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) @@ -1323,7 +1523,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"); @@ -1333,8 +1533,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) */ @@ -1363,7 +1563,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"); @@ -1376,8 +1576,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) @@ -1387,7 +1587,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"); @@ -1402,10 +1602,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,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,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) @@ -1416,7 +1753,7 @@ LIST *rp; Num homo; Q m; int modular; - 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"); @@ -1435,9 +1772,9 @@ LIST *rp; error("dp_gr_main : too large modulus"); else modular = QTOS(m); - create_order_spec(ARG4(arg),&ord); + create_order_spec(0,ARG4(arg),&ord); 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; } @@ -1447,7 +1784,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"); @@ -1459,9 +1796,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; } @@ -1470,7 +1807,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"); @@ -1479,9 +1816,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; } @@ -1491,7 +1828,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"); @@ -1503,9 +1840,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; } @@ -1516,7 +1853,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"); @@ -1530,9 +1867,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; } @@ -1545,6 +1882,7 @@ VECT *rp; { VECT v; int i,n; + NODE node; if ( !arg ) *rp = current_dl_weight_vector_obj; @@ -1553,8 +1891,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));