=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.13 retrieving revision 1.25 diff -u -p -r1.13 -r1.25 --- OpenXM_contrib2/asir2000/builtin/dp.c 2000/12/13 05:37:30 1.13 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2002/06/06 01:18:05 1.25 @@ -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.12 2000/12/11 02:00:40 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.24 2002/01/28 00:54:41 noro Exp $ */ #include "ca.h" #include "base.h" @@ -69,21 +69,28 @@ 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_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(); +LIST remove_zero_from_list(LIST); + struct ftab dp_tab[] = { /* content reduction */ {"dp_ptozp",Pdp_ptozp,1}, @@ -103,15 +110,19 @@ 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}, + {"dp_gr_checklist",Pdp_gr_checklist,2}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -131,15 +142,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_set_weight",Pdp_set_weight,-1}, + {"dp_weyl_set_weight",Pdp_weyl_set_weight,-1}, {0,0,0}, }; @@ -308,7 +324,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; @@ -335,6 +351,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; @@ -487,7 +519,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) @@ -509,10 +541,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; @@ -523,12 +602,13 @@ DP *rp; int mod,full,ac; NODE n,n0; + do_weyl = 0; ac = argc(arg); - 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"); + 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; } @@ -540,9 +620,7 @@ DP *rp; } if ( n0 ) NEXT(n) = 0; - do_weyl = 1; dp_nf_mod(n0,g,ps,mod,full,rp); - do_weyl = 0; } void Pdp_true_nf(arg,rp) @@ -584,11 +662,11 @@ DP *rp; NODE n,n0; 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; } @@ -855,7 +933,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; @@ -1170,6 +1248,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 ) @@ -1179,9 +1261,31 @@ 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); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + 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; @@ -1193,10 +1297,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; @@ -1206,10 +1334,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); } @@ -1229,7 +1363,13 @@ 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); } @@ -1251,6 +1391,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 ) @@ -1261,10 +1405,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; @@ -1275,6 +1443,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); @@ -1293,6 +1465,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); @@ -1313,10 +1491,85 @@ 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_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; +{ + VECT v; + int i,n; + + if ( !arg ) + *rp = current_weyl_weight_vector_obj; + else { + asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight"); + v = (VECT)ARG0(arg); + current_weyl_weight_vector_obj = v; + n = v->len; + current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int)); + for ( i = 0; i < n; 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; +}