=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.53 retrieving revision 1.100 diff -u -p -r1.53 -r1.100 --- OpenXM_contrib2/asir2000/builtin/dp.c 2004/05/14 09:20:56 1.53 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2017/02/27 05:14:53 1.100 @@ -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,35 +44,42 @@ * 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.52 2004/05/14 06:02:54 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.99 2016/12/02 02:12:00 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; extern struct order_spec *dp_current_spec; extern struct modorder_spec *dp_current_modspec; +extern int nd_rref2; 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_true_nf_and_quotient(),Pdp_true_nf_and_quotient_mod(); +void Pdp_true_nf_and_quotient_marked(),Pdp_true_nf_and_quotient_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(); @@ -84,24 +90,40 @@ void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc void Pdp_weyl_red(); void Pdp_weyl_sp(); + void Pdp_weyl_nf(),Pdp_weyl_nf_mod(); +void Pdp_weyl_true_nf_and_quotient(),Pdp_weyl_true_nf_and_quotient_mod(); +void Pdp_weyl_true_nf_and_quotient_marked(),Pdp_weyl_true_nf_and_quotient_marked_mod(); + 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_mul(),Pdp_weyl_mul_mod(),Pdp_weyl_act(); void Pdp_weyl_set_weight(); -void Pdp_set_weight(); +void Pdp_set_weight(),Pdp_set_top_weight(),Pdp_set_module_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(), Pnd_weyl_gr_postproc(); +void Pnd_gr_recompute_trace(), Pnd_btog(); void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); -void Pnd_nf(); +void Pnd_nf(),Pnd_weyl_nf(); void Pdp_initial_term(); void Pdp_order(); +void Pdp_inv_or_split(); +void Pdp_compute_last_t(); +void Pdp_compute_last_w(); +void Pdp_compute_essential_df(); +void Pdp_get_denomlist(); +void Pdp_symb_add(); +void Pdp_mono_raddec(); +void Pdp_mono_reduce(); +void Pdp_rref2(),Psumi_updatepairs(),Psumi_symbolic(); LIST dp_initial_term(); LIST dp_order(); void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo, int *modular,struct order_spec **ord); +NODE dp_inv_or_split(NODE gb,DP f,struct order_spec *spec, DP *inv); LIST remove_zero_from_list(LIST); @@ -128,10 +150,19 @@ struct ftab dp_tab[] = { /* normal form */ {"dp_nf",Pdp_nf,4}, + {"dp_nf_mod",Pdp_nf_mod,5}, {"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_true_nf_marked",Pdp_true_nf_marked,4}, + {"dp_true_nf_marked_mod",Pdp_true_nf_marked_mod,5}, + + {"dp_true_nf_and_quotient",Pdp_true_nf_and_quotient,3}, + {"dp_true_nf_and_quotient_mod",Pdp_true_nf_and_quotient_mod,4}, + {"dp_true_nf_and_quotient_marked",Pdp_true_nf_and_quotient_marked,4}, + {"dp_true_nf_and_quotient_marked_mod",Pdp_true_nf_and_quotient_marked_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}, @@ -139,15 +170,22 @@ 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_gr_recompute_trace",Pnd_gr_recompute_trace,5}, + {"nd_btog",Pnd_btog,-6}, + {"nd_weyl_gr_postproc",Pnd_weyl_gr_postproc,5}, {"nd_weyl_gr",Pnd_weyl_gr,4}, {"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5}, {"nd_nf",Pnd_nf,5}, + {"nd_weyl_nf",Pnd_weyl_nf,5}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -157,6 +195,7 @@ struct ftab dp_tab[] = { /* multiplication */ {"dp_weyl_mul",Pdp_weyl_mul,2}, {"dp_weyl_mul_mod",Pdp_weyl_mul_mod,3}, + {"dp_weyl_act",Pdp_weyl_act,2}, /* s-poly */ {"dp_weyl_sp",Pdp_weyl_sp,2}, @@ -169,6 +208,12 @@ struct ftab dp_tab[] = { {"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5}, {"dp_weyl_nf_f",Pdp_weyl_nf_f,4}, + {"dp_weyl_true_nf_and_quotient",Pdp_weyl_true_nf_and_quotient,3}, + {"dp_weyl_true_nf_and_quotient_mod",Pdp_weyl_true_nf_and_quotient_mod,4}, + {"dp_weyl_true_nf_and_quotient_marked",Pdp_weyl_true_nf_and_quotient_marked,4}, + {"dp_weyl_true_nf_and_quotient_marked_mod",Pdp_weyl_true_nf_and_quotient_marked_mod,5}, + + /* Buchberger algorithm */ {"dp_weyl_gr_main",Pdp_weyl_gr_main,-5}, {"dp_weyl_gr_mod_main",Pdp_weyl_gr_mod_main,5}, @@ -179,8 +224,13 @@ 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_module_weight",Pdp_set_module_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 +245,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}, @@ -224,6 +275,7 @@ struct ftab dp_supp_tab[] = { {"dp_rest",Pdp_rest,1}, {"dp_initial_term",Pdp_initial_term,1}, {"dp_order",Pdp_order,1}, + {"dp_symb_add",Pdp_symb_add,2}, /* degree and size */ {"dp_td",Pdp_td,1}, @@ -238,20 +290,125 @@ 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_last_t",Pdp_compute_last_t,5}, + {"dp_compute_essential_df",Pdp_compute_essential_df,2}, + {"dp_mono_raddec",Pdp_mono_raddec,2}, + {"dp_mono_reduce",Pdp_mono_reduce,2}, + {"dp_rref2",Pdp_rref2,2}, + {"sumi_updatepairs",Psumi_updatepairs,3}, + {"sumi_symbolic",Psumi_symbolic,5}, + {0,0,0} }; -void Pdp_sort(arg,rp) -NODE arg; -DP *rp; +NODE compute_last_w(NODE g,NODE gh,int n,int **v,int row1,int **m1,int row2,int **m2); +Q compute_last_t(NODE g,NODE gh,Q t,VECT w1,VECT w2,NODE *homo,VECT *wp); + +void Pdp_compute_last_t(NODE arg,LIST *rp) { + NODE g,gh,homo,n; + LIST hlist; + VECT v1,v2,w; + Q t; + + g = (NODE)BDY((LIST)ARG0(arg)); + gh = (NODE)BDY((LIST)ARG1(arg)); + t = (Q)ARG2(arg); + v1 = (VECT)ARG3(arg); + v2 = (VECT)ARG4(arg); + t = compute_last_t(g,gh,t,v1,v2,&homo,&w); + MKLIST(hlist,homo); + n = mknode(3,t,w,hlist); + MKLIST(*rp,n); +} + +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(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(NODE arg,DP *rp) +{ dp_sort((DP)ARG0(arg),rp); } -void Pdp_mdtod(arg,rp) -NODE arg; -DP *rp; +void Pdp_mdtod(NODE arg,DP *rp) { MP m,mr,mr0; DP p; @@ -268,9 +425,7 @@ DP *rp; } } -void Pdp_sep(arg,rp) -NODE arg; -VECT *rp; +void Pdp_sep(NODE arg,VECT *rp) { DP p,r; MP m,t; @@ -297,30 +452,22 @@ VECT *rp; } } -void Pdp_idiv(arg,rp) -NODE arg; -DP *rp; +void Pdp_idiv(NODE arg,DP *rp) { dp_idiv((DP)ARG0(arg),(Q)ARG1(arg),rp); } -void Pdp_cont(arg,rp) -NODE arg; -Q *rp; +void Pdp_cont(NODE arg,Q *rp) { dp_cont((DP)ARG0(arg),rp); } -void Pdp_dtov(arg,rp) -NODE arg; -VECT *rp; +void Pdp_dtov(NODE arg,VECT *rp) { dp_dtov((DP)ARG0(arg),rp); } -void Pdp_mbase(arg,rp) -NODE arg; -LIST *rp; +void Pdp_mbase(NODE arg,LIST *rp) { NODE mb; @@ -329,9 +476,7 @@ LIST *rp; MKLIST(*rp,mb); } -void Pdp_etov(arg,rp) -NODE arg; -VECT *rp; +void Pdp_etov(NODE arg,VECT *rp) { DP dp; int n,i; @@ -349,9 +494,7 @@ VECT *rp; *rp = v; } -void Pdp_vtoe(arg,rp) -NODE arg; -DP *rp; +void Pdp_vtoe(NODE arg,DP *rp) { DP dp; DL dl; @@ -373,9 +516,7 @@ DP *rp; *rp = dp; } -void Pdp_lnf_mod(arg,rp) -NODE arg; -LIST *rp; +void Pdp_lnf_mod(NODE arg,LIST *rp) { DP r1,r2; NODE b,g,n; @@ -392,9 +533,7 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_lnf_f(arg,rp) -NODE arg; -LIST *rp; +void Pdp_lnf_f(NODE arg,LIST *rp) { DP r1,r2; NODE b,g,n; @@ -408,9 +547,7 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_nf_tab_mod(arg,rp) -NODE arg; -DP *rp; +void Pdp_nf_tab_mod(NODE arg,DP *rp) { asir_assert(ARG0(arg),O_DP,"dp_nf_tab_mod"); asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_mod"); @@ -419,18 +556,14 @@ DP *rp; QTOS((Q)ARG2(arg)),rp); } -void Pdp_nf_tab_f(arg,rp) -NODE arg; -DP *rp; +void Pdp_nf_tab_f(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; +void Pdp_ord(NODE arg,Obj *rp) { struct order_spec *spec; LIST v; @@ -439,7 +572,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 ) @@ -450,9 +583,7 @@ Obj *rp; } } -void Pdp_ptod(arg,rp) -NODE arg; -DP *rp; +void Pdp_ptod(NODE arg,DP *rp) { P p; NODE n; @@ -471,7 +602,7 @@ DP *rp; if ( current_option ) { f.id = O_LIST; f.body = mknode(1,p); parse_gr_option(&f,current_option,&v,&homo,&modular,&ord); - dp_current_spec = ord; + initd(ord); } else error("dp_ptod : invalid argument"); } else { @@ -491,11 +622,44 @@ DP *rp; ptod(CO,vl,p,rp); } -void Pdp_ltod(arg,rp) -NODE arg; -DPV *rp; +void Phomogenize(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(NODE arg,DPV *rp) +{ + NODE n; VL vl,tvl; LIST f,v; int sugar,i,len,ac,modular; @@ -510,7 +674,7 @@ DPV *rp; if ( ac == 1 ) { if ( current_option ) { parse_gr_option(f,current_option,&v,&homo,&modular,&ord); - dp_current_spec = ord; + initd(ord); } else error("dp_ltod : invalid argument"); } else { @@ -540,9 +704,7 @@ DPV *rp; MKDPV(len,e,*rp); } -void Pdp_dtop(arg,rp) -NODE arg; -P *rp; +void Pdp_dtop(NODE arg,P *rp) { NODE n; VL vl,tvl; @@ -564,17 +726,45 @@ P *rp; extern LIST Dist; -void Pdp_ptozp(arg,rp) -NODE arg; -DP *rp; +void Pdp_ptozp(NODE arg,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) -NODE arg; -LIST *rp; +void Pdp_ptozp2(NODE arg,LIST *rp) { DP p0,p1,h,r; NODE n0; @@ -589,9 +779,7 @@ LIST *rp; MKLIST(*rp,n0); } -void Pdp_prim(arg,rp) -NODE arg; -DP *rp; +void Pdp_prim(NODE arg,DP *rp) { DP t; @@ -599,9 +787,7 @@ DP *rp; dp_prim((DP)ARG0(arg),&t); dp_ptozp(t,rp); } -void Pdp_mod(arg,rp) -NODE arg; -DP *rp; +void Pdp_mod(NODE arg,DP *rp) { DP p; int mod; @@ -615,9 +801,7 @@ DP *rp; dp_mod(p,mod,subst,rp); } -void Pdp_rat(arg,rp) -NODE arg; -DP *rp; +void Pdp_rat(NODE arg,DP *rp) { asir_assert(ARG0(arg),O_DP,"dp_rat"); dp_rat((DP)ARG0(arg),rp); @@ -625,16 +809,14 @@ DP *rp; extern int DP_Multiple; -void Pdp_nf(arg,rp) -NODE arg; -DP *rp; +void Pdp_nf(NODE arg,DP *rp) { NODE b; DP *ps; 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"); @@ -647,9 +829,7 @@ DP *rp; dp_nf_z(b,g,ps,full,DP_Multiple,rp); } -void Pdp_weyl_nf(arg,rp) -NODE arg; -DP *rp; +void Pdp_weyl_nf(NODE arg,DP *rp) { NODE b; DP *ps; @@ -672,9 +852,7 @@ DP *rp; /* nf computation using field operations */ -void Pdp_nf_f(arg,rp) -NODE arg; -DP *rp; +void Pdp_nf_f(NODE arg,DP *rp) { NODE b; DP *ps; @@ -694,9 +872,7 @@ DP *rp; dp_nf_f(b,g,ps,full,rp); } -void Pdp_weyl_nf_f(arg,rp) -NODE arg; -DP *rp; +void Pdp_weyl_nf_f(NODE arg,DP *rp) { NODE b; DP *ps; @@ -717,9 +893,7 @@ DP *rp; do_weyl = 0; } -void Pdp_nf_mod(arg,rp) -NODE arg; -DP *rp; +void Pdp_nf_mod(NODE arg,DP *rp) { NODE b; DP g; @@ -748,9 +922,7 @@ DP *rp; dp_nf_mod(n0,g,ps,mod,full,rp); } -void Pdp_true_nf(arg,rp) -NODE arg; -LIST *rp; +void Pdp_true_nf(NODE arg,LIST *rp) { NODE b,n; DP *ps; @@ -759,7 +931,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,10 +948,138 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_weyl_nf_mod(arg,rp) -NODE arg; -DP *rp; +DP *dp_true_nf_and_quotient_marked(NODE b,DP g,DP *ps,DP *hps,DP *rp,P *dnp); + +void Pdp_true_nf_and_quotient_marked(NODE arg,LIST *rp) { + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + VECT quo; + P dn; + int full; + + do_weyl = 0; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient_marked"); + asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient_marked"); + asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient_marked"); + asir_assert(ARG3(arg),O_VECT,"dp_true_nf_and_quotient_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)); + NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len; + quo->body = (pointer *)dp_true_nf_and_quotient_marked(b,g,ps,hps,&nm,&dn); + } + n = mknode(3,nm,dn,quo); + MKLIST(*rp,n); +} + +void Pdp_true_nf_and_quotient(NODE arg,LIST *rp) +{ + NODE narg = mknode(4,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg)); + Pdp_true_nf_and_quotient_marked(narg,rp); +} + + +DP *dp_true_nf_and_quotient_marked_mod (NODE b,DP g,DP *ps,DP *hps,int mod,DP *rp,P *dnp); + +void Pdp_true_nf_and_quotient_marked_mod(NODE arg,LIST *rp) +{ + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + VECT quo; + P dn; + int full,mod; + + do_weyl = 0; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_true_nf_and_quotient_marked_mod"); + asir_assert(ARG1(arg),O_DP,"dp_true_nf_and_quotient_marked_mod"); + asir_assert(ARG2(arg),O_VECT,"dp_true_nf_and_quotient_marked_mod"); + asir_assert(ARG3(arg),O_VECT,"dp_true_nf_and_quotient_marked_mod"); + asir_assert(ARG4(arg),O_N,"dp_true_nf_and_quotient_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)); + NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len; + quo->body = (pointer *)dp_true_nf_and_quotient_marked_mod(b,g,ps,hps,mod,&nm,&dn); + } + n = mknode(3,nm,dn,quo); + MKLIST(*rp,n); +} + +void Pdp_true_nf_and_quotient_mod(NODE arg,LIST *rp) +{ + NODE narg = mknode(5,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg),ARG3(arg)); + Pdp_true_nf_and_quotient_marked_mod(narg,rp); +} + +void Pdp_true_nf_marked(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(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(NODE arg,DP *rp) +{ NODE b; DP g; DP *ps; @@ -808,9 +1108,7 @@ DP *rp; do_weyl = 0; } -void Pdp_true_nf_mod(arg,rp) -NODE arg; -LIST *rp; +void Pdp_true_nf_mod(NODE arg,LIST *rp) { NODE b; DP g,nm; @@ -837,10 +1135,80 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_tdiv(arg,rp) -NODE arg; -DP *rp; +void Pdp_weyl_true_nf_and_quotient_marked(NODE arg,LIST *rp) { + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + VECT quo; + P dn; + int full; + + do_weyl = 1; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_weyl_true_nf_and_quotient_marked"); + asir_assert(ARG1(arg),O_DP,"dp_weyl_true_nf_and_quotient_marked"); + asir_assert(ARG2(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked"); + asir_assert(ARG3(arg),O_VECT,"dp_weyl_true_nf_and_quotient_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)); + NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len; + quo->body = (pointer *)dp_true_nf_and_quotient_marked(b,g,ps,hps,&nm,&dn); + } + n = mknode(3,nm,dn,quo); + MKLIST(*rp,n); +} + +void Pdp_weyl_true_nf_and_quotient(NODE arg,LIST *rp) +{ + NODE narg = mknode(4,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg)); + Pdp_weyl_true_nf_and_quotient_marked(narg,rp); +} + + +void Pdp_weyl_true_nf_and_quotient_marked_mod(NODE arg,LIST *rp) +{ + NODE b,n; + DP *ps,*hps; + DP g; + DP nm; + VECT quo; + P dn; + int full,mod; + + do_weyl = 1; dp_fcoeffs = 0; + asir_assert(ARG0(arg),O_LIST,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG1(arg),O_DP,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG2(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG3(arg),O_VECT,"dp_weyl_true_nf_and_quotient_marked_mod"); + asir_assert(ARG4(arg),O_N,"dp_weyl_true_nf_and_quotient_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)); + NEWVECT(quo); quo->len = ((VECT)ARG2(arg))->len; + quo->body = (pointer *)dp_true_nf_and_quotient_marked_mod(b,g,ps,hps,mod,&nm,&dn); + } + n = mknode(3,nm,dn,quo); + MKLIST(*rp,n); +} + +void Pdp_weyl_true_nf_and_quotient_mod(NODE arg,LIST *rp) +{ + NODE narg = mknode(5,ARG0(arg),ARG1(arg),ARG2(arg),ARG2(arg),ARG3(arg)); + Pdp_weyl_true_nf_and_quotient_marked_mod(narg,rp); +} + + +void Pdp_tdiv(NODE arg,DP *rp) +{ MP m,mr,mr0; DP p; Q c; @@ -866,9 +1234,7 @@ DP *rp; } } -void Pdp_red_coef(arg,rp) -NODE arg; -DP *rp; +void Pdp_red_coef(NODE arg,DP *rp) { MP m,mr,mr0; P q,r; @@ -894,9 +1260,7 @@ DP *rp; } } -void Pdp_redble(arg,rp) -NODE arg; -Q *rp; +void Pdp_redble(NODE arg,Q *rp) { asir_assert(ARG0(arg),O_DP,"dp_redble"); asir_assert(ARG1(arg),O_DP,"dp_redble"); @@ -906,9 +1270,7 @@ Q *rp; *rp = 0; } -void Pdp_red_mod(arg,rp) -NODE arg; -LIST *rp; +void Pdp_red_mod(NODE arg,LIST *rp) { DP h,r; P dmy; @@ -926,9 +1288,7 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_subd(arg,rp) -NODE arg; -DP *rp; +void Pdp_subd(NODE arg,DP *rp) { DP p1,p2; @@ -938,10 +1298,32 @@ DP *rp; dp_subd(p1,p2,rp); } -void Pdp_mul_trunc(arg,rp) -NODE arg; -DP *rp; +void Pdp_symb_add(NODE arg,DP *rp) { + DP p1,p2,r; + NODE s0; + MP mp0,mp; + int nv; + + p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); + asir_assert(p1,O_DP,"dp_symb_add"); + asir_assert(p2,O_DP,"dp_symb_add"); + if ( !p1 ) { *rp = p2; return; } + else if ( !p2 ) { *rp = p1; return; } + if ( p1->nv != p2->nv ) + error("dp_sumb_add : invalid input"); + nv = p1->nv; + s0 = symb_merge(dp_dllist(p1),dp_dllist(p2),nv); + for ( mp0 = 0; s0; s0 = NEXT(s0) ) { + NEXTMP(mp0,mp); mp->dl = (DL)BDY(s0); mp->c = (P)ONE; + } + NEXT(mp) = 0; + MKDP(nv,mp0,r); r->sugar = MAX(p1->sugar,p2->sugar); + *rp = r; +} + +void Pdp_mul_trunc(NODE arg,DP *rp) +{ DP p1,p2,p; p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); p = (DP)ARG2(arg); @@ -951,9 +1333,7 @@ DP *rp; comm_muld_trunc(CO,p1,p2,BDY(p)->dl,rp); } -void Pdp_quo(arg,rp) -NODE arg; -DP *rp; +void Pdp_quo(NODE arg,DP *rp) { DP p1,p2; @@ -963,9 +1343,7 @@ DP *rp; comm_quod(CO,p1,p2,rp); } -void Pdp_weyl_mul(arg,rp) -NODE arg; -DP *rp; +void Pdp_weyl_mul(NODE arg,DP *rp) { DP p1,p2; @@ -976,11 +1354,19 @@ DP *rp; do_weyl = 0; } -void Pdp_weyl_mul_mod(arg,rp) -NODE arg; -DP *rp; +void Pdp_weyl_act(NODE arg,DP *rp) { DP p1,p2; + + p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); + asir_assert(p1,O_DP,"dp_weyl_act"); asir_assert(p2,O_DP,"dp_weyl_act"); + weyl_actd(CO,p1,p2,rp); +} + + +void Pdp_weyl_mul_mod(NODE arg,DP *rp) +{ + DP p1,p2; Q m; p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); m = (Q)ARG2(arg); @@ -992,9 +1378,7 @@ DP *rp; do_weyl = 0; } -void Pdp_red(arg,rp) -NODE arg; -LIST *rp; +void Pdp_red(NODE arg,LIST *rp) { NODE n; DP head,rest,dmy1; @@ -1010,9 +1394,7 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_weyl_red(arg,rp) -NODE arg; -LIST *rp; +void Pdp_weyl_red(NODE arg,LIST *rp) { NODE n; DP head,rest,dmy1; @@ -1029,9 +1411,7 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void Pdp_sp(arg,rp) -NODE arg; -DP *rp; +void Pdp_sp(NODE arg,DP *rp) { DP p1,p2; @@ -1041,9 +1421,7 @@ DP *rp; dp_sp(p1,p2,rp); } -void Pdp_weyl_sp(arg,rp) -NODE arg; -DP *rp; +void Pdp_weyl_sp(NODE arg,DP *rp) { DP p1,p2; @@ -1054,9 +1432,7 @@ DP *rp; do_weyl = 0; } -void Pdp_sp_mod(arg,rp) -NODE arg; -DP *rp; +void Pdp_sp_mod(NODE arg,DP *rp) { DP p1,p2; int mod; @@ -1069,9 +1445,7 @@ DP *rp; dp_sp_mod(p1,p2,mod,rp); } -void Pdp_lcm(arg,rp) -NODE arg; -DP *rp; +void Pdp_lcm(NODE arg,DP *rp) { int i,n,td; DL d1,d2,d; @@ -1090,9 +1464,7 @@ DP *rp; MKDP(n,m,*rp); (*rp)->sugar = td; /* XXX */ } -void Pdp_hm(arg,rp) -NODE arg; -DP *rp; +void Pdp_hm(NODE arg,DP *rp) { DP p; @@ -1100,9 +1472,7 @@ DP *rp; dp_hm(p,rp); } -void Pdp_ht(arg,rp) -NODE arg; -DP *rp; +void Pdp_ht(NODE arg,DP *rp) { DP p; MP m,mr; @@ -1111,9 +1481,7 @@ DP *rp; dp_ht(p,rp); } -void Pdp_hc(arg,rp) -NODE arg; -P *rp; +void Pdp_hc(NODE arg,P *rp) { asir_assert(ARG0(arg),O_DP,"dp_hc"); if ( !ARG0(arg) ) @@ -1122,9 +1490,7 @@ P *rp; *rp = BDY((DP)ARG0(arg))->c; } -void Pdp_rest(arg,rp) -NODE arg; -DP *rp; +void Pdp_rest(NODE arg,DP *rp) { asir_assert(ARG0(arg),O_DP,"dp_rest"); if ( !ARG0(arg) ) @@ -1133,9 +1499,7 @@ DP *rp; dp_rest((DP)ARG0(arg),rp); } -void Pdp_td(arg,rp) -NODE arg; -Q *rp; +void Pdp_td(NODE arg,Q *rp) { DP p; @@ -1146,9 +1510,7 @@ Q *rp; STOQ(BDY(p)->dl->td,*rp); } -void Pdp_sugar(arg,rp) -NODE arg; -Q *rp; +void Pdp_sugar(NODE arg,Q *rp) { DP p; @@ -1159,9 +1521,7 @@ Q *rp; STOQ(p->sugar,*rp); } -void Pdp_initial_term(arg,rp) -NODE arg; -Obj *rp; +void Pdp_initial_term(NODE arg,Obj *rp) { struct order_spec *ord; Num homo; @@ -1176,9 +1536,10 @@ Obj *rp; n = mknode(1,f); MKLIST(l,n); f = l; is_list = 0; } - if ( current_option ) + if ( current_option ) { parse_gr_option(f,current_option,&v,&homo,&modular,&ord); - else + initd(ord); + } else ord = dp_current_spec; initiallist = dp_initial_term(f,ord); if ( !is_list ) @@ -1187,9 +1548,7 @@ Obj *rp; *rp = (Obj)initiallist; } -void Pdp_order(arg,rp) -NODE arg; -Obj *rp; +void Pdp_order(NODE arg,Obj *rp) { struct order_spec *ord; Num homo; @@ -1204,9 +1563,10 @@ Obj *rp; n = mknode(1,f); MKLIST(l,n); f = l; is_list = 0; } - if ( current_option ) + if ( current_option ) { parse_gr_option(f,current_option,&v,&homo,&modular,&ord); - else + initd(ord); + } else ord = dp_current_spec; ordlist = dp_order(f,ord); if ( !is_list ) @@ -1215,9 +1575,7 @@ Obj *rp; *rp = (Obj)ordlist; } -void Pdp_set_sugar(arg,rp) -NODE arg; -Q *rp; +void Pdp_set_sugar(NODE arg,Q *rp) { DP p; Q q; @@ -1236,9 +1594,7 @@ Q *rp; *rp = 0; } -void Pdp_cri1(arg,rp) -NODE arg; -Q *rp; +void Pdp_cri1(NODE arg,Q *rp) { DP p1,p2; int *d1,*d2; @@ -1253,9 +1609,7 @@ Q *rp; *rp = i == n ? ONE : 0; } -void Pdp_cri2(arg,rp) -NODE arg; -Q *rp; +void Pdp_cri2(NODE arg,Q *rp) { DP p1,p2; int *d1,*d2; @@ -1270,9 +1624,7 @@ Q *rp; *rp = i == n ? ONE : 0; } -void Pdp_minp(arg,rp) -NODE arg; -LIST *rp; +void Pdp_minp(NODE arg,LIST *rp) { NODE tn,tn1,d,dd,dd0,p,tp; LIST l,minp; @@ -1317,9 +1669,7 @@ LIST *rp; MKLIST(l,dd0); MKNODE(tn,l,0); MKNODE(tn1,minp,tn); MKLIST(*rp,tn1); } -void Pdp_criB(arg,rp) -NODE arg; -LIST *rp; +void Pdp_criB(NODE arg,LIST *rp) { NODE d,ij,dd,ddd; int i,j,s,n; @@ -1355,9 +1705,7 @@ LIST *rp; } } -void Pdp_nelim(arg,rp) -NODE arg; -Q *rp; +void Pdp_nelim(NODE arg,Q *rp) { if ( arg ) { asir_assert(ARG0(arg),O_N,"dp_nelim"); @@ -1366,9 +1714,7 @@ Q *rp; STOQ(dp_nelim,*rp); } -void Pdp_mag(arg,rp) -NODE arg; -Q *rp; +void Pdp_mag(NODE arg,Q *rp) { DP p; int s; @@ -1387,9 +1733,7 @@ Q *rp; extern int kara_mag; -void Pdp_set_kara(arg,rp) -NODE arg; -Q *rp; +void Pdp_set_kara(NODE arg,Q *rp) { if ( arg ) { asir_assert(ARG0(arg),O_N,"dp_set_kara"); @@ -1398,25 +1742,19 @@ Q *rp; STOQ(kara_mag,*rp); } -void Pdp_homo(arg,rp) -NODE arg; -DP *rp; +void Pdp_homo(NODE arg,DP *rp) { asir_assert(ARG0(arg),O_DP,"dp_homo"); dp_homo((DP)ARG0(arg),rp); } -void Pdp_dehomo(arg,rp) -NODE arg; -DP *rp; +void Pdp_dehomo(NODE arg,DP *rp) { asir_assert(ARG0(arg),O_DP,"dp_dehomo"); dp_dehomo((DP)ARG0(arg),rp); } -void Pdp_gr_flags(arg,rp) -NODE arg; -LIST *rp; +void Pdp_gr_flags(NODE arg,LIST *rp) { Obj name,value; NODE n; @@ -1439,9 +1777,7 @@ LIST *rp; extern int DP_Print, DP_PrintShort; -void Pdp_gr_print(arg,rp) -NODE arg; -Q *rp; +void Pdp_gr_print(NODE arg,Q *rp) { Q q; int s; @@ -1578,9 +1914,7 @@ void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo if ( !homo_is_set ) *homo = 0; } -void Pdp_gr_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_gr_main(NODE arg,LIST *rp) { LIST f,v; VL vl; @@ -1619,11 +1953,31 @@ LIST *rp; dp_gr_main(f,v,homo,modular,0,ord,rp); } -void Pdp_gr_f_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_interreduce(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(NODE arg,LIST *rp) +{ + LIST f,v; Num homo; int m,field,t; struct order_spec *ord; @@ -1664,9 +2018,7 @@ LIST *rp; dp_gr_main(f,v,homo,m?1:0,field,ord,rp); } -void Pdp_f4_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_f4_main(NODE arg,LIST *rp) { LIST f,v; struct order_spec *ord; @@ -1685,9 +2037,7 @@ LIST *rp; /* dp_gr_checklist(list of dp) */ -void Pdp_gr_checklist(arg,rp) -NODE arg; -LIST *rp; +void Pdp_gr_checklist(NODE arg,LIST *rp) { VECT g; LIST dp; @@ -1703,9 +2053,7 @@ LIST *rp; MKLIST(*rp,r); } -void Pdp_f4_mod_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_f4_mod_main(NODE arg,LIST *rp) { LIST f,v; int m; @@ -1726,9 +2074,7 @@ LIST *rp; dp_f4_mod_main(f,v,m,ord,rp); } -void Pdp_gr_mod_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_gr_mod_main(NODE arg,LIST *rp) { LIST f,v; Num homo; @@ -1752,15 +2098,49 @@ LIST *rp; dp_gr_mod_main(f,v,homo,m,ord,rp); } -void Pnd_f4(arg,rp) -NODE arg; -LIST *rp; +void Pnd_f4(NODE arg,LIST *rp) { LIST f,v; - int m,homo; + int m,homo,retdp; + Obj val; + Q mq; + NODE node; struct order_spec *ord; do_weyl = 0; + nd_rref2 = 0; + asir_assert(ARG0(arg),O_LIST,"nd_f4"); + asir_assert(ARG1(arg),O_LIST,"nd_f4"); + asir_assert(ARG2(arg),O_N,"nd_f4"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + mq = (Q)ARG2(arg); + if ( PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30) ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } + create_order_spec(0,ARG3(arg),&ord); + homo = retdp = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + if ( get_opt("rref2",&val) && val ) nd_rref2 = 1; + nd_gr(f,v,m,homo,retdp,1,ord,rp); +} + +void Pnd_gr(NODE arg,LIST *rp) +{ + LIST f,v; + int m,homo,retdp; + Obj val; + Q mq; + NODE node; + 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"); @@ -1769,17 +2149,23 @@ LIST *rp; if ( !BDY(f) ) { *rp = f; return; } - m = QTOS((Q)ARG2(arg)); + mq = (Q)ARG2(arg); + if ( PL(NM(mq)) > 1 || BD(NM(mq))[0] >= (1<<30) ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } create_order_spec(0,ARG3(arg),&ord); - nd_gr(f,v,m,1,ord,rp); + homo = retdp = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + nd_gr(f,v,m,homo,retdp,0,ord,rp); } -void Pnd_gr(arg,rp) -NODE arg; -LIST *rp; +void Pnd_gr_postproc(NODE arg,LIST *rp) { LIST f,v; - int m,homo; + int m,do_check; struct order_spec *ord; do_weyl = 0; @@ -1793,14 +2179,79 @@ LIST *rp; } m = QTOS((Q)ARG2(arg)); create_order_spec(0,ARG3(arg),&ord); - nd_gr(f,v,m,0,ord,rp); + 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; +void Pnd_gr_recompute_trace(NODE arg,LIST *rp) { + LIST f,v,tlist; + int m; + struct order_spec *ord; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"nd_gr_recompute_trace"); + asir_assert(ARG1(arg),O_LIST,"nd_gr_recompute_trace"); + asir_assert(ARG2(arg),O_N,"nd_gr_recompute_trace"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + tlist = (LIST)ARG4(arg); + nd_gr_recompute_trace(f,v,m,ord,tlist,rp); +} + +Obj nd_btog_one(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,int pos); +Obj nd_btog(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist); + +void Pnd_btog(NODE arg,Obj *rp) +{ + LIST f,v,tlist; + int m,ac,pos; + struct order_spec *ord; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"nd_btog"); + asir_assert(ARG1(arg),O_LIST,"nd_btog"); + asir_assert(ARG2(arg),O_N,"nd_btog"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + tlist = (LIST)ARG4(arg); + if ( (ac = argc(arg)) == 6 ) { + asir_assert(ARG5(arg),O_N,"nd_btog"); + pos = QTOS((Q)ARG5(arg)); + *rp = nd_btog_one(f,v,m,ord,tlist,pos); + } else if ( ac == 5 ) + *rp = nd_btog(f,v,m,ord,tlist); + else + error("nd_btog : argument mismatch"); +} + +void Pnd_weyl_gr_postproc(NODE arg,LIST *rp) +{ LIST f,v; + int m,do_check; + struct order_spec *ord; + + do_weyl = 1; + 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; do_weyl = 0; 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); + do_weyl = 0; +} + +void Pnd_gr_trace(NODE arg,LIST *rp) +{ + LIST f,v; int m,homo; struct order_spec *ord; @@ -1817,17 +2268,38 @@ 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_weyl_gr(arg,rp) -NODE arg; -LIST *rp; +void Pnd_f4_trace(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(NODE arg,LIST *rp) +{ + LIST f,v; + int m,homo,retdp; + Obj val; + 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"); @@ -1835,16 +2307,18 @@ LIST *rp; f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); f = remove_zero_from_list(f); if ( !BDY(f) ) { - *rp = f; return; + *rp = f; do_weyl = 0; return; } m = QTOS((Q)ARG2(arg)); create_order_spec(0,ARG3(arg),&ord); - nd_gr(f,v,m,0,ord,rp); + homo = retdp = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + nd_gr(f,v,m,homo,retdp,0,ord,rp); + do_weyl = 0; } -void Pnd_weyl_gr_trace(arg,rp) -NODE arg; -LIST *rp; +void Pnd_weyl_gr_trace(NODE arg,LIST *rp) { LIST f,v; int m,homo; @@ -1858,28 +2332,26 @@ LIST *rp; f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); f = remove_zero_from_list(f); if ( !BDY(f) ) { - *rp = f; return; + *rp = f; do_weyl = 0; 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,ord,rp); + nd_gr_trace(f,v,m,homo,0,ord,rp); + do_weyl = 0; } -void Pnd_nf(arg,rp) -NODE arg; -P *rp; +void Pnd_nf(NODE arg,Obj *rp) { - P f; + Obj 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); + f = (Obj)ARG0(arg); g = (LIST)ARG1(arg); g = remove_zero_from_list(g); if ( !BDY(g) ) { *rp = f; return; @@ -1889,11 +2361,29 @@ P *rp; nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),ord,rp); } +void Pnd_weyl_nf(NODE arg,Obj *rp) +{ + Obj f; + LIST g,v; + struct order_spec *ord; + + do_weyl = 1; + asir_assert(ARG1(arg),O_LIST,"nd_weyl_nf"); + asir_assert(ARG2(arg),O_LIST,"nd_weyl_nf"); + asir_assert(ARG4(arg),O_N,"nd_weyl_nf"); + f = (Obj)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(0,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) -NODE arg; -LIST *rp; +void Pdp_weyl_gr_main(NODE arg,LIST *rp) { LIST f,v; Num homo; @@ -1933,9 +2423,7 @@ LIST *rp; do_weyl = 0; } -void Pdp_weyl_gr_f_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_weyl_gr_f_main(NODE arg,LIST *rp) { LIST f,v; Num homo; @@ -1957,9 +2445,7 @@ LIST *rp; do_weyl = 0; } -void Pdp_weyl_f4_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_weyl_f4_main(NODE arg,LIST *rp) { LIST f,v; struct order_spec *ord; @@ -1977,9 +2463,7 @@ LIST *rp; do_weyl = 0; } -void Pdp_weyl_f4_mod_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_weyl_f4_mod_main(NODE arg,LIST *rp) { LIST f,v; int m; @@ -2001,9 +2485,7 @@ LIST *rp; do_weyl = 0; } -void Pdp_weyl_gr_mod_main(arg,rp) -NODE arg; -LIST *rp; +void Pdp_weyl_gr_mod_main(NODE arg,LIST *rp) { LIST f,v; Num homo; @@ -2028,12 +2510,11 @@ LIST *rp; do_weyl = 0; } -static VECT current_dl_weight_vector_obj; +VECT current_dl_weight_vector_obj; int *current_dl_weight_vector; +int dp_negative_weight; -void Pdp_set_weight(arg,rp) -NODE arg; -VECT *rp; +void Pdp_set_weight(NODE arg,VECT *rp) { VECT v; int i,n; @@ -2044,6 +2525,7 @@ VECT *rp; else if ( !ARG0(arg) ) { current_dl_weight_vector_obj = 0; current_dl_weight_vector = 0; + dp_negative_weight = 0; *rp = 0; } else { if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) @@ -2062,25 +2544,134 @@ VECT *rp; 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]); + for ( i = 0; i < n; i++ ) + if ( current_dl_weight_vector[i] < 0 ) break; + if ( i < n ) + dp_negative_weight = 1; + else + dp_negative_weight = 0; *rp = v; } } +VECT current_module_weight_vector_obj; +int *current_module_weight_vector; + +void Pdp_set_module_weight(NODE arg,VECT *rp) +{ + VECT v; + int i,n; + NODE node; + + if ( !arg ) + *rp = current_module_weight_vector_obj; + else if ( !ARG0(arg) ) { + current_module_weight_vector_obj = 0; + current_module_weight_vector = 0; + *rp = 0; + } else { + if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) + error("dp_module_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_module_weight_vector_obj = v; + n = v->len; + current_module_weight_vector = (int *)CALLOC(n,sizeof(int)); + for ( i = 0; i < n; i++ ) + current_module_weight_vector[i] = QTOS((Q)v->body[i]); + *rp = v; + } +} + +extern Obj current_top_weight; +extern Obj nd_top_weight; + +void Pdp_set_top_weight(NODE arg,Obj *rp) +{ + VECT v; + MAT m; + Obj obj; + int i,j,n,id,row,col; + Q *mi; + NODE node; + + if ( !arg ) + *rp = current_top_weight; + else if ( !ARG0(arg) ) { + reset_top_weight(); + *rp = 0; + } else { + id = OID(ARG0(arg)); + if ( id != O_VECT && id != O_MAT && id != O_LIST ) + error("dp_set_top_weight : invalid argument"); + if ( id == O_LIST ) { + 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); + obj = (Obj)v; + } else + obj = ARG0(arg); + if ( OID(obj) == O_VECT ) { + v = (VECT)obj; + for ( i = 0; i < v->len; i++ ) + if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) ) + error("dp_set_top_weight : each element must be a non-negative integer"); + } else { + m = (MAT)obj; row = m->row; col = m->col; + for ( i = 0; i < row; i++ ) + for ( j = 0, mi = (Q *)BDY(m)[i]; j < col; j++ ) + if ( !INT(mi[j]) || (mi[j] && SGN((Q)mi[j]) < 0) ) + error("dp_set_top_weight : each element must be a non-negative integer"); + } + current_top_weight = obj; + nd_top_weight = obj; + *rp = current_top_weight; + } +} + +LIST get_denomlist(); + +void Pdp_get_denomlist(LIST *rp) +{ + *rp = get_denomlist(); +} + static VECT current_weyl_weight_vector_obj; int *current_weyl_weight_vector; -void Pdp_weyl_set_weight(arg,rp) -NODE arg; -VECT *rp; +void Pdp_weyl_set_weight(NODE arg,VECT *rp) { VECT v; + NODE node; 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); + else if ( !ARG0(arg) ) { + current_weyl_weight_vector_obj = 0; + current_weyl_weight_vector = 0; + *rp = 0; + } else { + if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) + error("dp_weyl_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_weyl_weight_vector_obj = v; n = v->len; current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int)); @@ -2090,6 +2681,419 @@ VECT *rp; } } +NODE mono_raddec(NODE ideal); + +void Pdp_mono_raddec(NODE arg,LIST *rp) +{ + NODE ideal,rd,t,t1,r,r1,u; + VL vl0,vl; + int nv,i,bpi; + int *s; + DP dp; + P *v; + LIST l; + + ideal = BDY((LIST)ARG0(arg)); + if ( !ideal ) *rp = (LIST)ARG0(arg); + else { + t = BDY((LIST)ARG1(arg)); + nv = length(t); + v = (P *)MALLOC(nv*sizeof(P)); + for ( vl0 = 0, i = 0; t; t = NEXT(t), i++ ) { + NEXTVL(vl0,vl); VR(vl) = VR((P)BDY(t)); + MKV(VR(vl),v[i]); + } + if ( vl0 ) NEXT(vl) = 0; + for ( t = 0, r = ideal; r; r = NEXT(r) ) { + ptod(CO,vl0,BDY(r),&dp); MKNODE(t1,dp,t); t = t1; + } + rd = mono_raddec(t); + r = 0; + bpi = (sizeof(int)/sizeof(char))*8; + for ( u = rd; u; u = NEXT(u) ) { + s = (int *)BDY(u); + for ( i = nv-1, t = 0; i >= 0; i-- ) + if ( s[i/bpi]&(1<<(i%bpi)) ) { + MKNODE(t1,v[i],t); t = t1; + } + MKLIST(l,t); MKNODE(r1,l,r); r = r1; + } + MKLIST(*rp,r); + } +} + +void Pdp_mono_reduce(NODE arg,LIST *rp) +{ + NODE t,t0,t1,r0,r; + int i,n; + DP m; + DP *a; + + t0 = BDY((LIST)ARG0(arg)); + t1 = BDY((LIST)ARG1(arg)); + n = length(t0); + a = (DP *)MALLOC(n*sizeof(DP)); + for ( i = 0; i < n; i++, t0 = NEXT(t0) ) a[i] = (DP)BDY(t0); + for ( t = t1; t; t = NEXT(t) ) { + m = (DP)BDY(t); + for ( i = 0; i < n; i++ ) + if ( a[i] && dp_redble(a[i],m) ) a[i] = 0; + } + for ( i = n-1, r0 = 0; i >= 0; i-- ) + if ( a[i] ) { NEXTNODE(r0,r); BDY(r) = a[i]; } + if ( r0 ) NEXT(r) = 0; + MKLIST(*rp,r0); +} + +#define BLEN (8*sizeof(unsigned long)) + +void showmat2(unsigned long **a,int row,int col) +{ + int i,j; + + for ( i = 0; i < row; i++, putchar('\n') ) + for ( j = 0; j < col; j++ ) + if ( a[i][j/BLEN] & (1L<<(j%BLEN)) ) putchar('1'); + else putchar('0'); +} + +int rref2(unsigned long **a,int row,int col) +{ + int i,j,k,l,s,wcol,wj; + unsigned long bj; + unsigned long *ai,*ak,*as,*t; + int *pivot; + + wcol = (col+BLEN-1)/BLEN; + pivot = (int *)MALLOC_ATOMIC(row*sizeof(int)); + i = 0; + for ( j = 0; j < col; j++ ) { + wj = j/BLEN; bj = 1L<<(j%BLEN); + for ( k = i; k < row; k++ ) + if ( a[k][wj] & bj ) break; + if ( k == row ) continue; + pivot[i] = j; + if ( k != i ) { + t = a[i]; a[i] = a[k]; a[k] = t; + } + ai = a[i]; + for ( k = i+1; k < row; k++ ) { + ak = a[k]; + if ( ak[wj] & bj ) { + for ( l = wj; l < wcol; l++ ) + ak[l] ^= ai[l]; + } + } + i++; + } + for ( k = i-1; k >= 0; k-- ) { + j = pivot[k]; wj = j/BLEN; bj = 1L<<(j%BLEN); + ak = a[k]; + for ( s = 0; s < k; s++ ) { + as = a[s]; + if ( as[wj] & bj ) { + for ( l = wj; l < wcol; l++ ) + as[l] ^= ak[l]; + } + } + } + return i; +} + +void Pdp_rref2(NODE arg,VECT *rp) +{ + VECT f,term,ret; + int row,col,wcol,size,nv,i,j,rank,td; + unsigned long **mat; + unsigned long *v; + DL d; + DL *t; + DP dp; + MP m,m0; + + f = (VECT)ARG0(arg); + row = f->len; + term = (VECT)ARG1(arg); + col = term->len; + mat = (unsigned long **)MALLOC(row*sizeof(unsigned long *)); + size = sizeof(unsigned long)*((col+BLEN-1)/BLEN); + nv = ((DP)term->body[0])->nv; + t = (DL *)MALLOC(col*sizeof(DL)); + for ( i = 0; i < col; i++ ) t[i] = BDY((DP)BDY(term)[i])->dl; + for ( i = 0; i < row; i++ ) { + v = mat[i] = (unsigned long *)MALLOC_ATOMIC_IGNORE_OFF_PAGE(size); + bzero(v,size); + for ( j = 0, m = BDY((DP)BDY(f)[i]); m; m = NEXT(m) ) { + d = m->dl; + for ( ; !dl_equal(nv,d,t[j]); j++ ); + v[j/BLEN] |= 1L <<(j%BLEN); + } + } + rank = rref2(mat,row,col); + MKVECT(ret,rank); + *rp = ret; + for ( i = 0; i < rank; i++ ) { + v = mat[i]; + m0 = 0; + td = 0; + for ( j = 0; j < col; j++ ) { + if ( v[j/BLEN] & (1L<<(j%BLEN)) ) { + NEXTMP(m0,m); + m->dl = t[j]; + m->c = (P)ONE; + td = MAX(td,m->dl->td); + } + } + NEXT(m) = 0; + MKDP(nv,m0,dp); + dp->sugar = td; + BDY(ret)[i] = (pointer)dp; + } +} + +#define HDL(f) (BDY(f)->dl) + +NODE sumi_criB(int nv,NODE d,DP *f,int m) +{ + LIST p; + NODE r0,r; + int p0,p1; + DL p2,lcm; + + NEWDL(lcm,nv); + r0 = 0; + for ( ; d; d = NEXT(d) ) { + p = (LIST)BDY(d); + p0 = QTOS((Q)ARG0(BDY(p))); + p1 = QTOS((Q)ARG1(BDY(p))); + p2 = HDL((DP)ARG2(BDY(p))); + if(!_dl_redble(HDL((DP)f[m]),p2,nv) || + dl_equal(nv,lcm_of_DL(nv,HDL(f[p0]),HDL(f[m]),lcm),p2) || + dl_equal(nv,lcm_of_DL(nv,HDL(f[p1]),HDL(f[m]),lcm),p2) ) { + NEXTNODE(r0,r); + BDY(r) = p; + } + } + if ( r0 ) NEXT(r) = 0; + return r0; +} + +NODE sumi_criFMD(int nv,DP *f,int m) +{ + DL *a; + DL l1,dl1,dl2; + int i,j,k,k2; + NODE r,r1,nd; + MP mp; + DP u; + Q iq,mq; + LIST list; + + /* a[i] = lcm(LT(f[i]),LT(f[m])) */ + a = (DL *)ALLOCA(m*sizeof(DL)); + for ( i = 0; i < m; i++ ) { + a[i] = lcm_of_DL(nv,HDL(f[i]),HDL(f[m]),0); + } + r = 0; + for( i = 0; i < m; i++) { + l1 = a[i]; + if ( !l1 ) continue; + /* Tkm = Tim (kd[k2] && dl2->d[k2] ) break; + if ( k2 < nv ) { + NEWMP(mp); mp->dl = l1; C(mp) = (P)ONE; + NEXT(mp) = 0; MKDP(nv,mp,u); u->sugar = l1->td; + STOQ(i,iq); STOQ(m,mq); + nd = mknode(3,iq,mq,u); + MKLIST(list,nd); + MKNODE(r1,list,r); + r = r1; + } + } + } + } + return r; +} + +LIST sumi_updatepairs(LIST d,DP *f,int m) +{ + NODE old,new,t; + LIST l; + int nv; + + nv = f[0]->nv; + old = sumi_criB(nv,BDY(d),f,m); + new = sumi_criFMD(nv,f,m); + if ( !new ) new = old; + else { + for ( t = new ; NEXT(t); t = NEXT(t) ); + NEXT(t) = old; + } + MKLIST(l,new); + return l; +} + +VECT ltov(LIST l) +{ + NODE n; + int i,len; + VECT v; + + n = BDY(l); + len = length(n); + MKVECT(v,len); + for ( i = 0; i < len; i++, n = NEXT(n) ) + BDY(v)[i] = BDY(n); + return v; +} + +DL subdl(int nv,DL d1,DL d2) +{ + int i; + DL d; + + NEWDL(d,nv); + d->td = d1->td-d2->td; + for ( i = 0; i < nv; i++ ) + d->d[i] = d1->d[i]-d2->d[i]; + return d; +} + +DP dltodp(int nv,DL d) +{ + MP mp; + DP dp; + + NEWMP(mp); mp->dl = d; C(mp) = (P)ONE; + NEXT(mp) = 0; MKDP(nv,mp,dp); dp->sugar = d->td; + return dp; +} + +LIST sumi_simplify(int nv,DL t,DP p,NODE f2,int simp) +{ + DL d,h,hw; + DP u,w,dp; + int n,i,last; + LIST *v; + LIST list; + NODE s,r; + + d = t; u = p; + /* only the last history is used */ + if ( f2 && simp && t->td != 0 ) { + adddl(nv,t,HDL(p),&h); + n = length(f2); + last = 1; + if ( simp > 1 ) last = n; + v = (LIST *)ALLOCA(n*sizeof(LIST)); + for ( r = f2, i = 0; r; r = NEXT(r), i++ ) v[n-i-1] = BDY(r); + for ( i = 0; i < last; i++ ) { + for ( s = BDY((LIST)v[i]); s; s = NEXT(s) ) { + w = (DP)BDY(s); hw = HDL(w); + if ( _dl_redble(hw,h,nv) ) { + u = w; + d = subdl(nv,h,hw); + goto fin; + } + } + } + } +fin: + dp = dltodp(nv,d); + r = mknode(2,dp,u); + MKLIST(list,r); + return list; +} + +LIST sumi_symbolic(NODE l,int q,NODE f2,DP *g,int simp) +{ + int nv; + NODE t,r; + NODE f0,f,fd0,fd,done0,done,red0,red; + DL h,d; + DP mul; + int m; + LIST tp,l0,l1,l2,l3,list; + VECT v0,v1,v2,v3; + + nv = ((DP)BDY(l))->nv; + t = 0; + + f0 = 0; fd0 = 0; done0 = 0; red0 = 0; + + for ( ; l; l = NEXT(l) ) { + t = symb_merge(t,dp_dllist((DP)BDY(l)),nv); + NEXTNODE(fd0,fd); BDY(fd) = BDY(l); + } + + while ( t ) { + h = (DL)BDY(t); + NEXTNODE(done0,done); BDY(done) = dltodp(nv,h); + t = NEXT(t); + for(m = 0; m < q; m++) + if ( _dl_redble(HDL(g[m]),h,nv) ) break; + if ( m == q ) { + } else { + d = subdl(nv,h,HDL(g[m])); + tp = sumi_simplify(nv,d,g[m],f2,simp); + + muldm(CO,ARG1(BDY(tp)),BDY((DP)ARG0(BDY(tp))),&mul); + t = symb_merge(t,NEXT(dp_dllist(mul)),nv); + + NEXTNODE(f0,f); BDY(f) = tp; + NEXTNODE(fd0,fd); BDY(fd) = mul; + NEXTNODE(red0,red); BDY(red) = mul; + } + } + if ( fd0 ) NEXT(fd) = 0; MKLIST(l0,fd0); + v0 = ltov(l0); + if ( done0 ) NEXT(done) = 0; MKLIST(l1,done0); + v1 = ltov(l1); + if ( f0 ) NEXT(f) = 0; MKLIST(l2,f0); + v2 = ltov(l2); + if ( red0 ) NEXT(red) = 0; MKLIST(l3,red0); + v3 = ltov(l3); + r = mknode(4,v0,v1,v2,v3); + MKLIST(list,r); + return list; +} + +void Psumi_symbolic(NODE arg,LIST *rp) +{ + NODE l,f2; + DP *g; + int q,simp; + + l = BDY((LIST)ARG0(arg)); + q = QTOS((Q)ARG1(arg)); + f2 = BDY((LIST)ARG2(arg)); + g = (DP *)BDY((VECT)ARG3(arg)); + simp = QTOS((Q)ARG4(arg)); + *rp = sumi_symbolic(l,q,f2,g,simp); +} + +void Psumi_updatepairs(NODE arg,LIST *rp) +{ + LIST d,l; + DP *f; + int m; + + d = (LIST)ARG0(arg); + f = (DP *)BDY((VECT)ARG1(arg)); + m = QTOS((Q)ARG2(arg)); + *rp = sumi_updatepairs(d,f,m); +} + LIST remove_zero_from_list(LIST l) { NODE n,r0,r; @@ -2253,4 +3257,22 @@ int dpv_hp(DPV p) return -1; break; } +} + +int get_opt(char *key0,Obj *r) { + NODE tt,p; + char *key; + + 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,key0) ) { + *r = (Obj)BDY(NEXT(p)); + return 1; + } + } + } + return 0; }