=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.12 retrieving revision 1.19 diff -u -p -r1.12 -r1.19 --- OpenXM_contrib2/asir2000/builtin/dp.c 2000/12/11 02:00:40 1.12 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2001/10/01 01:58:02 1.19 @@ -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.11 2000/12/08 08:26:08 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.18 2001/09/19 09:28:16 noro Exp $ */ #include "ca.h" #include "base.h" @@ -69,18 +69,23 @@ 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_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep(); void Pdp_cont(); -void Pdp_weyl_red(),Pdp_weyl_sp(),Pdp_weyl_nf(); -void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(); -void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(); -void Pdp_weyl_mul(); +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(),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_nf_f(),Pdp_weyl_nf_f(); +void Pdp_lnf_f(); struct ftab dp_tab[] = { /* content reduction */ @@ -101,15 +106,18 @@ 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_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}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -118,6 +126,7 @@ struct ftab dp_tab[] = { /* weyl algebra */ /* multiplication */ {"dp_weyl_mul",Pdp_weyl_mul,2}, + {"dp_weyl_mul_mod",Pdp_weyl_mul_mod,3}, /* s-poly */ {"dp_weyl_sp",Pdp_weyl_sp,2}, @@ -127,15 +136,20 @@ 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_weyl_set_weight",Pdp_weyl_set_weight,-1}, {0,0,0}, }; @@ -331,6 +345,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; @@ -483,7 +513,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) @@ -505,10 +535,88 @@ 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; +{ + NODE b; + DP g; + DP *ps; + int mod,full,ac; + NODE n,n0; + + do_weyl = 0; + ac = argc(arg); + asir_assert(ARG0(arg),O_LIST,"dp_nf_mod"); + asir_assert(ARG1(arg),O_DP,"dp_nf_mod"); + asir_assert(ARG2(arg),O_VECT,"dp_nf_mod"); + asir_assert(ARG3(arg),O_N,"dp_nf_mod"); + asir_assert(ARG4(arg),O_N,"dp_nf_mod"); + if ( !(g = (DP)ARG1(arg)) ) { + *rp = 0; return; + } + b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); + full = QTOS((Q)ARG3(arg)); mod = QTOS((Q)ARG4(arg)); + for ( n0 = n = 0; b; b = NEXT(b) ) { + NEXTNODE(n0,n); + BDY(n) = (pointer)QTOS((Q)BDY(b)); + } + if ( n0 ) + NEXT(n) = 0; + dp_nf_mod(n0,g,ps,mod,full,rp); +} + void Pdp_true_nf(arg,rp) NODE arg; LIST *rp; @@ -537,7 +645,7 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_nf_mod(arg,rp) +void Pdp_weyl_nf_mod(arg,rp) NODE arg; DP *rp; { @@ -547,13 +655,12 @@ DP *rp; int mod,full,ac; NODE n,n0; - do_weyl = 0; ac = argc(arg); - asir_assert(ARG0(arg),O_LIST,"dp_nf_mod"); - asir_assert(ARG1(arg),O_DP,"dp_nf_mod"); - asir_assert(ARG2(arg),O_VECT,"dp_nf_mod"); - asir_assert(ARG3(arg),O_N,"dp_nf_mod"); - asir_assert(ARG4(arg),O_N,"dp_nf_mod"); + asir_assert(ARG0(arg),O_LIST,"dp_weyl_nf_mod"); + asir_assert(ARG1(arg),O_DP,"dp_weyl_nf_mod"); + asir_assert(ARG2(arg),O_VECT,"dp_weyl_nf_mod"); + asir_assert(ARG3(arg),O_N,"dp_weyl_nf_mod"); + asir_assert(ARG4(arg),O_N,"dp_weyl_nf_mod"); if ( !(g = (DP)ARG1(arg)) ) { *rp = 0; return; } @@ -565,7 +672,9 @@ DP *rp; } if ( n0 ) NEXT(n) = 0; - dp_nf_mod(n,g,ps,mod,full,rp); + do_weyl = 1; + dp_nf_mod(n0,g,ps,mod,full,rp); + do_weyl = 0; } void Pdp_true_nf_mod(arg,rp) @@ -685,6 +794,7 @@ LIST *rp; NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)r; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } + void Pdp_subd(arg,rp) NODE arg; DP *rp; @@ -710,6 +820,22 @@ DP *rp; do_weyl = 0; } +void Pdp_weyl_mul_mod(arg,rp) +NODE arg; +DP *rp; +{ + DP p1,p2; + Q m; + + p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); m = (Q)ARG2(arg); + asir_assert(p1,O_DP,"dp_weyl_mul_mod"); + asir_assert(p2,O_DP,"dp_mul_mod"); + asir_assert(m,O_N,"dp_mul_mod"); + do_weyl = 1; + mulmd(CO,QTOS(m),p1,p2,rp); + do_weyl = 0; +} + void Pdp_red(arg,rp) NODE arg; LIST *rp; @@ -1125,9 +1251,27 @@ 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; + struct order_spec ord; + + 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); + homo = (Num)ARG2(arg); + create_order_spec(ARG3(arg),&ord); + dp_gr_main(f,v,homo,0,1,&ord,rp); +} + void Pdp_f4_main(arg,rp) NODE arg; LIST *rp; @@ -1152,9 +1296,9 @@ 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)); create_order_spec(ARG3(arg),&ord); dp_f4_mod_main(f,v,m,&ord,rp); @@ -1207,10 +1351,32 @@ 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; + Q m; + int modular; + 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); + 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; @@ -1266,3 +1432,26 @@ LIST *rp; do_weyl = 0; } +static VECT current_weight_vector_obj; +int *current_weight_vector; + +void Pdp_weyl_set_weight(arg,rp) +NODE arg; +VECT *rp; +{ + VECT v; + int i,n; + + if ( !arg ) + *rp = current_weight_vector_obj; + else { + asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight"); + v = (VECT)ARG0(arg); + current_weight_vector_obj = v; + n = v->len; + current_weight_vector = (int *)CALLOC(n,sizeof(int)); + for ( i = 0; i < n; i++ ) + current_weight_vector[i] = QTOS((Q)v->body[i]); + *rp = v; + } +}