=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp.c,v retrieving revision 1.14 retrieving revision 1.29 diff -u -p -r1.14 -r1.29 --- OpenXM_contrib2/asir2018/builtin/dp.c 2019/09/13 09:02:49 1.14 +++ OpenXM_contrib2/asir2018/builtin/dp.c 2021/02/28 02:33:15 1.29 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.13 2019/09/05 08:49:43 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.28 2021/02/18 05:35:01 noro Exp $ */ #include "ca.h" #include "base.h" @@ -59,9 +59,9 @@ extern struct order_spec *dp_current_spec; extern struct modorder_spec *dp_current_modspec; extern int nd_rref2; -int do_weyl; +extern int do_weyl; -void Pdp_monomial_hilbert_poincare(); +void Pdp_monomial_hilbert_poincare(),Pdp_monomial_hilbert_poincare_incremental(); void Pdp_sort(); void Pdp_mul_trunc(),Pdp_quo(); void Pdp_ord(), Pdp_ptod(), Pdp_dtop(), Phomogenize(); @@ -79,6 +79,7 @@ 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 Pdpm_homo(),Pdpm_dehomo(),Pdpm_mod(); 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(); @@ -89,9 +90,12 @@ void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), P void Pdp_cont(); void Pdp_gr_checklist(); void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc(); -void Pdpm_ltod(),Pdpm_dtol(),Pdpm_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient(); -void Pdpm_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_hp(),Pdpm_rest(),Pdpm_shift(),Pdpm_split(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble(); -void Pdpm_schreyer_base(),Pdpm_simplify_syz(); +void Pdpm_ltod(),Pdpm_dtol(),Pdpm_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient(),Pdpm_nf_and_quotient2(); +void Pdpm_schreyer_frame(),Pdpm_set_schreyer_level(); +void Pdpm_list_to_array(),Pdpm_sp_nf(),Pdpm_insert_to_zlist(); +void Pdpm_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_hp(),Pdpm_rest(),Pdpm_shift(),Pdpm_split(),Pdpm_extract(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble(); +void Pdpm_schreyer_base(),Pdpm_simplify_syz(),Pdpm_td(); +void Pdpm_remove_cont(); void Pdp_weyl_red(); void Pdp_weyl_sp(); @@ -109,6 +113,8 @@ void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdpm_nf_f(),Pdpm_weyl_nf_f(); void Pdp_lnf_f(); void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace(); +void Pnd_sba(),Pnd_sba_f4(); +void Pnd_weyl_sba(); void Pnd_gr_postproc(), Pnd_weyl_gr_postproc(); void Pnd_gr_recompute_trace(), Pnd_btog(); void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); @@ -140,6 +146,7 @@ struct ftab dp_tab[] = { {"dp_prim",Pdp_prim,1}, {"dp_red_coef",Pdp_red_coef,2}, {"dp_cont",Pdp_cont,1}, + {"dpm_remove_cont",Pdpm_remove_cont,1}, /* polynomial ring */ /* special operations */ @@ -159,6 +166,7 @@ struct ftab dp_tab[] = { {"dp_nf_mod",Pdp_nf_mod,5}, {"dp_nf_f",Pdp_nf_f,4}, {"dpm_nf_and_quotient",Pdpm_nf_and_quotient,-3}, + {"dpm_nf_and_quotient2",Pdpm_nf_and_quotient2,-3}, {"dpm_nf_f",Pdpm_nf_f,-4}, {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,-4}, {"dpm_nf",Pdpm_nf,-4}, @@ -188,6 +196,9 @@ struct ftab dp_tab[] = { {"dp_gr_checklist",Pdp_gr_checklist,2}, {"nd_f4",Pnd_f4,-4}, {"nd_gr",Pnd_gr,-4}, + {"nd_sba",Pnd_sba,-4}, + {"nd_weyl_sba",Pnd_weyl_sba,-4}, + {"nd_sba_f4",Pnd_sba_f4,-4}, {"nd_gr_trace",Pnd_gr_trace,-5}, {"nd_f4_trace",Pnd_f4_trace,-5}, {"nd_gr_postproc",Pnd_gr_postproc,5}, @@ -238,6 +249,7 @@ struct ftab dp_tab[] = { /* Hilbert function */ {"dp_monomial_hilbert_poincare",Pdp_monomial_hilbert_poincare,2}, + {"dp_monomial_hilbert_poincare_incremental",Pdp_monomial_hilbert_poincare_incremental,3}, /* misc */ {"dp_inv_or_split",Pdp_inv_or_split,3}, @@ -255,6 +267,8 @@ struct ftab dp_supp_tab[] = { {"dp_sort",Pdp_sort,1}, {"dp_ord",Pdp_ord,-1}, {"dpm_set_schreyer",Pdpm_set_schreyer,-1}, + {"dpm_set_schreyer_level",Pdpm_set_schreyer_level,1}, + {"dpm_schreyer_frame",Pdpm_schreyer_frame,1}, {"dpv_ord",Pdpv_ord,-2}, {"dp_set_kara",Pdp_set_kara,-1}, {"dp_nelim",Pdp_nelim,-1}, @@ -278,6 +292,9 @@ struct ftab dp_supp_tab[] = { {"dpm_ltod",Pdpm_ltod,2}, {"dpm_dptodpm",Pdpm_dptodpm,2}, {"dpm_dtol",Pdpm_dtol,2}, + {"dpm_homo",Pdpm_homo,1}, + {"dpm_dehomo",Pdpm_dehomo,1}, + {"dpm_mod",Pdpm_mod,2}, /* criteria */ {"dp_cri1",Pdp_cri1,2}, @@ -300,6 +317,7 @@ struct ftab dp_supp_tab[] = { {"dpm_rest",Pdpm_rest,1}, {"dpm_shift",Pdpm_shift,2}, {"dpm_split",Pdpm_split,2}, + {"dpm_extract",Pdpm_extract,2}, {"dpm_sort",Pdpm_sort,1}, {"dp_rest",Pdp_rest,1}, {"dp_initial_term",Pdp_initial_term,1}, @@ -311,6 +329,7 @@ struct ftab dp_supp_tab[] = { {"dp_mag",Pdp_mag,1}, {"dp_sugar",Pdp_sugar,1}, {"dp_set_sugar",Pdp_set_sugar,2}, + {"dpm_td",Pdpm_td,1}, /* misc */ {"dp_mbase",Pdp_mbase,1}, @@ -326,6 +345,9 @@ struct ftab dp_supp_tab[] = { {"dp_mono_raddec",Pdp_mono_raddec,2}, {"dp_mono_reduce",Pdp_mono_reduce,2}, {"dpm_schreyer_base",Pdpm_schreyer_base,1}, + {"dpm_list_to_array",Pdpm_list_to_array,1}, + {"dpm_sp_nf",Pdpm_sp_nf,4}, + {"dpm_insert_to_zlist",Pdpm_insert_to_zlist,3}, {"dpm_simplify_syz",Pdpm_simplify_syz,2}, {"dp_rref2",Pdp_rref2,2}, @@ -445,7 +467,7 @@ void mhp_rec(VECT b,VECT x,P t,P *r) DL *p,*q; DL pi,xj,d1; VECT c; -struct oEGT eg0,eg1; + struct oEGT eg0,eg1; i_all++; n = b->len; nv = x->len; p = (DL *)BDY(b); @@ -592,6 +614,7 @@ P *mhp_prep(int n,P *tv) { P *plist; P mt,t1; int i; + VECT list; plist = (P *)MALLOC((n+1)*sizeof(P)); /* t1 = 1-t */ @@ -612,18 +635,44 @@ P mhp_ctop(P *r,P *plist,int n) return hp; } +LIST dp_monomial_hilbert_poincare(VECT b,VECT x,P *plist) +{ + int n; + P *r; + P tv; + P hp,hpoly; + VECT hfhead; + Z z; + NODE nd; + VECT vect; + LIST list; + + n = x->len; + r = (P *)CALLOC(n+1,sizeof(P)); + make_reduced(b,n); + makevar("t",&tv); + mhp_rec(b,x,tv,r); + hp = mhp_ctop(r,plist,n); + mhp_to_hf(CO,hp,n,plist,&hfhead,&hpoly); + UTOZ(n,z); + NEWVECT(vect); vect->len = n+1; BDY(vect) = (pointer)plist; + nd = mknode(5,hp,z,hfhead,hpoly,vect); + MKLIST(list,nd); + return list; +} + void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp) { LIST g,v; VL vl; int m,n,i; - VECT b,x,hfhead; + VECT b,x,hfhead,prep; NODE t,nd; Z z,den; P hp,tv,mt,t1,u,w,hpoly; DP a; DL *p; - P *plist,*r; + P *plist; Obj val; i_simple = i_all = 0; @@ -641,18 +690,65 @@ void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp) for ( t = BDY(v), i = 0; t; t = NEXT(t), i++ ) { ptod(CO,vl,(P)BDY(t),&a); p[i] = BDY(a)->dl; } - - r = (P *)CALLOC(n+1,sizeof(P)); plist = mhp_prep(n,&tv); - make_reduced(b,n); - mhp_rec(b,x,tv,r); - hp = mhp_ctop(r,plist,n); - mhp_to_hf(CO,hp,n,plist,&hfhead,&hpoly); - UTOZ(n,z); - nd = mknode(4,hp,z,hfhead,hpoly); - MKLIST(*rp,nd); + *rp = dp_monomial_hilbert_poincare(b,x,plist); } +DL monomial_colon(DL a,DL b,int n) +{ + int i,d,td; + DL r; + + NEWDL(r,n); + td = 0; + for ( i = 0; i < n; i++ ) { + d = a->d[i]-b->d[i]; + r->d[i] = MAX(d,0); + td += r->d[i]; + } + r->td = td; + return r; +} + +// arguments : DPlist, Xlist, Mono, [HN(t),NV,Head,HP(n),Plist] +void Pdp_monomial_hilbert_poincare_incremental(NODE arg,LIST *rp) +{ + NODE g,data,data1,nd,t; + LIST list,list1; + DL new,dl; + int len,i,n; + Z dz; + DL *p; + P hn,hn1,newhn,tv,newhpoly,td,s; + VECT b,x,newhfhead; + P *plist; + + g = BDY((LIST)ARG0(arg)); new = BDY((DP)ARG1(arg))->dl; + data = BDY((LIST)ARG2(arg)); + hn = (P)ARG0(data); n = ZTOS((Z)ARG1(data)); + plist = (P *)BDY((VECT)ARG4(data)); + len = length(g); MKVECT(b,len); p = (DL *)BDY(b); + for ( t = g, i = 0; t; t = NEXT(t), i++ ) + p[i] = monomial_colon(BDY((DP)BDY(t))->dl,new,n); + MKVECT(x,n); + for ( i = 0; i < n; i++ ) { + NEWDL(dl,n); dl->d[i] = 1; dl->td = 1; BDY(x)[i] = dl; + } + // compute HP(I:new) + list1 = dp_monomial_hilbert_poincare(b,x,plist); + data1 = BDY((LIST)list1); + hn1 = (P)ARG0(data1); + // HP(I+) = H(I)-t^d*H(I:new), d=tdeg(new) + makevar("t",&tv); UTOZ(new->td,dz); + pwrp(CO,tv,dz,&td); + mulp(CO,hn1,td,&s); + subp(CO,hn,s,&newhn); + mhp_to_hf(CO,newhn,n,plist,&newhfhead,&newhpoly); + nd = mknode(5,newhn,ARG1(data),newhfhead,newhpoly,(VECT)ARG4(data)); + MKLIST(list,nd); + *rp = list; +} + void Pdp_compute_last_t(NODE arg,LIST *rp) { NODE g,gh,homo,n; @@ -809,6 +905,19 @@ void Pdp_cont(NODE arg,Z *rp) dp_cont((DP)ARG0(arg),rp); } +void dpm_ptozp(DPM p,Z *cont,DPM *r); + +void Pdpm_remove_cont(NODE arg,LIST *rp) +{ + NODE nd; + Z cont; + DPM p; + + dpm_ptozp((DPM)ARG0(arg),&cont,&p); + nd = mknode(2,cont,p); + MKLIST(*rp,nd); +} + void Pdp_dtov(NODE arg,VECT *rp) { dp_dtov((DP)ARG0(arg),rp); @@ -929,7 +1038,7 @@ void Pdp_ord(NODE arg,Obj *rp) else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) ) error("dp_ord : invalid order specification"); initd(spec); *rp = spec->obj; - if ( spec->id >= 256 ) dpm_ordtype = spec->ispot; + if ( spec->id >= 256 ) dpm_ordtype = spec->module_ordtype; } } @@ -1094,7 +1203,7 @@ void Pdpm_dptodpm(NODE arg,DPM *rp) { DP p; MP mp; - int pos; + int pos,shift; DMM m0,m; p = (DP)ARG0(arg); @@ -1106,7 +1215,15 @@ void Pdpm_dptodpm(NODE arg,DPM *rp) for ( m0 = 0, mp = BDY(p); mp; mp = NEXT(mp) ) { NEXTDMM(m0,m); m->dl = mp->dl; m->c = mp->c; m->pos = pos; } - MKDPM(p->nv,m0,*rp); (*rp)->sugar = p->sugar; + if ( dp_current_spec->module_top_weight ) { + if ( pos > dp_current_spec->module_rank ) + error("dpm_dptodpm : inconsistent order spec"); + shift = dp_current_spec->module_top_weight[pos-1]; + m->dl->td += shift; + } else + shift = 0; + + MKDPM(p->nv,m0,*rp); (*rp)->sugar = p->sugar+shift; } } @@ -1256,6 +1373,21 @@ void Pdp_mod(NODE arg,DP *rp) dp_mod(p,mod,subst,rp); } +void dpm_mod(DPM,int,DPM *); + +void Pdpm_mod(NODE arg,DPM *rp) +{ + DPM p; + int mod; + NODE subst; + + asir_assert(ARG0(arg),O_DP,"dp_mod"); + asir_assert(ARG1(arg),O_N,"dp_mod"); + p = (DPM)ARG0(arg); mod = ZTOS((Q)ARG1(arg)); + dpm_mod(p,mod,rp); +} + + void Pdp_rat(NODE arg,DP *rp) { asir_assert(ARG0(arg),O_DP,"dp_rat"); @@ -1332,6 +1464,7 @@ void Pdpm_nf(NODE arg,DPM *rp) } DP *dpm_nf_and_quotient(NODE b,DPM g,VECT ps,DPM *rp,P *dnp); +DPM dpm_nf_and_quotient2(NODE b,DPM g,VECT ps,DPM *rp,P *dnp); void Pdpm_nf_and_quotient(NODE arg,LIST *rp) { @@ -1366,6 +1499,36 @@ void Pdpm_nf_and_quotient(NODE arg,LIST *rp) MKLIST(*rp,n); } +void Pdpm_nf_and_quotient2(NODE arg,LIST *rp) +{ + NODE b; + VECT ps; + DPM g,nm,q; + P dn; + NODE n; + int ac; + + do_weyl = 0; dp_fcoeffs = 0; + ac = argc(arg); + if ( ac < 2 ) + error("dpm_nf_and_quotient2 : invalid arguments"); + else if ( ac == 2 ) { + asir_assert(ARG1(arg),O_VECT,"dpm_nf_and_quotient2"); + b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg); + } else if ( ac == 3 ) { + asir_assert(ARG0(arg),O_LIST,"dpm_nf_and_quotient2"); + asir_assert(ARG2(arg),O_VECT,"dpm_nf_and_quotient2"); + b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg); + } + if ( g ) { + q = dpm_nf_and_quotient2(b,g,ps,&nm,&dn); + } else { + q = 0; nm = 0; dn = (P)ONE; + } + n = mknode(3,nm,dn,q); + MKLIST(*rp,n); +} + void Pdpm_weyl_nf(NODE arg,DPM *rp) { NODE b; @@ -1877,24 +2040,78 @@ void Pdpm_redble(NODE arg,Z *rp) } void dpm_schreyer_base(LIST g,LIST *s); +void dpm_schreyer_base_zlist(LIST g,LIST *s); void Pdpm_schreyer_base(NODE arg,LIST *rp) { asir_assert(ARG0(arg),O_LIST,"dpm_schreyer_base"); - dpm_schreyer_base((LIST)ARG0(arg),rp); + dpm_schreyer_base_zlist((LIST)ARG0(arg),rp); } -void dpm_simplify_syz(LIST m,LIST s,LIST *m1,LIST *s1); +void dpm_list_to_array(LIST g,VECT *psv,VECT *psiv); +void Pdpm_list_to_array(NODE arg,LIST *rp) +{ + VECT psv,psiv; + NODE nd; + + asir_assert(ARG0(arg),O_LIST,"dpm_list_to_array"); + dpm_list_to_array((LIST)ARG0(arg),&psv,&psiv); + nd = mknode(2,psv,psiv); + MKLIST(*rp,nd); +} + +/* [quo,nf] = dpm_sp_nf(psv,psiv,i,j,top) */ +DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,int top,DPM *nf); + +void Pdpm_sp_nf(NODE arg,LIST *rp) +{ + VECT psv,psiv; + DPM quo,nf; + Obj val; + int i,j,top; + NODE nd; + + asir_assert(ARG0(arg),O_VECT,"dpm_sp_nf"); psv = (VECT)ARG0(arg); + asir_assert(ARG1(arg),O_VECT,"dpm_sp_nf"); psiv = (VECT)ARG1(arg); + asir_assert(ARG2(arg),O_N,"dpm_sp_nf"); i = ZTOS((Q)ARG2(arg)); + asir_assert(ARG3(arg),O_N,"dpm_sp_nf"); j = ZTOS((Q)ARG3(arg)); + if ( get_opt("top",&val) && val ) + top = 1; + else + top = 0; + quo = dpm_sp_nf_zlist(psv,psiv,i,j,top,&nf); + nd = mknode(2,quo,nf); + MKLIST(*rp,nd); +} + +void dpm_insert_to_zlist(VECT psiv,int pos,int i); + +/* insert_to_zlist(indarray,dpm_hp(f),i) */ +void Pdpm_insert_to_zlist(NODE arg,VECT *rp) +{ + VECT psiv; + int i,pos; + + asir_assert(ARG0(arg),O_VECT,"dpm_insert_to_zlist"); psiv = (VECT)ARG0(arg); + asir_assert(ARG1(arg),O_N,"dpm_insert_to_zlist"); pos = ZTOS((Q)ARG1(arg)); + asir_assert(ARG2(arg),O_N,"dpm_insert_to_zlist"); i = ZTOS((Q)ARG2(arg)); + dpm_insert_to_zlist(psiv,pos,i); + *rp = psiv; +} + + +void dpm_simplify_syz(LIST m,LIST s,LIST *m1,LIST *s1,LIST *w1); + void Pdpm_simplify_syz(NODE arg,LIST *rp) { - LIST s1,m1; + LIST s1,m1,w1; NODE t; asir_assert(ARG0(arg),O_LIST,"dpm_simplify_syz"); asir_assert(ARG1(arg),O_LIST,"dpm_simplify_syz"); - dpm_simplify_syz((LIST)ARG0(arg),(LIST)ARG1(arg),&s1,&m1); - t = mknode(2,s1,m1); + dpm_simplify_syz((LIST)ARG0(arg),(LIST)ARG1(arg),&s1,&m1,&w1); + t = mknode(3,s1,m1,w1); MKLIST(*rp,t); } @@ -2182,6 +2399,17 @@ void Pdp_td(NODE arg,Z *rp) STOZ(BDY(p)->dl->td,*rp); } +void Pdpm_td(NODE arg,Z *rp) +{ + DPM p; + + p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_td"); + if ( !p ) + *rp = 0; + else + STOZ(BDY(p)->dl->td,*rp); +} + void Pdp_sugar(NODE arg,Z *rp) { DP p; @@ -2422,6 +2650,22 @@ void Pdp_dehomo(NODE arg,DP *rp) dp_dehomo((DP)ARG0(arg),rp); } +void dpm_homo(DPM a,DPM *b); +void dpm_dehomo(DPM a,DPM *b); + +void Pdpm_homo(NODE arg,DPM *rp) +{ + asir_assert(ARG0(arg),O_DPM,"dpm_homo"); + dpm_homo((DPM)ARG0(arg),rp); +} + +void Pdpm_dehomo(NODE arg,DPM *rp) +{ + asir_assert(ARG0(arg),O_DPM,"dpm_dehomo"); + dpm_dehomo((DPM)ARG0(arg),rp); +} + + void Pdp_gr_flags(NODE arg,LIST *rp) { Obj name,value; @@ -2860,6 +3104,140 @@ void Pnd_gr(NODE arg,LIST *rp) nd_gr(f,v,m,homo,retdp,0,ord,rp); } +void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int f4,struct order_spec *ord,LIST *rp); + +void Pnd_sba(NODE arg,LIST *rp) +{ + LIST f,v; + int m,homo,retdp,ac; + Obj val; + Z mq,z; + Num nhomo; + NODE node; + struct order_spec *ord,*current_spec; + + current_spec = dp_current_spec; + do_weyl = 0; + retdp = 0; + if ( (ac=argc(arg)) == 4 ) { + asir_assert(ARG0(arg),O_LIST,"nd_sba"); + asir_assert(ARG1(arg),O_LIST,"nd_sba"); + asir_assert(ARG2(arg),O_N,"nd_sba"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + mq = (Z)ARG2(arg); + STOZ(0x40000000,z); + if ( cmpz(mq,z) >= 0 ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = ZTOS(mq); + create_order_spec(0,ARG3(arg),&ord); + homo = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = ZTOS((Q)nhomo); + if ( get_opt("dp",&val) && val ) retdp = 1; + } else + error("nd_gr : invalid argument"); + nd_sba(f,v,m,homo,retdp,0,ord,rp); + initd(current_spec); +} + +void Pnd_weyl_sba(NODE arg,LIST *rp) +{ + LIST f,v; + int m,homo,retdp,ac; + Obj val; + Z mq,z; + Num nhomo; + NODE node; + struct order_spec *ord; + + do_weyl = 1; + retdp = 0; + if ( (ac=argc(arg)) == 4 ) { + asir_assert(ARG0(arg),O_LIST,"nd_sba"); + asir_assert(ARG1(arg),O_LIST,"nd_sba"); + asir_assert(ARG2(arg),O_N,"nd_sba"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; do_weyl = 0; return; + } + mq = (Z)ARG2(arg); + STOZ(0x40000000,z); + if ( cmpz(mq,z) >= 0 ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = ZTOS(mq); + create_order_spec(0,ARG3(arg),&ord); + homo = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = ZTOS((Q)nhomo); + if ( get_opt("dp",&val) && val ) retdp = 1; + } else + error("nd_gr : invalid argument"); + nd_sba(f,v,m,homo,retdp,0,ord,rp); + do_weyl = 0; +} + +void Pnd_sba_f4(NODE arg,LIST *rp) +{ + LIST f,v; + int m,homo,retdp,ac; + Obj val; + Z mq,z; + Num nhomo; + NODE node; + struct order_spec *ord; + + do_weyl = 0; + retdp = 0; + if ( (ac=argc(arg)) == 4 ) { + asir_assert(ARG0(arg),O_LIST,"nd_sba"); + asir_assert(ARG1(arg),O_LIST,"nd_sba"); + asir_assert(ARG2(arg),O_N,"nd_sba"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + f = remove_zero_from_list(f); + if ( !BDY(f) ) { + *rp = f; return; + } + mq = (Z)ARG2(arg); + STOZ(0x40000000,z); + if ( cmpz(mq,z) >= 0 ) { + node = mknode(1,mq); + Psetmod_ff(node,&val); + m = -2; + } else + m = ZTOS(mq); + create_order_spec(0,ARG3(arg),&ord); + homo = 0; + if ( get_opt("homo",&val) && val ) homo = 1; + if ( get_opt("dp",&val) && val ) retdp = 1; + } else if ( ac == 1 ) { + f = (LIST)ARG0(arg); + parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); + homo = ZTOS((Q)nhomo); + if ( get_opt("dp",&val) && val ) retdp = 1; + } else + error("nd_gr : invalid argument"); + nd_sba(f,v,m,homo,retdp,1,ord,rp); +} + void Pnd_gr_postproc(NODE arg,LIST *rp) { LIST f,v; @@ -3920,20 +4298,88 @@ void Pdpv_ord(NODE arg,Obj *rp) } extern int dpm_ordtype; +extern DMMstack dmm_stack; void set_schreyer_order(LIST n); -LIST schreyer_obj; - void Pdpm_set_schreyer(NODE arg,LIST *rp) { if ( argc(arg) ) { - schreyer_obj = (LIST)ARG0(arg); - set_schreyer_order(schreyer_obj); + set_schreyer_order(ARG0(arg)?(LIST)ARG0(arg):0); } - *rp = schreyer_obj; + if ( dmm_stack ) + *rp = dmm_stack->obj; + else + *rp = 0; } +DMMstack_array Schreyer_Frame; +DMMstack_array dpm_schreyer_frame(NODE n,int lex); +void set_schreyer_level(DMMstack_array array,int level); + +void Pdpm_set_schreyer_level(NODE arg,Q *rp) +{ + set_schreyer_level(Schreyer_Frame,ZTOS((Q)ARG0(arg))); + *rp = (Q)ARG0(arg); +} + +void Pdpm_schreyer_frame(NODE arg,LIST *rp) +{ + DMMstack_array a; + DMMstack *body; + DMM *in,*sum; + DPM f,s; + NODE b,b1,nd; + LIST l; + VECT v; + Z lev,deg,ind; + int len,i,nv,rank,j,lex; + NODE tt,p; + char *key; + Obj value; + + lex = 0; + 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,"lex") ) + lex = value!=0?1:0; + else { + error("dpm_schreyer_frame: unknown option."); + } + } + } + Schreyer_Frame = a = dpm_schreyer_frame(BDY((LIST)ARG0(arg)),lex); + len = a->len; + body = a->body; + /* XXX */ + nv = ((DPM)BDY(BDY((LIST)body[0]->obj)))->nv; + b = 0; + for ( i = 0; i < len; i++ ) { + rank = body[i]->rank; + in = body[i]->in; + sum = body[i]->sum; + MKVECT(v,rank+1); + STOZ(i+1,lev); + for ( j = 1; j <= rank; j++ ) { + MKDPM(nv,in[j],f); f->sugar = in[j]->dl->td; + MKDPM(nv,sum[j],s);s->sugar = sum[j]->dl->td; + STOZ(s->sugar,deg); + STOZ(j,ind); + nd = mknode(5,f,s,ind,lev,deg); + MKLIST(l,nd); + BDY(v)[j] = (pointer)l; + } + MKNODE(b1,(pointer)v,b); + b = b1; + } + MKLIST(l,b); + *rp = l; +} + + void Pdpm_hm(NODE arg,DPM *rp) { DPM p; @@ -3992,10 +4438,11 @@ void Pdpm_sort(NODE arg,DPM *rp) p = (DPM)ARG0(arg); if ( !p ) *rp = 0; - dpm_sort(p,rp); + else dpm_sort(p,rp); } void dpm_split(DPM p,int s,DPM *up,DPM *lo); +void dpm_extract(DPM p,int s,DP *r); void Pdpm_split(NODE arg,LIST *rp) { @@ -4008,6 +4455,16 @@ void Pdpm_split(NODE arg,LIST *rp) dpm_split(p,s,&up,&lo); nd = mknode(2,up,lo); MKLIST(*rp,nd); +} + +void Pdpm_extract(NODE arg,DP *rp) +{ + DPM p; + int s; + + p = (DPM)ARG0(arg); + s = ZTOS((Z)ARG1(arg)); + dpm_extract(p,s,rp); }