=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.24 retrieving revision 1.45 diff -u -p -r1.24 -r1.45 --- OpenXM_contrib2/asir2000/builtin/dp.c 2002/01/28 00:54:41 1.24 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2003/12/25 08:46:19 1.45 @@ -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.23 2001/11/19 01:40:04 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.44 2003/11/27 07:53:53 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,12 @@ 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(); @@ -73,7 +75,7 @@ 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(),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(); @@ -88,7 +90,12 @@ 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); + struct ftab dp_tab[] = { /* content reduction */ {"dp_ptozp",Pdp_ptozp,1}, @@ -98,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}, @@ -113,6 +124,7 @@ struct ftab dp_tab[] = { {"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}, @@ -121,6 +133,12 @@ struct ftab dp_tab[] = { {"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}, @@ -159,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}, @@ -194,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}, @@ -206,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; @@ -376,6 +403,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; @@ -811,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; @@ -818,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; @@ -1013,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; @@ -1214,19 +1296,41 @@ 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; } @@ -1246,6 +1350,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 ) @@ -1264,16 +1372,43 @@ 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); - dp_gr_main(f,v,homo,0,1,&ord,rp); +#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) @@ -1287,6 +1422,10 @@ 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); } @@ -1324,6 +1463,10 @@ LIST *rp; 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); @@ -1345,6 +1488,10 @@ 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"); @@ -1352,6 +1499,143 @@ LIST *rp; 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(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(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(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,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(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(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) @@ -1369,6 +1653,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 ) @@ -1396,6 +1684,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); create_order_spec(ARG3(arg),&ord); do_weyl = 1; @@ -1413,6 +1705,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); @@ -1431,6 +1727,10 @@ 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); @@ -1453,6 +1753,10 @@ 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"); @@ -1471,6 +1775,7 @@ VECT *rp; { VECT v; int i,n; + NODE node; if ( !arg ) *rp = current_dl_weight_vector_obj; @@ -1479,8 +1784,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)); @@ -1511,5 +1825,49 @@ VECT *rp; 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; +} + +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; } }