=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.27 retrieving revision 1.40 diff -u -p -r1.27 -r1.40 --- OpenXM_contrib2/asir2000/builtin/dp.c 2003/01/06 01:16:37 1.27 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2003/09/11 09:03:52 1.40 @@ -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.26 2003/01/04 09:06:15 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.39 2003/09/05 13:20:13 noro Exp $ */ #include "ca.h" #include "base.h" @@ -58,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(); @@ -72,7 +74,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(); @@ -87,6 +89,9 @@ 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); @@ -99,6 +104,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}, @@ -114,6 +123,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}, @@ -122,6 +132,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}, @@ -195,6 +211,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}, @@ -377,6 +394,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; @@ -812,6 +838,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; @@ -819,7 +870,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; @@ -1014,6 +1065,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; @@ -1215,19 +1287,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; } @@ -1394,6 +1485,143 @@ 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_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,&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 */