=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.54 retrieving revision 1.72 diff -u -p -r1.54 -r1.72 --- OpenXM_contrib2/asir2000/builtin/dp.c 2004/05/31 00:38:44 1.54 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2007/09/19 05:42:59 1.72 @@ -6,8 +6,7 @@ * non-exclusive and royalty-free license to use, copy, modify and * redistribute, solely for non-commercial and non-profit purposes, the * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and - * conditions of this Agreement. For the avoidance of doubt, you acquire - * only a limited right to use the SOFTWARE hereunder, and FLL or any + * conditions of this Agreement. For the avoidance of doubt, you acquire * only a limited right to use the SOFTWARE hereunder, and FLL or any * third party developer retains all rights, including but not limited to * copyrights, in and to the SOFTWARE. * @@ -45,12 +44,13 @@ * 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.53 2004/05/14 09:20:56 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.71 2007/09/17 12:47:45 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; @@ -61,19 +61,20 @@ int do_weyl; void Pdp_sort(); void Pdp_mul_trunc(),Pdp_quo(); -void Pdp_ord(), Pdp_ptod(), Pdp_dtop(); +void Pdp_ord(), Pdp_ptod(), Pdp_dtop(), Phomogenize(); 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(); +void Pdp_nf(),Pdp_true_nf(),Pdp_true_nf_marked(),Pdp_true_nf_marked_mod(); 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(),Pdp_gr_f_main(); void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags(); +void Pdp_interreduce(); 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(), Pdp_nf_tab_f(); @@ -89,14 +90,19 @@ void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_wey 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_set_weight(),Pdp_set_top_weight(); void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdp_lnf_f(); -void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(); +void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace(); +void Pnd_gr_postproc(); void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); void Pnd_nf(); void Pdp_initial_term(); void Pdp_order(); +void Pdp_inv_or_split(); +void Pdp_compute_last_w(); +void Pdp_compute_essential_df(); +void Pdp_get_denomlist(); LIST dp_initial_term(); LIST dp_order(); @@ -130,6 +136,8 @@ struct ftab dp_tab[] = { {"dp_nf",Pdp_nf,4}, {"dp_nf_f",Pdp_nf_f,4}, {"dp_true_nf",Pdp_true_nf,4}, + {"dp_true_nf_marked",Pdp_true_nf_marked,4}, + {"dp_true_nf_marked_mod",Pdp_true_nf_marked_mod,5}, {"dp_nf_mod",Pdp_nf_mod,5}, {"dp_true_nf_mod",Pdp_true_nf_mod,5}, {"dp_lnf_mod",Pdp_lnf_mod,3}, @@ -139,12 +147,15 @@ struct ftab dp_tab[] = { /* Buchberger algorithm */ {"dp_gr_main",Pdp_gr_main,-5}, + {"dp_interreduce",Pdp_interreduce,3}, {"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_f4_trace",Pnd_f4_trace,5}, + {"nd_gr_postproc",Pnd_gr_postproc,5}, {"nd_weyl_gr",Pnd_weyl_gr,4}, {"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5}, {"nd_nf",Pnd_nf,5}, @@ -179,8 +190,12 @@ struct ftab dp_tab[] = { {"dp_weyl_f4_mod_main",Pdp_weyl_f4_mod_main,4}, /* misc */ + {"dp_inv_or_split",Pdp_inv_or_split,3}, {"dp_set_weight",Pdp_set_weight,-1}, + {"dp_set_top_weight",Pdp_set_top_weight,-1}, {"dp_weyl_set_weight",Pdp_weyl_set_weight,-1}, + + {"dp_get_denomlist",Pdp_get_denomlist,0}, {0,0,0}, }; @@ -195,6 +210,7 @@ struct ftab dp_supp_tab[] = { {"dp_gr_print",Pdp_gr_print,-1}, /* converters */ + {"homogenize",Phomogenize,3}, {"dp_ptod",Pdp_ptod,-2}, {"dp_dtop",Pdp_dtop,2}, {"dp_homo",Pdp_homo,1}, @@ -238,10 +254,95 @@ struct ftab dp_supp_tab[] = { {"dp_idiv",Pdp_idiv,2}, {"dp_tdiv",Pdp_tdiv,2}, {"dp_minp",Pdp_minp,2}, + {"dp_compute_last_w",Pdp_compute_last_w,5}, + {"dp_compute_essential_df",Pdp_compute_essential_df,2}, {0,0,0} }; +NODE compute_last_w(NODE g,NODE gh,int n,int **v,int row1,int **m1,int row2,int **m2); + +void Pdp_compute_last_w(NODE arg,LIST *rp) +{ + NODE g,gh,r; + VECT w,rv; + LIST l; + MAT w1,w2; + int row1,row2,i,j,n; + int *v; + int **m1,**m2; + Q q; + + g = (NODE)BDY((LIST)ARG0(arg)); + gh = (NODE)BDY((LIST)ARG1(arg)); + w = (VECT)ARG2(arg); + w1 = (MAT)ARG3(arg); + w2 = (MAT)ARG4(arg); + n = w1->col; + row1 = w1->row; + row2 = w2->row; + if ( w ) { + v = W_ALLOC(n); + for ( i = 0; i < n; i++ ) v[i] = QTOS((Q)w->body[i]); + } else v = 0; + m1 = almat(row1,n); + for ( i = 0; i < row1; i++ ) + for ( j = 0; j < n; j++ ) m1[i][j] = QTOS((Q)w1->body[i][j]); + m2 = almat(row2,n); + for ( i = 0; i < row2; i++ ) + for ( j = 0; j < n; j++ ) m2[i][j] = QTOS((Q)w2->body[i][j]); + r = compute_last_w(g,gh,n,&v,row1,m1,row2,m2); + if ( !r ) *rp = 0; + else { + MKVECT(rv,n); + for ( i = 0; i < n; i++ ) { + STOQ(v[i],q); rv->body[i] = (pointer)q; + } + MKLIST(l,r); + r = mknode(2,rv,l); + MKLIST(*rp,r); + } +} + +NODE compute_essential_df(DP *g,DP *gh,int n); + +void Pdp_compute_essential_df(NODE arg,LIST *rp) +{ + VECT g,gh; + NODE r; + + g = (VECT)ARG0(arg); + gh = (VECT)ARG1(arg); + r = (NODE)compute_essential_df((DP *)BDY(g),(DP *)BDY(gh),g->len); + MKLIST(*rp,r); +} + +void Pdp_inv_or_split(arg,rp) +NODE arg; +Obj *rp; +{ + NODE gb,newgb; + DP f,inv; + struct order_spec *spec; + LIST list; + + do_weyl = 0; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_inv_or_split"); + asir_assert(ARG1(arg),O_DP,"dp_inv_or_split"); + if ( !create_order_spec(0,(Obj)ARG2(arg),&spec) ) + error("dp_inv_or_split : invalid order specification"); + gb = BDY((LIST)ARG0(arg)); + f = (DP)ARG1(arg); + newgb = (NODE)dp_inv_or_split(gb,f,spec,&inv); + if ( !newgb ) { + /* invertible */ + *rp = (Obj)inv; + } else { + MKLIST(list,newgb); + *rp = (Obj)list; + } +} + void Pdp_sort(arg,rp) NODE arg; DP *rp; @@ -439,7 +540,7 @@ Obj *rp; int modular; f.id = O_LIST; f.body = 0; - if ( !arg ) + if ( !arg && !current_option ) *rp = dp_current_spec->obj; else { if ( current_option ) @@ -491,6 +592,43 @@ DP *rp; ptod(CO,vl,p,rp); } +void Phomogenize(arg,rp) +NODE arg; +P *rp; +{ + P p; + DP d,h; + NODE n; + V hv; + VL vl,tvl,last; + struct oLIST f; + LIST v; + + asir_assert(ARG0(arg),O_P,"homogenize"); + p = (P)ARG0(arg); + asir_assert(ARG1(arg),O_LIST,"homogenize"); + v = (LIST)ARG1(arg); + asir_assert(ARG2(arg),O_P,"homogenize"); + hv = VR((P)ARG2(arg)); + for ( vl = 0, n = BDY(v); n; n = NEXT(n) ) { + if ( !vl ) { + NEWVL(vl); tvl = vl; + } else { + NEWVL(NEXT(tvl)); tvl = NEXT(tvl); + } + VR(tvl) = VR((P)BDY(n)); + } + if ( vl ) { + last = tvl; + NEXT(tvl) = 0; + } + ptod(CO,vl,p,&d); + dp_homo(d,&h); + NEWVL(NEXT(last)); last = NEXT(last); + VR(last) = hv; NEXT(last) = 0; + dtop(CO,vl,h,rp); +} + void Pdp_ltod(arg,rp) NODE arg; DPV *rp; @@ -566,10 +704,42 @@ extern LIST Dist; void Pdp_ptozp(arg,rp) NODE arg; -DP *rp; +Obj *rp; { + Q t; + NODE tt,p; + NODE n,n0; + char *key; + DP pp; + LIST list; + int get_factor=0; + asir_assert(ARG0(arg),O_DP,"dp_ptozp"); - dp_ptozp((DP)ARG0(arg),rp); + + /* analyze the option */ + if ( current_option ) { + for ( tt = current_option; tt; tt = NEXT(tt) ) { + p = BDY((LIST)BDY(tt)); + key = BDY((STRING)BDY(p)); + /* value = (Obj)BDY(NEXT(p)); */ + if ( !strcmp(key,"factor") ) get_factor=1; + else { + error("ptozp: unknown option."); + } + } + } + + dp_ptozp3((DP)ARG0(arg),&t,&pp); + + /* printexpr(NULL,t); */ + /* if the option factor is given, then it returns the answer + in the format [zpoly, num] where num*zpoly is equal to the argument.*/ + if (get_factor) { + n0 = mknode(2,pp,t); + MKLIST(list,n0); + *rp = (Obj)list; + } else + *rp = (Obj)pp; } void Pdp_ptozp2(arg,rp) @@ -634,7 +804,7 @@ DP *rp; DP g; int full; - do_weyl = 0; + do_weyl = 0; dp_fcoeffs = 0; asir_assert(ARG0(arg),O_LIST,"dp_nf"); asir_assert(ARG1(arg),O_DP,"dp_nf"); asir_assert(ARG2(arg),O_VECT,"dp_nf"); @@ -759,7 +929,7 @@ LIST *rp; P dn; int full; - do_weyl = 0; + do_weyl = 0; dp_fcoeffs = 0; asir_assert(ARG0(arg),O_LIST,"dp_true_nf"); asir_assert(ARG1(arg),O_DP,"dp_true_nf"); asir_assert(ARG2(arg),O_VECT,"dp_true_nf"); @@ -776,6 +946,65 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } +void Pdp_true_nf_marked(arg,rp) +NODE arg; +LIST *rp; +{ + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + Q cont; + P dn; + int full; + + do_weyl = 0; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_true_nf_marked"); + asir_assert(ARG1(arg),O_DP,"dp_true_nf_marked"); + asir_assert(ARG2(arg),O_VECT,"dp_true_nf_marked"); + asir_assert(ARG3(arg),O_VECT,"dp_true_nf_marked"); + if ( !(g = (DP)ARG1(arg)) ) { + nm = 0; dn = (P)ONE; + } else { + b = BDY((LIST)ARG0(arg)); + ps = (DP *)BDY((VECT)ARG2(arg)); + hps = (DP *)BDY((VECT)ARG3(arg)); + dp_true_nf_marked(b,g,ps,hps,&nm,&cont,&dn); + } + n = mknode(3,nm,cont,dn); + MKLIST(*rp,n); +} + +void Pdp_true_nf_marked_mod(arg,rp) +NODE arg; +LIST *rp; +{ + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + P dn; + int mod; + + do_weyl = 0; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_true_nf_marked_mod"); + asir_assert(ARG1(arg),O_DP,"dp_true_nf_marked_mod"); + asir_assert(ARG2(arg),O_VECT,"dp_true_nf_marked_mod"); + asir_assert(ARG3(arg),O_VECT,"dp_true_nf_marked_mod"); + asir_assert(ARG4(arg),O_N,"dp_true_nf_marked_mod"); + if ( !(g = (DP)ARG1(arg)) ) { + nm = 0; dn = (P)ONE; + } else { + b = BDY((LIST)ARG0(arg)); + ps = (DP *)BDY((VECT)ARG2(arg)); + hps = (DP *)BDY((VECT)ARG3(arg)); + mod = QTOS((Q)ARG4(arg)); + dp_true_nf_marked_mod(b,g,ps,hps,mod,&nm,&dn); + } + n = mknode(2,nm,dn); + MKLIST(*rp,n); +} + void Pdp_weyl_nf_mod(arg,rp) NODE arg; DP *rp; @@ -1621,6 +1850,30 @@ LIST *rp; dp_gr_main(f,v,homo,modular,0,ord,rp); } +void Pdp_interreduce(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + VL vl; + int ac; + struct order_spec *ord; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"dp_interreduce"); + f = (LIST)ARG0(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + if ( (ac = argc(arg)) == 3 ) { + asir_assert(ARG1(arg),O_LIST,"dp_interreduce"); + v = (LIST)ARG1(arg); + create_order_spec(0,ARG2(arg),&ord); + } + dp_interreduce(f,v,0,ord,rp); +} + void Pdp_gr_f_main(arg,rp) NODE arg; LIST *rp; @@ -1798,6 +2051,29 @@ LIST *rp; nd_gr(f,v,m,0,ord,rp); } +void Pnd_gr_postproc(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + int m,do_check; + 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(0,ARG3(arg),&ord); + do_check = ARG4(arg) ? 1 : 0; + nd_gr_postproc(f,v,m,ord,do_check,rp); +} + void Pnd_gr_trace(arg,rp) NODE arg; LIST *rp; @@ -1819,9 +2095,33 @@ LIST *rp; homo = QTOS((Q)ARG2(arg)); m = QTOS((Q)ARG3(arg)); create_order_spec(0,ARG4(arg),&ord); - nd_gr_trace(f,v,m,homo,ord,rp); + nd_gr_trace(f,v,m,homo,0,ord,rp); } +void Pnd_f4_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(0,ARG4(arg),&ord); + nd_gr_trace(f,v,m,homo,1,ord,rp); +} + void Pnd_weyl_gr(arg,rp) NODE arg; LIST *rp; @@ -1865,7 +2165,7 @@ LIST *rp; homo = QTOS((Q)ARG2(arg)); m = QTOS((Q)ARG3(arg)); create_order_spec(0,ARG4(arg),&ord); - nd_gr_trace(f,v,m,homo,ord,rp); + nd_gr_trace(f,v,m,homo,0,ord,rp); } void Pnd_nf(arg,rp) @@ -2030,7 +2330,7 @@ LIST *rp; do_weyl = 0; } -static VECT current_dl_weight_vector_obj; +VECT current_dl_weight_vector_obj; int *current_dl_weight_vector; void Pdp_set_weight(arg,rp) @@ -2066,6 +2366,54 @@ VECT *rp; current_dl_weight_vector[i] = QTOS((Q)v->body[i]); *rp = v; } +} + +VECT current_top_weight_vector_obj; +N *current_top_weight_vector; + +void Pdp_set_top_weight(arg,rp) +NODE arg; +VECT *rp; +{ + VECT v; + int i,n; + NODE node; + + if ( !arg ) + *rp = current_top_weight_vector_obj; + else if ( !ARG0(arg) ) { + current_top_weight_vector = 0; + current_top_weight_vector_obj = 0; + *rp = 0; + } else { + if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) + error("dp_set_top_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); + } + for ( i = 0; i < v->len; i++ ) + if ( !INT(BDY(v)[i]) || SGN((Q)BDY(v)[i]) < 0 ) + error("dp_set_top_weight : each element must be a non-negative integer"); + current_top_weight_vector_obj = v; + current_top_weight_vector = (N *)MALLOC(v->len*sizeof(N)); + for ( i = 0; i < v->len; i++ ) { + current_top_weight_vector[i] = NM((Q)BDY(v)[i]); + } + *rp = current_top_weight_vector_obj; + } +} + +LIST get_denomlist(); + +void Pdp_get_denomlist(LIST *rp) +{ + *rp = get_denomlist(); } static VECT current_weyl_weight_vector_obj;