=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.30 retrieving revision 1.34 diff -u -p -r1.30 -r1.34 --- OpenXM_contrib2/asir2000/builtin/dp.c 2003/04/25 01:31:11 1.30 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2003/07/31 02:56:13 1.34 @@ -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.29 2003/04/21 02:49:40 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.33 2003/07/18 10:13:11 noro Exp $ */ #include "ca.h" #include "base.h" @@ -58,6 +58,7 @@ 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(); @@ -88,6 +89,7 @@ void Pdp_weyl_set_weight(); void Pdp_set_weight(); void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdp_lnf_f(); +void Pnd_gr(); LIST remove_zero_from_list(LIST); @@ -100,6 +102,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}, @@ -124,6 +130,7 @@ 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_gr",Pnd_gr,4}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -824,6 +831,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; @@ -831,7 +863,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; @@ -1446,6 +1478,28 @@ LIST *rp; 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; + 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(ARG3(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); } /* for Weyl algebra */