=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.21 retrieving revision 1.80 diff -u -p -r1.21 -r1.80 --- OpenXM_contrib2/asir2000/builtin/dp.c 2001/10/09 01:36:05 1.21 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2010/01/19 06:17:22 1.80 @@ -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,7 +44,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.20 2001/10/05 10:23:06 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.79 2009/10/09 04:02:11 noro Exp $ */ #include "ca.h" #include "base.h" @@ -55,27 +54,35 @@ 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 order_spec *dp_current_spec; +extern struct modorder_spec *dp_current_modspec; int do_weyl; -void Pdp_ord(), Pdp_ptod(), Pdp_dtop(); +void Pdp_sort(); +void Pdp_mul_trunc(),Pdp_quo(); +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_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(); +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(); +void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc(); void Pdp_weyl_red(); void Pdp_weyl_sp(); @@ -84,9 +91,29 @@ 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(),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(),Pnd_f4_trace(); +void Pnd_gr_postproc(), Pnd_weyl_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_t(); +void Pdp_compute_last_w(); +void Pdp_compute_essential_df(); +void Pdp_get_denomlist(); +void Pdp_symb_add(); +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); + +LIST remove_zero_from_list(LIST); + struct ftab dp_tab[] = { /* content reduction */ {"dp_ptozp",Pdp_ptozp,1}, @@ -96,6 +123,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}, @@ -108,16 +139,32 @@ 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_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_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}, + {"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}, /* Buchberger algorithm */ - {"dp_gr_main",Pdp_gr_main,5}, + {"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_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}, /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, @@ -140,7 +187,7 @@ struct ftab dp_tab[] = { {"dp_weyl_nf_f",Pdp_weyl_nf_f,4}, /* Buchberger algorithm */ - {"dp_weyl_gr_main",Pdp_weyl_gr_main,5}, + {"dp_weyl_gr_main",Pdp_weyl_gr_main,-5}, {"dp_weyl_gr_mod_main",Pdp_weyl_gr_mod_main,5}, {"dp_weyl_gr_f_main",Pdp_weyl_gr_f_main,4}, @@ -149,20 +196,29 @@ 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}, }; struct ftab dp_supp_tab[] = { /* setting flags */ + {"dp_sort",Pdp_sort,1}, {"dp_ord",Pdp_ord,-1}, + {"dpv_ord",Pdpv_ord,-2}, {"dp_set_kara",Pdp_set_kara,-1}, {"dp_nelim",Pdp_nelim,-1}, {"dp_gr_flags",Pdp_gr_flags,-1}, {"dp_gr_print",Pdp_gr_print,-1}, /* converters */ - {"dp_ptod",Pdp_ptod,2}, + {"homogenize",Phomogenize,3}, + {"dp_ptod",Pdp_ptod,-2}, {"dp_dtop",Pdp_dtop,2}, {"dp_homo",Pdp_homo,1}, {"dp_dehomo",Pdp_dehomo,1}, @@ -172,6 +228,7 @@ struct ftab dp_supp_tab[] = { {"dp_mdtod",Pdp_mdtod,1}, {"dp_mod",Pdp_mod,3}, {"dp_rat",Pdp_rat,1}, + {"dp_ltod",Pdp_ltod,-2}, /* criteria */ {"dp_cri1",Pdp_cri1,2}, @@ -184,12 +241,19 @@ struct ftab dp_supp_tab[] = { {"dp_hm",Pdp_hm,1}, {"dp_ht",Pdp_ht,1}, {"dp_hc",Pdp_hc,1}, + {"dpv_hm",Pdpv_hm,1}, + {"dpv_ht",Pdpv_ht,1}, + {"dpv_hc",Pdpv_hc,1}, {"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}, {"dp_mag",Pdp_mag,1}, {"dp_sugar",Pdp_sugar,1}, + {"dp_set_sugar",Pdp_set_sugar,2}, /* misc */ {"dp_mbase",Pdp_mbase,1}, @@ -198,10 +262,122 @@ 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}, {0,0,0} }; +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(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; +{ + dp_sort((DP)ARG0(arg),rp); +} + void Pdp_mdtod(arg,rp) NODE arg; DP *rp; @@ -318,7 +494,7 @@ DP *rp; n = v->len; NEWDL(dl,n); d = dl->d; for ( i = 0, td = 0; i < n; i++ ) { - d[i] = QTOS((Q)(v->body[i])); td += d[i]; + d[i] = QTOS((Q)(v->body[i])); td += MUL_WEIGHT(d[i],i); } dl->td = td; NEWMP(m); m->dl = dl; m->c = (P)ONE; NEXT(m) = 0; @@ -372,18 +548,34 @@ 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; { - struct order_spec spec; - - if ( !arg ) - *rp = dp_current_spec.obj; - else if ( !create_order_spec((Obj)ARG0(arg),&spec) ) - error("dp_ord : invalid order specification"); + struct order_spec *spec; + LIST v; + struct oLIST f; + Num homo; + int modular; + + f.id = O_LIST; f.body = 0; + if ( !arg && !current_option ) + *rp = dp_current_spec->obj; else { - initd(&spec); *rp = spec.obj; + if ( current_option ) + parse_gr_option(&f,current_option,&v,&homo,&modular,&spec); + else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) ) + error("dp_ord : invalid order specification"); + initd(spec); *rp = spec->obj; } } @@ -391,12 +583,31 @@ void Pdp_ptod(arg,rp) NODE arg; DP *rp; { + P p; NODE n; VL vl,tvl; + struct oLIST f; + int ac; + LIST v; + Num homo; + int modular; + struct order_spec *ord; asir_assert(ARG0(arg),O_P,"dp_ptod"); - asir_assert(ARG1(arg),O_LIST,"dp_ptod"); - for ( vl = 0, n = BDY((LIST)ARG1(arg)); n; n = NEXT(n) ) { + p = (P)ARG0(arg); + ac = argc(arg); + if ( ac == 1 ) { + if ( current_option ) { + f.id = O_LIST; f.body = mknode(1,p); + parse_gr_option(&f,current_option,&v,&homo,&modular,&ord); + initd(ord); + } else + error("dp_ptod : invalid argument"); + } else { + asir_assert(ARG1(arg),O_LIST,"dp_ptod"); + v = (LIST)ARG1(arg); + } + for ( vl = 0, n = BDY(v); n; n = NEXT(n) ) { if ( !vl ) { NEWVL(vl); tvl = vl; } else { @@ -406,9 +617,95 @@ DP *rp; } if ( vl ) NEXT(tvl) = 0; - ptod(CO,vl,(P)ARG0(arg),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; +{ + NODE n; + VL vl,tvl; + LIST f,v; + int sugar,i,len,ac,modular; + Num homo; + struct order_spec *ord; + DP *e; + NODE nd,t; + + ac = argc(arg); + asir_assert(ARG0(arg),O_LIST,"dp_ptod"); + f = (LIST)ARG0(arg); + if ( ac == 1 ) { + if ( current_option ) { + parse_gr_option(f,current_option,&v,&homo,&modular,&ord); + initd(ord); + } else + error("dp_ltod : invalid argument"); + } else { + asir_assert(ARG1(arg),O_LIST,"dp_ptod"); + v = (LIST)ARG1(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 ) + NEXT(tvl) = 0; + + nd = BDY(f); + len = length(nd); + e = (DP *)MALLOC(len*sizeof(DP)); + sugar = 0; + for ( i = 0, t = nd; i < len; i++, t = NEXT(t) ) { + ptod(CO,vl,(P)BDY(t),&e[i]); + if ( e[i] ) + sugar = MAX(sugar,e[i]->sugar); + } + MKDPV(len,e,*rp); +} + void Pdp_dtop(arg,rp) NODE arg; P *rp; @@ -435,10 +732,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) @@ -503,7 +832,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"); @@ -628,7 +957,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"); @@ -645,6 +974,131 @@ 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); +} + +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(arg,rp) +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); +} + +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(arg,rp) +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_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; @@ -807,6 +1261,55 @@ DP *rp; dp_subd(p1,p2,rp); } +void Pdp_symb_add(arg,rp) +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->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(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; @@ -814,7 +1317,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; @@ -927,7 +1430,7 @@ DP *rp; n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; NEWDL(d,n); for ( i = 0, td = 0; i < n; i++ ) { - d->d[i] = MAX(d1->d[i],d2->d[i]); td += d->d[i]; + d->d[i] = MAX(d1->d[i],d2->d[i]); td += MUL_WEIGHT(d->d[i],i); } d->td = td; NEWMP(m); m->dl = d; m->c = (P)ONE; NEXT(m) = 0; @@ -952,13 +1455,7 @@ DP *rp; MP m,mr; p = (DP)ARG0(arg); asir_assert(p,O_DP,"dp_ht"); - if ( !p ) - *rp = 0; - else { - m = BDY(p); - NEWMP(mr); mr->dl = m->dl; mr->c = (P)ONE; NEXT(mr) = 0; - MKDP(p->nv,mr,*rp); (*rp)->sugar = mr->dl->td; /* XXX */ - } + dp_ht(p,rp); } void Pdp_hc(arg,rp) @@ -1009,6 +1506,85 @@ Q *rp; STOQ(p->sugar,*rp); } +void Pdp_initial_term(arg,rp) +NODE arg; +Obj *rp; +{ + struct order_spec *ord; + Num homo; + int modular,is_list; + LIST v,f,l,initiallist; + NODE n; + + f = (LIST)ARG0(arg); + if ( f && OID(f) == O_LIST ) + is_list = 1; + else { + n = mknode(1,f); MKLIST(l,n); f = l; + is_list = 0; + } + if ( current_option ) { + parse_gr_option(f,current_option,&v,&homo,&modular,&ord); + initd(ord); + } else + ord = dp_current_spec; + initiallist = dp_initial_term(f,ord); + if ( !is_list ) + *rp = (Obj)BDY(BDY(initiallist)); + else + *rp = (Obj)initiallist; +} + +void Pdp_order(arg,rp) +NODE arg; +Obj *rp; +{ + struct order_spec *ord; + Num homo; + int modular,is_list; + LIST v,f,l,ordlist; + NODE n; + + f = (LIST)ARG0(arg); + if ( f && OID(f) == O_LIST ) + is_list = 1; + else { + n = mknode(1,f); MKLIST(l,n); f = l; + is_list = 0; + } + if ( current_option ) { + parse_gr_option(f,current_option,&v,&homo,&modular,&ord); + initd(ord); + } else + ord = dp_current_spec; + ordlist = dp_order(f,ord); + if ( !is_list ) + *rp = (Obj)BDY(BDY(ordlist)); + else + *rp = (Obj)ordlist; +} + +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; @@ -1210,66 +1786,255 @@ 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; } +void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo, + int *modular,struct order_spec **ord) +{ + NODE t,p; + Q m; + char *key; + Obj value,dmy; + int ord_is_set = 0; + int modular_is_set = 0; + int homo_is_set = 0; + VL vl,vl0; + LIST vars; + char xiname[BUFSIZ]; + NODE x0,x; + DP d; + P xi; + int nv,i; + + /* extract vars */ + vars = 0; + for ( t = opt; t; t = NEXT(t) ) { + p = BDY((LIST)BDY(t)); + key = BDY((STRING)BDY(p)); + value = (Obj)BDY(NEXT(p)); + if ( !strcmp(key,"v") ) { + /* variable list */ + vars = (LIST)value; + break; + } + } + if ( vars ) { + *v = vars; pltovl(vars,&vl); + } else { + for ( t = BDY(f); t; t = NEXT(t) ) + if ( BDY(t) && OID((Obj)BDY(t))==O_DP ) + break; + if ( t ) { + /* f is DP list */ + /* create dummy var list */ + d = (DP)BDY(t); + nv = NV(d); + for ( i = 0, vl0 = 0, x0 = 0; i < nv; i++ ) { + NEXTVL(vl0,vl); + NEXTNODE(x0,x); + sprintf(xiname,"x%d",i); + makevar(xiname,&xi); + x->body = (pointer)xi; + vl->v = VR((P)xi); + } + if ( vl0 ) { + NEXT(vl) = 0; + NEXT(x) = 0; + } + MKLIST(vars,x0); + *v = vars; + vl = vl0; + } else { + get_vars((Obj)f,&vl); vltopl(vl,v); + } + } + + for ( t = opt; t; t = NEXT(t) ) { + p = BDY((LIST)BDY(t)); + key = BDY((STRING)BDY(p)); + value = (Obj)BDY(NEXT(p)); + if ( !strcmp(key,"v") ) { + /* variable list; ignore */ + } else if ( !strcmp(key,"order") ) { + /* order spec */ + if ( !vl ) + error("parse_gr_option : variables must be specified"); + create_order_spec(vl,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"block") ) { + create_order_spec(0,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"matrix") ) { + create_order_spec(0,value,ord); + ord_is_set = 1; + } else if ( !strcmp(key,"sugarweight") ) { + /* weight */ + Pdp_set_weight(NEXT(p),&dmy); + } else if ( !strcmp(key,"homo") ) { + *homo = (Num)value; + homo_is_set = 1; + } else if ( !strcmp(key,"trace") ) { + m = (Q)value; + if ( !m ) + *modular = 0; + else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 + && BD(NM(m))[0] >= 0x80000000) ) + error("parse_gr_option : too large modulus"); + else + *modular = QTOS(m); + modular_is_set = 1; + } else + error("parse_gr_option : not implemented"); + } + if ( !ord_is_set ) create_order_spec(0,0,ord); + if ( !modular_is_set ) *modular = 0; + if ( !homo_is_set ) *homo = 0; +} + void Pdp_gr_main(arg,rp) NODE arg; LIST *rp; { LIST f,v; + VL vl; Num homo; Q m; - int modular; - struct order_spec ord; + int modular,ac; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_gr_main"); - asir_assert(ARG1(arg),O_LIST,"dp_gr_main"); - 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); - homo = (Num)ARG2(arg); - m = (Q)ARG3(arg); - if ( !m ) - modular = 0; - else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) - error("dp_gr_main : too large modulus"); + f = (LIST)ARG0(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + if ( (ac = argc(arg)) == 5 ) { + asir_assert(ARG1(arg),O_LIST,"dp_gr_main"); + asir_assert(ARG2(arg),O_N,"dp_gr_main"); + asir_assert(ARG3(arg),O_N,"dp_gr_main"); + v = (LIST)ARG1(arg); + homo = (Num)ARG2(arg); + m = (Q)ARG3(arg); + if ( !m ) + modular = 0; + else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) + error("dp_gr_main : too large modulus"); + else + modular = QTOS(m); + create_order_spec(0,ARG4(arg),&ord); + } else if ( current_option ) + parse_gr_option(f,current_option,&v,&homo,&modular,&ord); + else if ( ac == 1 ) + parse_gr_option(f,0,&v,&homo,&modular,&ord); else - modular = QTOS(m); - create_order_spec(ARG4(arg),&ord); - dp_gr_main(f,v,homo,modular,0,&ord,rp); + error("dp_gr_main : invalid argument"); + 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; { LIST f,v; Num homo; - struct order_spec ord; + 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); - create_order_spec(ARG3(arg),&ord); - dp_gr_main(f,v,homo,0,1,&ord,rp); +#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(0,ARG4(arg),&ord); +#else + m = 0; + create_order_spec(0,ARG3(arg),&ord); +#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) @@ -1277,33 +2042,61 @@ NODE arg; LIST *rp; { LIST f,v; - struct order_spec ord; + struct order_spec *ord; do_weyl = 0; 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); - create_order_spec(ARG2(arg),&ord); - dp_f4_main(f,v,&ord,rp); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + create_order_spec(0,ARG2(arg),&ord); + dp_f4_main(f,v,ord,rp); } +/* dp_gr_checklist(list of dp) */ + +void Pdp_gr_checklist(arg,rp) +NODE arg; +LIST *rp; +{ + VECT g; + LIST dp; + NODE r; + int n; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"dp_gr_checklist"); + asir_assert(ARG1(arg),O_N,"dp_gr_checklist"); + n = QTOS((Q)ARG1(arg)); + gbcheck_list(BDY((LIST)ARG0(arg)),n,&g,&dp); + r = mknode(2,g,dp); + MKLIST(*rp,r); +} + void Pdp_f4_mod_main(arg,rp) NODE arg; LIST *rp; { LIST f,v; int m; - struct order_spec ord; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_f4_mod_main"); 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); - dp_f4_mod_main(f,v,m,&ord,rp); + create_order_spec(0,ARG3(arg),&ord); + dp_f4_mod_main(f,v,m,ord,rp); } void Pdp_gr_mod_main(arg,rp) @@ -1313,7 +2106,7 @@ LIST *rp; LIST f,v; Num homo; int m; - struct order_spec ord; + struct order_spec *ord; do_weyl = 0; asir_assert(ARG0(arg),O_LIST,"dp_gr_mod_main"); @@ -1321,13 +2114,227 @@ 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"); - create_order_spec(ARG4(arg),&ord); - dp_gr_mod_main(f,v,homo,m,&ord,rp); + create_order_spec(0,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_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; + } + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,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(0,ARG3(arg),&ord); + 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_weyl_gr_postproc(arg,rp) +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(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,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; +{ + 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; do_weyl = 0; return; + } + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + nd_gr(f,v,m,0,ord,rp); + do_weyl = 0; +} + +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; 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,0,ord,rp); + do_weyl = 0; +} + +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(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) @@ -1337,25 +2344,38 @@ LIST *rp; LIST f,v; Num homo; Q m; - int modular; - struct order_spec ord; + int modular,ac; + struct order_spec *ord; + asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_main"); - asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main"); - 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); - homo = (Num)ARG2(arg); - m = (Q)ARG3(arg); - if ( !m ) - modular = 0; - else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) - error("dp_gr_main : too large modulus"); + f = (LIST)ARG0(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + if ( (ac = argc(arg)) == 5 ) { + asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main"); + asir_assert(ARG2(arg),O_N,"dp_weyl_gr_main"); + asir_assert(ARG3(arg),O_N,"dp_weyl_gr_main"); + v = (LIST)ARG1(arg); + homo = (Num)ARG2(arg); + m = (Q)ARG3(arg); + if ( !m ) + modular = 0; + else if ( PL(NM(m))>1 || (PL(NM(m)) == 1 && BD(NM(m))[0] >= 0x80000000) ) + error("dp_weyl_gr_main : too large modulus"); + else + modular = QTOS(m); + create_order_spec(0,ARG4(arg),&ord); + } else if ( current_option ) + parse_gr_option(f,current_option,&v,&homo,&modular,&ord); + else if ( ac == 1 ) + parse_gr_option(f,0,&v,&homo,&modular,&ord); else - modular = QTOS(m); - create_order_spec(ARG4(arg),&ord); + error("dp_weyl_gr_main : invalid argument"); do_weyl = 1; - dp_gr_main(f,v,homo,modular,0,&ord,rp); + dp_gr_main(f,v,homo,modular,0,ord,rp); do_weyl = 0; } @@ -1365,17 +2385,21 @@ LIST *rp; { LIST f,v; Num homo; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_main"); 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); + create_order_spec(0,ARG3(arg),&ord); do_weyl = 1; - dp_gr_main(f,v,homo,0,1,&ord,rp); + dp_gr_main(f,v,homo,0,1,ord,rp); do_weyl = 0; } @@ -1384,14 +2408,18 @@ NODE arg; LIST *rp; { LIST f,v; - struct order_spec ord; + struct order_spec *ord; 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); - create_order_spec(ARG2(arg),&ord); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + create_order_spec(0,ARG2(arg),&ord); do_weyl = 1; - dp_f4_main(f,v,&ord,rp); + dp_f4_main(f,v,ord,rp); do_weyl = 0; } @@ -1401,17 +2429,21 @@ LIST *rp; { LIST f,v; int m; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_f4_main"); 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); + create_order_spec(0,ARG3(arg),&ord); do_weyl = 1; - dp_f4_mod_main(f,v,m,&ord,rp); + dp_f4_mod_main(f,v,m,ord,rp); do_weyl = 0; } @@ -1422,25 +2454,153 @@ LIST *rp; LIST f,v; Num homo; int m; - struct order_spec ord; + struct order_spec *ord; asir_assert(ARG0(arg),O_LIST,"dp_weyl_gr_mod_main"); asir_assert(ARG1(arg),O_LIST,"dp_weyl_gr_mod_main"); 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"); - create_order_spec(ARG4(arg),&ord); + create_order_spec(0,ARG4(arg),&ord); do_weyl = 1; - dp_gr_mod_main(f,v,homo,m,&ord,rp); + dp_gr_mod_main(f,v,homo,m,ord,rp); do_weyl = 0; } -static VECT current_weight_vector_obj; -int *current_weight_vector; +VECT current_dl_weight_vector_obj; +int *current_dl_weight_vector; +void Pdp_set_weight(arg,rp) +NODE arg; +VECT *rp; +{ + VECT v; + int i,n; + NODE node; + + if ( !arg ) + *rp = current_dl_weight_vector_obj; + else if ( !ARG0(arg) ) { + current_dl_weight_vector_obj = 0; + current_dl_weight_vector = 0; + *rp = 0; + } else { + 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)); + for ( i = 0; i < n; i++ ) + current_dl_weight_vector[i] = QTOS((Q)v->body[i]); + *rp = v; + } +} + +VECT current_module_weight_vector_obj; +int *current_module_weight_vector; + +void Pdp_set_module_weight(arg,rp) +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; + } +} + +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]) || (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] = !BDY(v)[i]?0: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; +int *current_weyl_weight_vector; + void Pdp_weyl_set_weight(arg,rp) NODE arg; VECT *rp; @@ -1449,15 +2609,184 @@ VECT *rp; int i,n; if ( !arg ) - *rp = current_weight_vector_obj; - else { + *rp = current_weyl_weight_vector_obj; + else if ( !ARG0(arg) ) { + current_weyl_weight_vector_obj = 0; + current_weyl_weight_vector = 0; + *rp = 0; + } else { asir_assert(ARG0(arg),O_VECT,"dp_weyl_set_weight"); v = (VECT)ARG0(arg); - current_weight_vector_obj = v; + current_weyl_weight_vector_obj = v; n = v->len; - current_weight_vector = (int *)CALLOC(n,sizeof(int)); + current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int)); for ( i = 0; i < n; i++ ) - current_weight_vector[i] = QTOS((Q)v->body[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; + } +} + +void Pdpv_ord(NODE arg,Obj *rp) +{ + int ac,id; + LIST shift; + + ac = argc(arg); + if ( ac ) { + id = QTOS((Q)ARG0(arg)); + if ( ac > 1 && ARG1(arg) && OID((Obj)ARG1(arg))==O_LIST ) + shift = (LIST)ARG1(arg); + else + shift = 0; + create_modorder_spec(id,shift,&dp_current_modspec); + } + *rp = dp_current_modspec->obj; +} + +void Pdpv_ht(NODE arg,LIST *rp) +{ + NODE n; + DP ht; + int pos; + DPV p; + Q q; + + asir_assert(ARG0(arg),O_DPV,"dpv_ht"); + p = (DPV)ARG0(arg); + pos = dpv_hp(p); + if ( pos < 0 ) + ht = 0; + else + dp_ht(BDY(p)[pos],&ht); + STOQ(pos,q); + n = mknode(2,q,ht); + MKLIST(*rp,n); +} + +void Pdpv_hm(NODE arg,LIST *rp) +{ + NODE n; + DP ht; + int pos; + DPV p; + Q q; + + asir_assert(ARG0(arg),O_DPV,"dpv_hm"); + p = (DPV)ARG0(arg); + pos = dpv_hp(p); + if ( pos < 0 ) + ht = 0; + else + dp_hm(BDY(p)[pos],&ht); + STOQ(pos,q); + n = mknode(2,q,ht); + MKLIST(*rp,n); +} + +void Pdpv_hc(NODE arg,LIST *rp) +{ + NODE n; + P hc; + int pos; + DPV p; + Q q; + + asir_assert(ARG0(arg),O_DPV,"dpv_hc"); + p = (DPV)ARG0(arg); + pos = dpv_hp(p); + if ( pos < 0 ) + hc = 0; + else + hc = BDY(BDY(p)[pos])->c; + STOQ(pos,q); + n = mknode(2,q,hc); + MKLIST(*rp,n); +} + +int dpv_hp(DPV p) +{ + int len,i,maxp,maxw,w,slen; + int *shift; + DP *e; + + len = p->len; + e = p->body; + slen = dp_current_modspec->len; + shift = dp_current_modspec->degree_shift; + switch ( dp_current_modspec->id ) { + case ORD_REVGRADLEX: + for ( maxp = -1, i = 0; i < len; i++ ) + if ( !e[i] ) continue; + else if ( maxp < 0 ) { + maxw = BDY(e[i])->dl->td+(idl->td+(i= maxw ) { + maxw = w; maxp = i; + } + } + return maxp; + case ORD_GRADLEX: + for ( maxp = -1, i = 0; i < len; i++ ) + if ( !e[i] ) continue; + else if ( maxp < 0 ) { + maxw = BDY(e[i])->dl->td+(idl->td+(i maxw ) { + maxw = w; maxp = i; + } + } + return maxp; + break; + case ORD_LEX: + for ( i = 0; i < len; i++ ) + if ( e[i] ) return i; + return -1; + break; } }