=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -p -r1.76 -r1.77 --- OpenXM_contrib2/asir2000/builtin/dp.c 2009/01/04 05:44:51 1.76 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2009/01/05 02:08:17 1.77 @@ -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.75 2008/01/06 00:36:32 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.76 2009/01/04 05:44:51 noro Exp $ */ #include "ca.h" #include "base.h" @@ -91,7 +91,7 @@ void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_wey void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(),Pdp_weyl_f4_f_main(); void Pdp_weyl_mul(),Pdp_weyl_mul_mod(); void Pdp_weyl_set_weight(); -void Pdp_set_weight(),Pdp_set_top_weight(); +void Pdp_set_weight(),Pdp_set_top_weight(),Pdp_set_module_weight(); void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdp_lnf_f(); void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace(); @@ -196,6 +196,7 @@ struct ftab dp_tab[] = { /* misc */ {"dp_inv_or_split",Pdp_inv_or_split,3}, {"dp_set_weight",Pdp_set_weight,-1}, + {"dp_set_module_weight",Pdp_set_module_weight,-1}, {"dp_set_top_weight",Pdp_set_top_weight,-1}, {"dp_weyl_set_weight",Pdp_weyl_set_weight,-1}, @@ -2443,6 +2444,44 @@ 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]); + *rp = v; + } +} + +VECT current_module_weight_vector_obj; +int *current_module_weight_vector; + +void Pdp_set_module_weight(arg,rp) +NODE arg; +VECT *rp; +{ + VECT v; + int i,n; + NODE node; + + if ( !arg ) + *rp = current_module_weight_vector_obj; + else if ( !ARG0(arg) ) { + current_module_weight_vector_obj = 0; + current_module_weight_vector = 0; + *rp = 0; + } else { + if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) + error("dp_module_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_module_weight_vector_obj = v; + n = v->len; + current_module_weight_vector = (int *)CALLOC(n,sizeof(int)); + for ( i = 0; i < n; i++ ) + current_module_weight_vector[i] = QTOS((Q)v->body[i]); *rp = v; } }