=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.15 retrieving revision 1.38 diff -u -p -r1.15 -r1.38 --- OpenXM_contrib2/asir2000/builtin/dp.c 2001/01/11 08:43:21 1.15 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2003/09/04 08:35:08 1.38 @@ -45,13 +45,12 @@ * 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.14 2000/12/14 08:43:47 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.37 2003/08/22 07:12:48 noro Exp $ */ #include "ca.h" #include "base.h" #include "parse.h" -extern int dp_fcoeffs; extern int dp_nelim; extern int dp_order_pair_length; extern struct order_pair *dp_order_pair; @@ -59,9 +58,11 @@ extern struct order_spec dp_current_spec; int do_weyl; +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(); @@ -69,22 +70,30 @@ void Pdp_nf_mod(),Pdp_true_nf_mod(); void Pdp_criB(),Pdp_nelim(); void Pdp_minp(),Pdp_sp_mod(); void Pdp_homo(),Pdp_dehomo(); -void Pdp_gr_mod_main(); +void Pdp_gr_mod_main(),Pdp_gr_f_main(); void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags(); -void Pdp_f4_main(),Pdp_f4_mod_main(); +void Pdp_f4_main(),Pdp_f4_mod_main(),Pdp_f4_f_main(); void Pdp_gr_print(); -void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod(); +void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod(), Pdp_nf_tab_f(); void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep(); void Pdp_cont(); +void Pdp_gr_checklist(); void Pdp_weyl_red(); void Pdp_weyl_sp(); void Pdp_weyl_nf(),Pdp_weyl_nf_mod(); -void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(); -void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(); +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(); 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(); +void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); +LIST remove_zero_from_list(LIST); + struct ftab dp_tab[] = { /* content reduction */ {"dp_ptozp",Pdp_ptozp,1}, @@ -94,6 +103,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}, @@ -104,15 +117,24 @@ struct ftab dp_tab[] = { /* normal form */ {"dp_nf",Pdp_nf,4}, + {"dp_nf_f",Pdp_nf_f,4}, {"dp_true_nf",Pdp_true_nf,4}, {"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}, + {"dp_lnf_f",Pdp_lnf_f,2}, /* Buchberger algorithm */ {"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_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}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -132,16 +154,19 @@ struct ftab dp_tab[] = { /* normal form */ {"dp_weyl_nf",Pdp_weyl_nf,4}, {"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5}, + {"dp_weyl_nf_f",Pdp_weyl_nf_f,4}, /* Buchberger algorithm */ {"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}, /* F4 algorithm */ {"dp_weyl_f4_main",Pdp_weyl_f4_main,3}, {"dp_weyl_f4_mod_main",Pdp_weyl_f4_mod_main,4}, /* misc */ + {"dp_set_weight",Pdp_set_weight,-1}, {"dp_weyl_set_weight",Pdp_weyl_set_weight,-1}, {0,0,0}, }; @@ -183,6 +208,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}, @@ -311,7 +337,7 @@ DP *rp; n = v->len; NEWDL(dl,n); d = dl->d; for ( i = 0, td = 0; i < n; i++ ) { - d[i] = QTOS((Q)(v->body[i])); td += d[i]; + d[i] = QTOS((Q)(v->body[i])); td += MUL_WEIGHT(d[i],i); } dl->td = td; NEWMP(m); m->dl = dl; m->c = (P)ONE; NEXT(m) = 0; @@ -338,6 +364,22 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } +void Pdp_lnf_f(arg,rp) +NODE arg; +LIST *rp; +{ + DP r1,r2; + NODE b,g,n; + + asir_assert(ARG0(arg),O_LIST,"dp_lnf_f"); + asir_assert(ARG1(arg),O_LIST,"dp_lnf_f"); + b = BDY((LIST)ARG0(arg)); g = BDY((LIST)ARG1(arg)); + dp_lnf_f((DP)BDY(b),(DP)BDY(NEXT(b)),g,&r1,&r2); + NEWNODE(n); BDY(n) = (pointer)r1; + NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)r2; + NEXT(NEXT(n)) = 0; MKLIST(*rp,n); +} + void Pdp_nf_tab_mod(arg,rp) NODE arg; DP *rp; @@ -349,6 +391,15 @@ DP *rp; QTOS((Q)ARG2(arg)),rp); } +void Pdp_nf_tab_f(arg,rp) +NODE arg; +DP *rp; +{ + asir_assert(ARG0(arg),O_DP,"dp_nf_tab_f"); + asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_f"); + dp_nf_tab_f((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)),rp); +} + void Pdp_ord(arg,rp) NODE arg; Obj *rp; @@ -490,7 +541,7 @@ DP *rp; } b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); full = (Q)ARG3(arg) ? 1 : 0; - dp_nf_ptozp(b,g,ps,full,DP_Multiple,rp); + dp_nf_z(b,g,ps,full,DP_Multiple,rp); } void Pdp_weyl_nf(arg,rp) @@ -512,10 +563,57 @@ DP *rp; b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); full = (Q)ARG3(arg) ? 1 : 0; do_weyl = 1; - dp_nf_ptozp(b,g,ps,full,DP_Multiple,rp); + dp_nf_z(b,g,ps,full,DP_Multiple,rp); do_weyl = 0; } +/* nf computation using field operations */ + +void Pdp_nf_f(arg,rp) +NODE arg; +DP *rp; +{ + NODE b; + DP *ps; + DP g; + int full; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"dp_nf_f"); + asir_assert(ARG1(arg),O_DP,"dp_nf_f"); + asir_assert(ARG2(arg),O_VECT,"dp_nf_f"); + asir_assert(ARG3(arg),O_N,"dp_nf_f"); + if ( !(g = (DP)ARG1(arg)) ) { + *rp = 0; return; + } + b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); + full = (Q)ARG3(arg) ? 1 : 0; + dp_nf_f(b,g,ps,full,rp); +} + +void Pdp_weyl_nf_f(arg,rp) +NODE arg; +DP *rp; +{ + NODE b; + DP *ps; + DP g; + int full; + + asir_assert(ARG0(arg),O_LIST,"dp_weyl_nf_f"); + asir_assert(ARG1(arg),O_DP,"dp_weyl_nf_f"); + asir_assert(ARG2(arg),O_VECT,"dp_weyl_nf_f"); + asir_assert(ARG3(arg),O_N,"dp_weyl_nf_f"); + if ( !(g = (DP)ARG1(arg)) ) { + *rp = 0; return; + } + b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); + full = (Q)ARG3(arg) ? 1 : 0; + do_weyl = 1; + dp_nf_f(b,g,ps,full,rp); + do_weyl = 0; +} + void Pdp_nf_mod(arg,rp) NODE arg; DP *rp; @@ -737,6 +835,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; @@ -744,7 +867,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; @@ -857,7 +980,7 @@ DP *rp; n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; NEWDL(d,n); for ( i = 0, td = 0; i < n; i++ ) { - d->d[i] = MAX(d1->d[i],d2->d[i]); td += d->d[i]; + d->d[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(d->d[i],i); } d->td = td; NEWMP(m); m->dl = d; m->c = (P)ONE; NEXT(m) = 0; @@ -939,6 +1062,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; @@ -1140,19 +1284,38 @@ 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: default: + DP_Print = 0; DP_PrintShort = 1; + break; + } + } else { + if ( DP_Print ) { + STOQ(1,q); + } else if ( DP_PrintShort ) { + STOQ(2,q); + } else + q = 0; + } *rp = q; } @@ -1172,6 +1335,10 @@ LIST *rp; 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 = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } homo = (Num)ARG2(arg); m = (Q)ARG3(arg); if ( !m ) @@ -1181,9 +1348,54 @@ LIST *rp; else modular = QTOS(m); create_order_spec(ARG4(arg),&ord); - dp_gr_main(f,v,homo,modular,&ord,rp); + dp_gr_main(f,v,homo,modular,0,&ord,rp); } +void Pdp_gr_f_main(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + Num homo; + int m,field,t; + struct order_spec ord; + NODE n; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"dp_gr_f_main"); + asir_assert(ARG1(arg),O_LIST,"dp_gr_f_main"); + asir_assert(ARG2(arg),O_N,"dp_gr_f_main"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + homo = (Num)ARG2(arg); +#if 0 + asir_assert(ARG3(arg),O_N,"dp_gr_f_main"); + m = QTOS((Q)ARG3(arg)); + if ( m ) + error("dp_gr_f_main : trace lifting is not implemented yet"); + create_order_spec(ARG4(arg),&ord); +#else + m = 0; + create_order_spec(ARG3(arg),&ord); +#endif + field = 0; + for ( n = BDY(f); n; n = NEXT(n) ) { + t = get_field_type(BDY(n)); + if ( !t ) + continue; + if ( t < 0 ) + error("dp_gr_f_main : incosistent coefficients"); + if ( !field ) + field = t; + else if ( t != field ) + error("dp_gr_f_main : incosistent coefficients"); + } + dp_gr_main(f,v,homo,m?1:0,field,&ord,rp); +} + void Pdp_f4_main(arg,rp) NODE arg; LIST *rp; @@ -1195,10 +1407,34 @@ LIST *rp; asir_assert(ARG0(arg),O_LIST,"dp_f4_main"); asir_assert(ARG1(arg),O_LIST,"dp_f4_main"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } create_order_spec(ARG2(arg),&ord); dp_f4_main(f,v,&ord,rp); } +/* dp_gr_checklist(list of dp) */ + +void Pdp_gr_checklist(arg,rp) +NODE arg; +LIST *rp; +{ + VECT g; + LIST dp; + NODE r; + int n; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"dp_gr_checklist"); + asir_assert(ARG1(arg),O_N,"dp_gr_checklist"); + n = QTOS((Q)ARG1(arg)); + gbcheck_list(BDY((LIST)ARG0(arg)),n,&g,&dp); + r = mknode(2,g,dp); + MKLIST(*rp,r); +} + void Pdp_f4_mod_main(arg,rp) NODE arg; LIST *rp; @@ -1208,10 +1444,16 @@ LIST *rp; struct order_spec ord; do_weyl = 0; - asir_assert(ARG0(arg),O_LIST,"dp_f4_main"); - asir_assert(ARG1(arg),O_LIST,"dp_f4_main"); - asir_assert(ARG2(arg),O_N,"dp_f4_main"); + asir_assert(ARG0(arg),O_LIST,"dp_f4_mod_main"); + asir_assert(ARG1(arg),O_LIST,"dp_f4_mod_main"); + asir_assert(ARG2(arg),O_N,"dp_f4_mod_main"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = QTOS((Q)ARG2(arg)); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + if ( !m ) + error("dp_f4_mod_main : invalid argument"); create_order_spec(ARG3(arg),&ord); dp_f4_mod_main(f,v,m,&ord,rp); } @@ -1231,11 +1473,108 @@ LIST *rp; asir_assert(ARG2(arg),O_N,"dp_gr_mod_main"); asir_assert(ARG3(arg),O_N,"dp_gr_mod_main"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } 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); } +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(ARG3(arg),&ord); + nd_gr(f,v,m,&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(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(ARG3(arg),&ord); + nd_gr(f,v,m,&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(ARG4(arg),&ord); + nd_gr_trace(f,v,m,homo,&ord,rp); +} /* for Weyl algebra */ void Pdp_weyl_gr_main(arg,rp) @@ -1253,6 +1592,10 @@ LIST *rp; 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 = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } homo = (Num)ARG2(arg); m = (Q)ARG3(arg); if ( !m ) @@ -1263,10 +1606,34 @@ LIST *rp; modular = QTOS(m); create_order_spec(ARG4(arg),&ord); do_weyl = 1; - dp_gr_main(f,v,homo,modular,&ord,rp); + dp_gr_main(f,v,homo,modular,0,&ord,rp); do_weyl = 0; } +void Pdp_weyl_gr_f_main(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + Num homo; + 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 = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + homo = (Num)ARG2(arg); + create_order_spec(ARG3(arg),&ord); + do_weyl = 1; + dp_gr_main(f,v,homo,0,1,&ord,rp); + do_weyl = 0; +} + void Pdp_weyl_f4_main(arg,rp) NODE arg; LIST *rp; @@ -1277,6 +1644,10 @@ LIST *rp; asir_assert(ARG0(arg),O_LIST,"dp_weyl_f4_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_f4_main"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } create_order_spec(ARG2(arg),&ord); do_weyl = 1; dp_f4_main(f,v,&ord,rp); @@ -1295,6 +1666,12 @@ LIST *rp; asir_assert(ARG1(arg),O_LIST,"dp_weyl_f4_main"); asir_assert(ARG2(arg),O_N,"dp_f4_main"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = QTOS((Q)ARG2(arg)); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + if ( !m ) + error("dp_weyl_f4_mod_main : invalid argument"); create_order_spec(ARG3(arg),&ord); do_weyl = 1; dp_f4_mod_main(f,v,m,&ord,rp); @@ -1315,16 +1692,50 @@ LIST *rp; asir_assert(ARG2(arg),O_N,"dp_weyl_gr_mod_main"); asir_assert(ARG3(arg),O_N,"dp_weyl_gr_mod_main"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } 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); do_weyl = 1; dp_gr_mod_main(f,v,homo,m,&ord,rp); do_weyl = 0; } -static VECT current_weight_vector_obj; -int *current_weight_vector; +static VECT current_dl_weight_vector_obj; +int *current_dl_weight_vector; +void Pdp_set_weight(arg,rp) +NODE arg; +VECT *rp; +{ + VECT v; + int i,n; + + if ( !arg ) + *rp = current_dl_weight_vector_obj; + else if ( !ARG0(arg) ) { + current_dl_weight_vector_obj = 0; + current_dl_weight_vector = 0; + *rp = 0; + } else { + asir_assert(ARG0(arg),O_VECT,"dp_set_weight"); + v = (VECT)ARG0(arg); + current_dl_weight_vector_obj = v; + n = v->len; + 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; + } +} + +static VECT current_weyl_weight_vector_obj; +int *current_weyl_weight_vector; + void Pdp_weyl_set_weight(arg,rp) NODE arg; VECT *rp; @@ -1333,15 +1744,59 @@ VECT *rp; int i,n; if ( !arg ) - *rp = current_weight_vector_obj; + *rp = current_weyl_weight_vector_obj; else { asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight"); v = (VECT)ARG0(arg); - current_weight_vector_obj = v; + current_weyl_weight_vector_obj = v; n = v->len; - current_weight_vector = (int *)CALLOC(n,sizeof(int)); + current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int)); for ( i = 0; i < n; i++ ) - current_weight_vector[i] = QTOS((Q)v->body[i]); + current_weyl_weight_vector[i] = QTOS((Q)v->body[i]); *rp = v; + } +} + +LIST remove_zero_from_list(LIST l) +{ + NODE n,r0,r; + LIST rl; + + asir_assert(l,O_LIST,"remove_zero_from_list"); + n = BDY(l); + for ( r0 = 0; n; n = NEXT(n) ) + if ( BDY(n) ) { + NEXTNODE(r0,r); + BDY(r) = BDY(n); + } + if ( r0 ) + NEXT(r) = 0; + MKLIST(rl,r0); + return rl; +} + +int get_field_type(P p) +{ + int type,t; + DCP dc; + + if ( !p ) + return 0; + else if ( NUM(p) ) + return NID((Num)p); + else { + type = 0; + for ( dc = DC(p); dc; dc = NEXT(dc) ) { + t = get_field_type(COEF(dc)); + if ( !t ) + continue; + if ( t < 0 ) + return t; + if ( !type ) + type = t; + else if ( t != type ) + return -1; + } + return type; } }