=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp.c,v retrieving revision 1.1 retrieving revision 1.11 diff -u -p -r1.1 -r1.11 --- OpenXM_contrib2/asir2018/builtin/dp.c 2018/09/19 05:45:05 1.1 +++ OpenXM_contrib2/asir2018/builtin/dp.c 2019/09/04 01:12:02 1.11 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM$ + * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.10 2019/08/28 23:27:33 noro Exp $ */ #include "ca.h" #include "base.h" @@ -61,6 +61,7 @@ extern int nd_rref2; int do_weyl; +void Pdp_monomial_hilbert_poincare(); void Pdp_sort(); void Pdp_mul_trunc(),Pdp_quo(); void Pdp_ord(), Pdp_ptod(), Pdp_dtop(), Phomogenize(); @@ -88,8 +89,9 @@ 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_ord(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(); -void Pdpm_hm(),Pdpm_ht(),Pdpm_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(); void Pdp_weyl_red(); void Pdp_weyl_sp(); @@ -156,9 +158,10 @@ struct ftab dp_tab[] = { {"dp_nf",Pdp_nf,4}, {"dp_nf_mod",Pdp_nf_mod,5}, {"dp_nf_f",Pdp_nf_f,4}, - {"dpm_nf_f",Pdpm_nf_f,4}, - {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,4}, - {"dpm_nf",Pdpm_nf,4}, + {"dpm_nf_and_quotient",Pdpm_nf_and_quotient,-3}, + {"dpm_nf_f",Pdpm_nf_f,-4}, + {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,-4}, + {"dpm_nf",Pdpm_nf,-4}, {"dpm_sp",Pdpm_sp,2}, {"dpm_weyl_sp",Pdpm_weyl_sp,2}, @@ -214,7 +217,7 @@ struct ftab dp_tab[] = { /* normal form */ {"dp_weyl_nf",Pdp_weyl_nf,4}, - {"dpm_weyl_nf",Pdpm_weyl_nf,4}, + {"dpm_weyl_nf",Pdpm_weyl_nf,-4}, {"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5}, {"dp_weyl_nf_f",Pdp_weyl_nf_f,4}, @@ -233,6 +236,9 @@ struct ftab dp_tab[] = { {"dp_weyl_f4_main",Pdp_weyl_f4_main,3}, {"dp_weyl_f4_mod_main",Pdp_weyl_f4_mod_main,4}, + /* Hilbert function */ + {"dp_monomial_hilbert_poincare",Pdp_monomial_hilbert_poincare,2}, + /* misc */ {"dp_inv_or_split",Pdp_inv_or_split,3}, {"dp_set_weight",Pdp_set_weight,-1}, @@ -248,7 +254,7 @@ struct ftab dp_supp_tab[] = { /* setting flags */ {"dp_sort",Pdp_sort,1}, {"dp_ord",Pdp_ord,-1}, - {"dpm_ord",Pdpm_ord,-1}, + {"dpm_set_schreyer",Pdpm_set_schreyer,-1}, {"dpv_ord",Pdpv_ord,-2}, {"dp_set_kara",Pdp_set_kara,-1}, {"dp_nelim",Pdp_nelim,-1}, @@ -270,6 +276,7 @@ struct ftab dp_supp_tab[] = { {"dp_ltod",Pdp_ltod,-2}, {"dpm_ltod",Pdpm_ltod,2}, + {"dpm_dptodpm",Pdpm_dptodpm,2}, {"dpm_dtol",Pdpm_dtol,3}, /* criteria */ @@ -289,6 +296,11 @@ struct ftab dp_supp_tab[] = { {"dpm_hm",Pdpm_hm,1}, {"dpm_ht",Pdpm_ht,1}, {"dpm_hc",Pdpm_hc,1}, + {"dpm_hp",Pdpm_hp,1}, + {"dpm_rest",Pdpm_rest,1}, + {"dpm_shift",Pdpm_shift,2}, + {"dpm_split",Pdpm_split,2}, + {"dpm_sort",Pdpm_sort,1}, {"dp_rest",Pdp_rest,1}, {"dp_initial_term",Pdp_initial_term,1}, {"dp_order",Pdp_order,1}, @@ -303,6 +315,7 @@ struct ftab dp_supp_tab[] = { /* misc */ {"dp_mbase",Pdp_mbase,1}, {"dp_redble",Pdp_redble,2}, + {"dpm_redble",Pdpm_redble,2}, {"dp_sep",Pdp_sep,2}, {"dp_idiv",Pdp_idiv,2}, {"dp_tdiv",Pdp_tdiv,2}, @@ -312,6 +325,7 @@ struct ftab dp_supp_tab[] = { {"dp_compute_essential_df",Pdp_compute_essential_df,2}, {"dp_mono_raddec",Pdp_mono_raddec,2}, {"dp_mono_reduce",Pdp_mono_reduce,2}, + {"dpm_schreyer_base",Pdpm_schreyer_base,1}, {"dp_rref2",Pdp_rref2,2}, {"sumi_updatepairs",Psumi_updatepairs,3}, @@ -323,6 +337,321 @@ struct ftab dp_supp_tab[] = { 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); +int comp_by_tdeg(DP *a,DP *b) +{ + int da,db; + + da = BDY(*a)->dl->td; + db = BDY(*b)->dl->td; + if ( da>db ) return 1; + else if ( dad[i]); + printf(">>\n"); +} + +int simple_check(VECT b,int nv) +{ + int n,i,j; + DL *p; + + n = b->len; p = (DL *)b->body; + for ( i = 0; i < n; i++ ) { + for ( j = 0; j < nv; j++ ) { + if ( p[i]->d[j] ) break; + } + if ( p[i]->d[j] != p[i]->td ) return 0; + } + return 1; +} + +void make_reduced(VECT b,int nv) +{ + int n,i,j; + DL *p; + DL pi; + + n = b->len; + p = (DL *)BDY(b); + for ( i = 0; i < n; i++ ) { + pi = p[i]; + if ( !pi ) continue; + for ( j = 0; j < n; j++ ) + if ( i != j && p[j] && _dl_redble(pi,p[j],nv) ) p[j] = 0; + } + for ( i = j = 0; i < n; i++ ) + if ( p[i] ) p[j++] = p[i]; + b->len = j; +} + +void make_reduced2(VECT b,int k,int nv) +{ + int n,i,j,l; + DL *p; + DL pi; + + n = b->len; + p = (DL *)BDY(b); + for ( i = l = k; i < n; i++ ) { + pi = p[i]; + for ( j = 0; j < k; j++ ) + if ( _dl_redble(p[j],pi,nv) ) break; + if ( j == k ) + p[l++] = pi; + } + b->len = l; +} + +int i_all,i_simple; + +P mhp_simple(VECT b,VECT x,P t) +{ + int n,i,j,nv; + DL *p; + P hp,mt,s,w; + Z z; + + n = b->len; nv = x->len; p = (DL *)BDY(b); + hp = (P)ONE; + for ( i = 0; i < n; i++ ) { + for ( j = 0; j < nv; j++ ) + if ( p[i]->d[j] ) break; + STOZ(p[i]->d[j],z); + chsgnp(t,&mt); mt->dc->d =z; + addp(CO,mt,(P)ONE,&s); mulp(CO,hp,s,&w); hp = w; + } + return hp; +} + +struct oEGT eg_comp; + +void mhp_rec(VECT b,VECT x,P t,P *r) +{ + int n,i,j,k,l,i2,nv,len; + int *d; + Z mone,z; + DCP dc,dc1; + P s; + P *r2; + DL *p,*q; + DL pi,xj,d1; + VECT c; +struct oEGT eg0,eg1; + + i_all++; + n = b->len; nv = x->len; p = (DL *)BDY(b); + if ( !n ) { + r[0] = (P)ONE; + return; + } + if ( n == 1 && p[0]->td == 0 ) + return; + for ( i = 0; i < n; i++ ) + if ( p[i]->td > 1 ) break; + if ( i == n ) { + r[n] = (P)ONE; + return; + } +#if 0 + if ( simple_check(b,nv) ) { + i_simple++; + r[0] = mhp_simple(b,x,t); + return; + } +#endif + for ( j = 0, d = p[i]->d; j < nv; j++ ) + if ( d[j] ) break; + xj = BDY(x)[j]; + MKVECT(c,n); q = (DL *)BDY(c); + for ( i = k = l = 0; i < n; i++ ) + if ( p[i]->d[j] ) { + pi = p[i]; + NEWDL(d1,nv); d1->td =pi->td - 1; + memcpy(d1->d,pi->d,nv*sizeof(int)); + d1->d[j]--; + p[k++] = d1; + } else + q[l++] = p[i]; + for ( i = k, i2 = 0; i2 < l; i++, i2++ ) + p[i] = q[i2]; + /* b=(b[0]/xj,...,b[k-1]/xj,b[k],...b[n-1]) where + b[0],...,b[k-1] are divisible by k */ + make_reduced2(b,k,nv); + mhp_rec(b,x,t,r); + /* c = (b[0],...,b[l-1],xj) */ + q[l] = xj; c->len = l+1; + r2 = (P *)CALLOC(nv+1,sizeof(P)); + mhp_rec(c,x,t,r2); +// get_eg(&eg0); + for ( i = 0; i <= nv; i++ ) { + mulp(CO,r[i],t,&s); addp(CO,s,r2[i],&r[i]); + } +// get_eg(&eg1); add_eg(&eg_comp,&eg0,&eg1); +} + +/* (n+a)Cb as a polynomial of n; return (n+a)*...*(n+a-b+1) */ + +P binpoly(P n,int a,int b) +{ + Z z; + P s,r,t; + int i; + + STOZ(a,z); addp(CO,n,(P)z,&s); r = (P)ONE; + for ( i = 0; i < b; i++ ) { + mulp(CO,r,s,&t); r = t; + subp(CO,s,(P)ONE,&t); s = t; + } + return r; +} + +void ibin(unsigned long int n,unsigned long int k,Z *r); + +void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P *hf) +{ + P tv,gcd,q,h,hphead,tt,ai,hpoly,nv,bp,w; + Z d,z; + DCP dc,topdc; + VECT hfhead; + int i,s,qd; + + if ( !hp ) { + MKVECT(hfhead,0); *head = hfhead; + *hf = 0; + } else { + makevar("t",&tv); + ezgcdp(CO,hp,plist[n],&gcd); + if ( NUM(gcd) ) { + s = n; + q = hp; + } else { + s = n-ZTOS(DEG(DC(gcd))); + divsp(CO,hp,plist[n-s],&q); + } + if ( NUM(q) ) qd = 0; + else qd = ZTOS(DEG(DC(q))); + if ( s == 0 ) { + MKVECT(hfhead,qd+1); + for ( i = 0; i <= qd; i++ ) { + coefp(q,i,(P *)&BDY(hfhead)[i]); + } + *head = hfhead; + *hf = 0; + } else { + if ( qd ) { + topdc = 0; + for ( i = 0; i < qd; i++ ) { + NEWDC(dc); NEXT(dc) = topdc; + ibin(i+s-1,s-1,(Z *)&COEF(dc)); + STOZ(i,d); DEG(dc) = d; + topdc = dc; + } + MKP(VR(tv),topdc,h); + mulp(CO,h,q,&hphead); + } + MKVECT(hfhead,qd); + for ( i = 0; i < qd; i++ ) + coefp(hphead,i,(P *)&BDY(hfhead)[i]); + *head = hfhead; + hpoly = 0; + makevar("n",&nv); + for ( i = 0; i <= qd; i++ ) { + coefp(q,i,&ai); + bp = binpoly(nv,s-i-1,s-1); + mulp(CO,ai,bp,&tt); + addp(CO,hpoly,tt,&w); + hpoly = w; + } + if ( s > 2 ) { + factorialz(s-1,&z); + divsp(CO,hpoly,(P)z,&tt); hpoly = tt; + } + *hf = hpoly; + for ( i = qd-1; i >= 0; i-- ) { + UTOZ(i,z); + substp(CO,hpoly,VR(nv),(P)z,&tt); + if ( cmpz((Z)tt,(Z)BDY(hfhead)[i]) ) break; + } + hfhead->len = i+1; + } + } +} + +/* create (1,1-t,...,(1-t)^n) */ + +P *mhp_prep(int n,P *tv) { + P *plist; + P mt,t1; + int i; + + plist = (P *)MALLOC((n+1)*sizeof(P)); + /* t1 = 1-t */ + makevar("t",tv); chsgnp(*tv,&mt); addp(CO,mt,(P)ONE,&t1); + for ( plist[0] = (P)ONE, i = 1; i <= n; i++ ) + mulp(CO,plist[i-1],t1,&plist[i]); + return plist; +} + +P mhp_ctop(P *r,P *plist,int n) +{ + int i; + P hp,u,w; + + for ( hp = 0, i = 0; i <= n; i++ ) { + mulp(CO,plist[i],r[i],&u); addp(CO,u,hp,&w); hp = w; + } + return hp; +} + +void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp) +{ + LIST g,v; + VL vl; + int m,n,i; + VECT b,x,hfhead; + NODE t,nd; + Z z,den; + P hp,tv,mt,t1,u,w,hpoly; + DP a; + DL *p; + P *plist,*r; + Obj val; + + i_simple = i_all = 0; + g = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + pltovl(v,&vl); + m = length(BDY(g)); MKVECT(b,m); p = (DL *)BDY(b); + for ( t = BDY(g), i = 0; t; t = NEXT(t), i++ ) { + if ( !BDY(t) ) + p[i] = 0; + else { + ptod(CO,vl,(P)BDY(t),&a); p[i] = BDY(a)->dl; + } + } + n = length(BDY(v)); MKVECT(x,n); p = (DL *)BDY(x); + 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); +} + void Pdp_compute_last_t(NODE arg,LIST *rp) { NODE g,gh,homo,n; @@ -362,20 +691,20 @@ void Pdp_compute_last_w(NODE arg,LIST *rp) row2 = w2->row; if ( w ) { v = W_ALLOC(n); - for ( i = 0; i < n; i++ ) v[i] = QTOS((Q)w->body[i]); + for ( i = 0; i < n; i++ ) v[i] = ZTOS((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]); + for ( j = 0; j < n; j++ ) m1[i][j] = ZTOS((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]); + for ( j = 0; j < n; j++ ) m2[i][j] = ZTOS((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; + STOZ(v[i],q); rv->body[i] = (pointer)q; } MKLIST(l,r); r = mknode(2,rv,l); @@ -452,7 +781,7 @@ void Pdp_sep(NODE arg,VECT *rp) pointer *pv; p = (DP)ARG0(arg); m = BDY(p); - d = QTOS((Q)ARG1(arg)); + d = ZTOS((Q)ARG1(arg)); for ( t = m, n = 0; t; t = NEXT(t), n++ ); if ( d > n ) d = n; @@ -506,7 +835,7 @@ void Pdp_etov(NODE arg,VECT *rp) n = dp->nv; d = BDY(dp)->dl->d; MKVECT(v,n); for ( i = 0; i < n; i++ ) { - STOQ(d[i],t); v->body[i] = (pointer)t; + STOZ(d[i],t); v->body[i] = (pointer)t; } *rp = v; } @@ -525,7 +854,7 @@ void Pdp_vtoe(NODE arg,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 += MUL_WEIGHT(d[i],i); + d[i] = ZTOS((Q)(v->body[i])); td += MUL_WEIGHT(d[i],i); } dl->td = td; NEWMP(m); m->dl = dl; m->c = (Obj)ONE; NEXT(m) = 0; @@ -543,7 +872,7 @@ void Pdp_lnf_mod(NODE arg,LIST *rp) asir_assert(ARG1(arg),O_LIST,"dp_lnf_mod"); asir_assert(ARG2(arg),O_N,"dp_lnf_mod"); b = BDY((LIST)ARG0(arg)); g = BDY((LIST)ARG1(arg)); - mod = QTOS((Q)ARG2(arg)); + mod = ZTOS((Q)ARG2(arg)); dp_lnf_mod((DP)BDY(b),(DP)BDY(NEXT(b)),g,mod,&r1,&r2); NEWNODE(n); BDY(n) = (pointer)r1; NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)r2; @@ -570,7 +899,7 @@ void Pdp_nf_tab_mod(NODE arg,DP *rp) asir_assert(ARG1(arg),O_VECT,"dp_nf_tab_mod"); asir_assert(ARG2(arg),O_N,"dp_nf_tab_mod"); dp_nf_tab_mod((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)), - QTOS((Q)ARG2(arg)),rp); + ZTOS((Q)ARG2(arg)),rp); } void Pdp_nf_tab_f(NODE arg,DP *rp) @@ -580,6 +909,8 @@ void Pdp_nf_tab_f(NODE arg,DP *rp) dp_nf_tab_f((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)),rp); } +extern int dpm_ordtype; + void Pdp_ord(NODE arg,Obj *rp) { struct order_spec *spec; @@ -597,6 +928,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; } } @@ -747,7 +1079,7 @@ void Pdpm_ltod(NODE arg,DPM *rp) nd = BDY(f); len = length(nd); - for ( i = 0, t = nd, s = 0; i < len; i++, t = NEXT(t) ) { + for ( i = 1, t = nd, s = 0; i <= len; i++, t = NEXT(t) ) { ptod(CO,vl,(P)BDY(t),&d); dtodpm(d,i,&u); adddpm(CO,s,u,&w); s = w; @@ -755,6 +1087,28 @@ void Pdpm_ltod(NODE arg,DPM *rp) *rp = s; } +// c*[monomial,i]+... -> c*<>+... + +void Pdpm_dptodpm(NODE arg,DPM *rp) +{ + DP p; + MP mp; + int pos; + DMM m0,m; + + p = (DP)ARG0(arg); + pos = ZTOS((Z)ARG1(arg)); + if ( pos <= 0 ) + error("dpm_mtod : position must be positive"); + if ( !p ) *rp = 0; + else { + 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; + } +} + void Pdpm_dtol(NODE arg,LIST *rp) { DPM a; @@ -779,7 +1133,7 @@ void Pdpm_dtol(NODE arg,LIST *rp) } if ( vl ) NEXT(tvl) = 0; - n = QTOS((Q)ARG2(arg)); + n = ZTOS((Q)ARG2(arg)); w = (MP *)CALLOC(n,sizeof(MP)); for ( t = BDY(a), len = 0; t; t = NEXT(t) ) len++; wa = (DMM *)MALLOC(len*sizeof(DMM)); @@ -891,7 +1245,7 @@ void Pdp_mod(NODE arg,DP *rp) asir_assert(ARG0(arg),O_DP,"dp_mod"); asir_assert(ARG1(arg),O_N,"dp_mod"); asir_assert(ARG2(arg),O_LIST,"dp_mod"); - p = (DP)ARG0(arg); mod = QTOS((Q)ARG1(arg)); + p = (DP)ARG0(arg); mod = ZTOS((Q)ARG1(arg)); subst = BDY((LIST)ARG2(arg)); dp_mod(p,mod,subst,rp); } @@ -948,40 +1302,87 @@ void Pdp_weyl_nf(NODE arg,DP *rp) void Pdpm_nf(NODE arg,DPM *rp) { NODE b; - DPM *ps; + VECT ps; DPM g; - int full; + int ac,full; if ( !(g = (DPM)ARG1(arg)) ) { *rp = 0; return; } do_weyl = 0; dp_fcoeffs = 0; - asir_assert(ARG0(arg),O_LIST,"dpm_nf"); - asir_assert(ARG1(arg),O_DPM,"dpm_nf"); - asir_assert(ARG2(arg),O_VECT,"dpm_nf"); - asir_assert(ARG3(arg),O_N,"dpm_nf"); - b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg)); - full = (Q)ARG3(arg) ? 1 : 0; + ac = argc(arg); + if ( ac < 3 ) + error("dpm_nf: invalid arguments"); + else if ( ac == 3 ) { + asir_assert(ARG1(arg),O_VECT,"dpm_nf"); + b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg); + } else if ( ac == 4 ) { + asir_assert(ARG0(arg),O_LIST,"dpm_nf"); + asir_assert(ARG2(arg),O_VECT,"dpm_nf"); + b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg); + full = (Q)ARG3(arg) ? 1 : 0; + } dpm_nf_z(b,g,ps,full,DP_Multiple,rp); } +DP *dpm_nf_and_quotient(NODE b,DPM g,VECT ps,DPM *rp,P *dnp); + +void Pdpm_nf_and_quotient(NODE arg,LIST *rp) +{ + NODE b; + VECT ps; + DPM g,nm; + P dn; + VECT quo; + NODE n; + int ac; + + do_weyl = 0; dp_fcoeffs = 0; + ac = argc(arg); + if ( ac < 2 ) + error("dpm_nf_and_quotient : invalid arguments"); + else if ( ac == 2 ) { + asir_assert(ARG1(arg),O_VECT,"dpm_nf_and_quotient"); + b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg); + } else if ( ac == 3 ) { + asir_assert(ARG0(arg),O_LIST,"dpm_nf_and_quotient"); + asir_assert(ARG2(arg),O_VECT,"dpm_nf_and_quotient"); + b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg); + } + NEWVECT(quo); quo->len = ps->len; + if ( g ) { + quo->body = (pointer *)dpm_nf_and_quotient(b,g,ps,&nm,&dn); + } else { + quo->body = (pointer *)MALLOC(quo->len*sizeof(pointer)); + nm = 0; dn = (P)ONE; + } + n = mknode(3,nm,dn,quo); + MKLIST(*rp,n); +} + void Pdpm_weyl_nf(NODE arg,DPM *rp) { NODE b; - DPM *ps; + VECT ps; DPM g; - int full; + int ac,full; if ( !(g = (DPM)ARG1(arg)) ) { *rp = 0; return; } - asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf"); - asir_assert(ARG1(arg),O_DPM,"dpm_weyl_nf"); - asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf"); - asir_assert(ARG3(arg),O_N,"dpm_weyl_nf"); - b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg)); - full = (Q)ARG3(arg) ? 1 : 0; - do_weyl = 1; + do_weyl = 1; dp_fcoeffs = 0; + ac = argc(arg); + if ( ac < 3 ) + error("dpm_weyl_nf: invalid arguments"); + else if ( ac == 3 ) { + asir_assert(ARG1(arg),O_VECT,"dpm_nf"); + b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg); + } else if ( ac == 4 ) { + asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf"); + asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf"); + b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg); + full = (Q)ARG3(arg) ? 1 : 0; + } dpm_nf_z(b,g,ps,full,DP_Multiple,rp); do_weyl = 0; } @@ -1032,38 +1433,51 @@ void Pdp_weyl_nf_f(NODE arg,DP *rp) void Pdpm_nf_f(NODE arg,DPM *rp) { NODE b; - DPM *ps; + VECT ps; DPM g; - int full; + int ac,full; if ( !(g = (DPM)ARG1(arg)) ) { *rp = 0; return; } - asir_assert(ARG0(arg),O_LIST,"dpm_nf_f"); - asir_assert(ARG1(arg),O_DPM,"dpm_nf_f"); - asir_assert(ARG2(arg),O_VECT,"dpm_nf_f"); - asir_assert(ARG3(arg),O_N,"dpm_nf_f"); - b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg)); - full = (Q)ARG3(arg) ? 1 : 0; + ac = argc(arg); + if ( ac < 3 ) + error("dpm_nf_f: invalid arguments"); + else if ( ac == 3 ) { + asir_assert(ARG1(arg),O_VECT,"dpm_nf_f"); + b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg); + } else if ( ac == 4 ) { + asir_assert(ARG0(arg),O_LIST,"dpm_nf_f"); + asir_assert(ARG2(arg),O_VECT,"dpm_nf_f"); + b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg); + full = (Q)ARG3(arg) ? 1 : 0; + } + do_weyl = 0; dpm_nf_f(b,g,ps,full,rp); } void Pdpm_weyl_nf_f(NODE arg,DPM *rp) { NODE b; - DPM *ps; + VECT ps; DPM g; - int full; + int ac,full; if ( !(g = (DPM)ARG1(arg)) ) { *rp = 0; return; } - asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf_f"); - asir_assert(ARG1(arg),O_DP,"dpm_weyl_nf_f"); - asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf_f"); - asir_assert(ARG3(arg),O_N,"dpm_weyl_nf_f"); - b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg)); - full = (Q)ARG3(arg) ? 1 : 0; + ac = argc(arg); + if ( ac < 3 ) + error("dpm_weyl_nf_f: invalid arguments"); + else if ( ac == 3 ) { + asir_assert(ARG1(arg),O_VECT,"dpm_weyl_nf_f"); + b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg); + } else if ( ac == 4 ) { + asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf_f"); + asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf_f"); + b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg); + full = (Q)ARG3(arg) ? 1 : 0; + } do_weyl = 1; dpm_nf_f(b,g,ps,full,rp); do_weyl = 0; @@ -1089,10 +1503,10 @@ void Pdp_nf_mod(NODE arg,DP *rp) *rp = 0; return; } b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); - full = QTOS((Q)ARG3(arg)); mod = QTOS((Q)ARG4(arg)); + full = ZTOS((Q)ARG3(arg)); mod = ZTOS((Q)ARG4(arg)); for ( n0 = n = 0; b; b = NEXT(b) ) { NEXTNODE(n0,n); - BDY(n) = (pointer)QTOS((Q)BDY(b)); + BDY(n) = (pointer)ZTOS((Q)BDY(b)); } if ( n0 ) NEXT(n) = 0; @@ -1186,7 +1600,7 @@ void Pdp_true_nf_and_quotient_marked_mod(NODE arg,LIST b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); hps = (DP *)BDY((VECT)ARG3(arg)); - mod = QTOS((Q)ARG4(arg)); + mod = ZTOS((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); } @@ -1248,7 +1662,7 @@ void Pdp_true_nf_marked_mod(NODE arg,LIST *rp) b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); hps = (DP *)BDY((VECT)ARG3(arg)); - mod = QTOS((Q)ARG4(arg)); + mod = ZTOS((Q)ARG4(arg)); dp_true_nf_marked_mod(b,g,ps,hps,mod,&nm,&dn); } n = mknode(2,nm,dn); @@ -1273,10 +1687,10 @@ void Pdp_weyl_nf_mod(NODE arg,DP *rp) *rp = 0; return; } b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); - full = QTOS((Q)ARG3(arg)); mod = QTOS((Q)ARG4(arg)); + full = ZTOS((Q)ARG3(arg)); mod = ZTOS((Q)ARG4(arg)); for ( n0 = n = 0; b; b = NEXT(b) ) { NEXTNODE(n0,n); - BDY(n) = (pointer)QTOS((Q)BDY(b)); + BDY(n) = (pointer)ZTOS((Q)BDY(b)); } if ( n0 ) NEXT(n) = 0; @@ -1304,7 +1718,7 @@ void Pdp_true_nf_mod(NODE arg,LIST *rp) nm = 0; dn = (P)ONEM; } else { b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); - full = QTOS((Q)ARG3(arg)); mod = QTOS((Q)ARG4(arg)); + full = ZTOS((Q)ARG3(arg)); mod = ZTOS((Q)ARG4(arg)); dp_true_nf_mod(b,g,ps,mod,full,&nm,&dn); } NEWNODE(n); BDY(n) = (pointer)nm; @@ -1369,7 +1783,7 @@ void Pdp_weyl_true_nf_and_quotient_marked_mod(NODE arg b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); hps = (DP *)BDY((VECT)ARG3(arg)); - mod = QTOS((Q)ARG4(arg)); + mod = ZTOS((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); } @@ -1446,6 +1860,24 @@ void Pdp_redble(NODE arg,Z *rp) *rp = 0; } +void Pdpm_redble(NODE arg,Z *rp) +{ + asir_assert(ARG0(arg),O_DPM,"dpm_redble"); + asir_assert(ARG1(arg),O_DPM,"dpm_redble"); + if ( dpm_redble((DPM)ARG0(arg),(DPM)ARG1(arg)) ) + *rp = ONE; + else + *rp = 0; +} + +void dpm_schreyer_base(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); +} + void Pdp_red_mod(NODE arg,LIST *rp) { DP h,r; @@ -1457,7 +1889,7 @@ void Pdp_red_mod(NODE arg,LIST *rp) asir_assert(ARG1(arg),O_DP,"dp_red_mod"); asir_assert(ARG2(arg),O_DP,"dp_red_mod"); asir_assert(ARG3(arg),O_N,"dp_red_mod"); - dp_red_mod((DP)ARG0(arg),(DP)ARG1(arg),(DP)ARG2(arg),QTOS((Q)ARG3(arg)), + dp_red_mod((DP)ARG0(arg),(DP)ARG1(arg),(DP)ARG2(arg),ZTOS((Q)ARG3(arg)), &h,&r,&dmy); NEWNODE(n); BDY(n) = (pointer)h; NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)r; @@ -1550,7 +1982,7 @@ void Pdp_weyl_mul_mod(NODE arg,DP *rp) asir_assert(p2,O_DP,"dp_mul_mod"); asir_assert(m,O_N,"dp_mul_mod"); do_weyl = 1; - mulmd(CO,QTOS(m),p1,p2,rp); + mulmd(CO,ZTOS(m),p1,p2,rp); do_weyl = 0; } @@ -1608,25 +2040,47 @@ void Pdp_weyl_sp(NODE arg,DP *rp) do_weyl = 0; } -void Pdpm_sp(NODE arg,DPM *rp) +void Pdpm_sp(NODE arg,Obj *rp) { - DPM p1,p2; + DPM p1,p2,sp; + DP mul1,mul2; + Obj val; + NODE nd; + LIST l; do_weyl = 0; p1 = (DPM)ARG0(arg); p2 = (DPM)ARG1(arg); asir_assert(p1,O_DPM,"dpm_sp"); asir_assert(p2,O_DPM,"dpm_sp"); - dpm_sp(p1,p2,rp); + dpm_sp(p1,p2,&sp,&mul1,&mul2); + if ( get_opt("coef",&val) && val ) { + nd = mknode(3,sp,mul1,mul2); + MKLIST(l,nd); + *rp = (Obj)l; + } else { + *rp = (Obj)sp; + } } -void Pdpm_weyl_sp(NODE arg,DPM *rp) +void Pdpm_weyl_sp(NODE arg,Obj *rp) { - DPM p1,p2; + DPM p1,p2,sp; + DP mul1,mul2; + Obj val; + NODE nd; + LIST l; p1 = (DPM)ARG0(arg); p2 = (DPM)ARG1(arg); asir_assert(p1,O_DPM,"dpm_weyl_sp"); asir_assert(p2,O_DPM,"dpm_weyl_sp"); do_weyl = 1; - dpm_sp(p1,p2,rp); + dpm_sp(p1,p2,&sp,&mul1,&mul2); do_weyl = 0; + if ( get_opt("coef",&val) && val ) { + nd = mknode(3,sp,mul1,mul2); + MKLIST(l,nd); + *rp = (Obj)l; + } else { + *rp = (Obj)sp; + } } void Pdp_sp_mod(NODE arg,DP *rp) @@ -1638,7 +2092,7 @@ void Pdp_sp_mod(NODE arg,DP *rp) p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); asir_assert(p1,O_DP,"dp_sp_mod"); asir_assert(p2,O_DP,"dp_sp_mod"); asir_assert(ARG2(arg),O_N,"dp_sp_mod"); - mod = QTOS((Q)ARG2(arg)); + mod = ZTOS((Q)ARG2(arg)); dp_sp_mod(p1,p2,mod,rp); } @@ -1704,7 +2158,7 @@ void Pdp_td(NODE arg,Z *rp) if ( !p ) *rp = 0; else - STOQ(BDY(p)->dl->td,*rp); + STOZ(BDY(p)->dl->td,*rp); } void Pdp_sugar(NODE arg,Z *rp) @@ -1715,7 +2169,7 @@ void Pdp_sugar(NODE arg,Z *rp) if ( !p ) *rp = 0; else - STOQ(p->sugar,*rp); + STOZ(p->sugar,*rp); } void Pdp_initial_term(NODE arg,Obj *rp) @@ -1783,7 +2237,7 @@ void Pdp_set_sugar(NODE arg,Q *rp) if ( p && q) { asir_assert(p,O_DP,"dp_set_sugar"); asir_assert(q,O_N, "dp_set_sugar"); - i = QTOS(q); + i = ZTOS(q); if (p->sugar < i) { p->sugar = i; } @@ -1832,11 +2286,11 @@ void Pdp_minp(NODE arg,LIST *rp) d = BDY((LIST)ARG0(arg)); minp = (LIST)BDY(d); p = BDY(minp); p = NEXT(NEXT(p)); lcm = (DP)BDY(p); p = NEXT(p); if ( !ARG1(arg) ) { - s = QTOS((Q)BDY(p)); p = NEXT(p); + s = ZTOS((Q)BDY(p)); p = NEXT(p); for ( dd0 = 0, d = NEXT(d); d; d = NEXT(d) ) { tp = BDY((LIST)BDY(d)); tp = NEXT(NEXT(tp)); tlcm = (DP)BDY(tp); tp = NEXT(tp); - ts = QTOS((Q)BDY(tp)); tp = NEXT(tp); + ts = ZTOS((Q)BDY(tp)); tp = NEXT(tp); NEXTNODE(dd0,dd); if ( ts < s ) { BDY(dd) = (pointer)minp; @@ -1874,7 +2328,7 @@ void Pdp_criB(NODE arg,LIST *rp) DL ts,ti,tj,lij,tdl; asir_assert(ARG0(arg),O_LIST,"dp_criB"); d = BDY((LIST)ARG0(arg)); - asir_assert(ARG1(arg),O_N,"dp_criB"); s = QTOS((Q)ARG1(arg)); + asir_assert(ARG1(arg),O_N,"dp_criB"); s = ZTOS((Q)ARG1(arg)); asir_assert(ARG2(arg),O_VECT,"dp_criB"); ps = (DP *)BDY((VECT)ARG2(arg)); if ( !d ) *rp = (LIST)ARG0(arg); @@ -1884,8 +2338,8 @@ void Pdp_criB(NODE arg,LIST *rp) NEWDL(tdl,n); for ( dd = 0; d; d = NEXT(d) ) { ij = BDY((LIST)BDY(d)); - i = QTOS((Q)BDY(ij)); ij = NEXT(ij); - j = QTOS((Q)BDY(ij)); ij = NEXT(ij); + i = ZTOS((Q)BDY(ij)); ij = NEXT(ij); + j = ZTOS((Q)BDY(ij)); ij = NEXT(ij); lij = BDY((DP)BDY(ij))->dl; ti = BDY(ps[i])->dl; tj = BDY(ps[j])->dl; if ( lij->td != lcm_of_DL(n,lij,ts,tdl)->td @@ -1906,9 +2360,9 @@ void Pdp_nelim(NODE arg,Z *rp) { if ( arg ) { asir_assert(ARG0(arg),O_N,"dp_nelim"); - dp_nelim = QTOS((Q)ARG0(arg)); + dp_nelim = ZTOS((Q)ARG0(arg)); } - STOQ(dp_nelim,*rp); + STOZ(dp_nelim,*rp); } void Pdp_mag(NODE arg,Z *rp) @@ -1924,7 +2378,7 @@ void Pdp_mag(NODE arg,Z *rp) else { for ( s = 0, m = BDY(p); m; m = NEXT(m) ) s += p_mag((P)m->c); - STOQ(s,*rp); + STOZ(s,*rp); } } @@ -1978,7 +2432,7 @@ void Pdp_gr_print(NODE arg,Z *rp) if ( arg ) { asir_assert(ARG0(arg),O_N,"dp_gr_print"); q = (Z)ARG0(arg); - s = QTOS(q); + s = ZTOS(q); switch ( s ) { case 0: DP_Print = 0; DP_PrintShort = 0; @@ -1995,9 +2449,9 @@ void Pdp_gr_print(NODE arg,Z *rp) } } else { if ( DP_Print ) { - STOQ(1,q); + STOZ(1,q); } else if ( DP_PrintShort ) { - STOQ(2,q); + STOZ(2,q); } else q = 0; } @@ -2091,13 +2545,13 @@ void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo homo_is_set = 1; } else if ( !strcmp(key,"trace") ) { m = (Z)value; - STOQ(0x80000000,z); + STOZ(0x80000000,z); if ( !m ) *modular = 0; else if ( cmpz(m,z) >= 0 ) error("parse_gr_option : too large modulus"); else - *modular = QTOS(m); + *modular = ZTOS(m); modular_is_set = 1; } else if ( !strcmp(key,"dp") ) { /* XXX : ignore */ @@ -2132,13 +2586,13 @@ void Pdp_gr_main(NODE arg,LIST *rp) v = (LIST)ARG1(arg); homo = (Num)ARG2(arg); m = (Z)ARG3(arg); - STOQ(0x80000000,z); + STOZ(0x80000000,z); if ( !m ) modular = 0; else if ( cmpz(m,z) >= 0 ) error("dp_gr_main : too large modulus"); else - modular = QTOS(m); + modular = ZTOS(m); create_order_spec(0,ARG4(arg),&ord); } else if ( current_option ) parse_gr_option(f,current_option,&v,&homo,&modular,&ord); @@ -2191,7 +2645,7 @@ void Pdp_gr_f_main(NODE arg,LIST *rp) homo = (Num)ARG2(arg); #if 0 asir_assert(ARG3(arg),O_N,"dp_gr_f_main"); - m = QTOS((Q)ARG3(arg)); + m = ZTOS((Q)ARG3(arg)); if ( m ) error("dp_gr_f_main : trace lifting is not implemented yet"); create_order_spec(0,ARG4(arg),&ord); @@ -2243,7 +2697,7 @@ void Pdp_gr_checklist(NODE arg,LIST *rp) 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)); + n = ZTOS((Q)ARG1(arg)); gbcheck_list(BDY((LIST)ARG0(arg)),n,&g,&dp); r = mknode(2,g,dp); MKLIST(*rp,r); @@ -2259,7 +2713,7 @@ void Pdp_f4_mod_main(NODE arg,LIST *rp) 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 = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = ZTOS((Q)ARG2(arg)); f = remove_zero_from_list(f); if ( !BDY(f) ) { *rp = f; return; @@ -2287,7 +2741,7 @@ void Pdp_gr_mod_main(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; return; } - homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg)); + homo = (Num)ARG2(arg); m = ZTOS((Q)ARG3(arg)); if ( !m ) error("dp_gr_mod_main : invalid argument"); create_order_spec(0,ARG4(arg),&ord); @@ -2319,13 +2773,13 @@ void Pnd_f4(NODE arg,LIST *rp) *rp = f; return; } mq = (Z)ARG2(arg); - STOQ((unsigned long)0x40000000,z); + STOZ((unsigned long)0x40000000,z); if ( cmpz(mq,z) >= 0 ) { node = mknode(1,mq); Psetmod_ff(node,&val); m = -2; } else - m = QTOS(mq); + m = ZTOS(mq); create_order_spec(0,ARG3(arg),&ord); homo = 0; if ( get_opt("homo",&val) && val ) homo = 1; @@ -2334,7 +2788,7 @@ void Pnd_f4(NODE arg,LIST *rp) } else if ( ac == 1 ) { f = (LIST)ARG0(arg); parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); - homo = QTOS((Q)nhomo); + homo = ZTOS((Q)nhomo); if ( get_opt("dp",&val) && val ) retdp = 1; if ( get_opt("rref2",&val) && val ) nd_rref2 = 1; } else @@ -2364,13 +2818,13 @@ void Pnd_gr(NODE arg,LIST *rp) *rp = f; return; } mq = (Z)ARG2(arg); - STOQ(0x40000000,z); + STOZ(0x40000000,z); if ( cmpz(mq,z) >= 0 ) { node = mknode(1,mq); Psetmod_ff(node,&val); m = -2; } else - m = QTOS(mq); + m = ZTOS(mq); create_order_spec(0,ARG3(arg),&ord); homo = 0; if ( get_opt("homo",&val) && val ) homo = 1; @@ -2378,7 +2832,7 @@ void Pnd_gr(NODE arg,LIST *rp) } else if ( ac == 1 ) { f = (LIST)ARG0(arg); parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); - homo = QTOS((Q)nhomo); + homo = ZTOS((Q)nhomo); if ( get_opt("dp",&val) && val ) retdp = 1; } else error("nd_gr : invalid argument"); @@ -2404,13 +2858,13 @@ void Pnd_gr_postproc(NODE arg,LIST *rp) *rp = f; return; } mq = (Z)ARG2(arg); - STOQ(0x40000000,z); + STOZ(0x40000000,z); if ( cmpz(mq,z) >= 0 ) { node = mknode(1,mq); Psetmod_ff(node,&val); m = -2; } else - m = QTOS(mq); + m = ZTOS(mq); create_order_spec(0,ARG3(arg),&ord); do_check = ARG4(arg) ? 1 : 0; nd_gr_postproc(f,v,m,ord,do_check,rp); @@ -2427,7 +2881,7 @@ void Pnd_gr_recompute_trace(NODE arg,LIST *rp) 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)); + m = ZTOS((Q)ARG2(arg)); create_order_spec(0,ARG3(arg),&ord); tlist = (LIST)ARG4(arg); nd_gr_recompute_trace(f,v,m,ord,tlist,rp); @@ -2451,18 +2905,18 @@ void Pnd_btog(NODE arg,Obj *rp) asir_assert(ARG2(arg),O_N,"nd_btog"); f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); mq = (Z)ARG2(arg); - STOQ(0x40000000,z); + STOZ(0x40000000,z); if ( cmpz(mq,z) >= 0 ) { node = mknode(1,mq); Psetmod_ff(node,(Obj *)&val); m = -2; } else - m = QTOS(mq); + m = ZTOS(mq); 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)); + pos = ZTOS((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); @@ -2485,7 +2939,7 @@ void Pnd_weyl_gr_postproc(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; do_weyl = 0; return; } - m = QTOS((Q)ARG2(arg)); + m = ZTOS((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); @@ -2496,6 +2950,8 @@ void Pnd_gr_trace(NODE arg,LIST *rp) { LIST f,v; int m,homo,ac; + Obj val; + int retdp; Num nhomo; struct order_spec *ord; @@ -2510,22 +2966,26 @@ void Pnd_gr_trace(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; return; } - homo = QTOS((Q)ARG2(arg)); - m = QTOS((Q)ARG3(arg)); + homo = ZTOS((Q)ARG2(arg)); + m = ZTOS((Q)ARG3(arg)); create_order_spec(0,ARG4(arg),&ord); } else if ( ac == 1 ) { f = (LIST)ARG0(arg); parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); - homo = QTOS((Q)nhomo); + homo = ZTOS((Q)nhomo); } else error("nd_gr_trace : invalid argument"); - nd_gr_trace(f,v,m,homo,0,ord,rp); + retdp = 0; + if ( get_opt("dp",&val) && val ) retdp = 1; + nd_gr_trace(f,v,m,homo,retdp,0,ord,rp); } void Pnd_f4_trace(NODE arg,LIST *rp) { LIST f,v; int m,homo,ac; + int retdp; + Obj val; Num nhomo; struct order_spec *ord; @@ -2540,16 +3000,18 @@ void Pnd_f4_trace(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; return; } - homo = QTOS((Q)ARG2(arg)); - m = QTOS((Q)ARG3(arg)); + homo = ZTOS((Q)ARG2(arg)); + m = ZTOS((Q)ARG3(arg)); create_order_spec(0,ARG4(arg),&ord); } else if ( ac == 1 ) { f = (LIST)ARG0(arg); parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); - homo = QTOS((Q)nhomo); + homo = ZTOS((Q)nhomo); } else error("nd_gr_trace : invalid argument"); - nd_gr_trace(f,v,m,homo,1,ord,rp); + retdp = 0; + if ( get_opt("dp",&val) && val ) retdp = 1; + nd_gr_trace(f,v,m,homo,retdp,1,ord,rp); } void Pnd_weyl_gr(NODE arg,LIST *rp) @@ -2571,7 +3033,7 @@ void Pnd_weyl_gr(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; do_weyl = 0; return; } - m = QTOS((Q)ARG2(arg)); + m = ZTOS((Q)ARG2(arg)); create_order_spec(0,ARG3(arg),&ord); homo = 0; if ( get_opt("homo",&val) && val ) homo = 1; @@ -2579,7 +3041,7 @@ void Pnd_weyl_gr(NODE arg,LIST *rp) } else if ( ac == 1 ) { f = (LIST)ARG0(arg); parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); - homo = QTOS((Q)nhomo); + homo = ZTOS((Q)nhomo); if ( get_opt("dp",&val) && val ) retdp = 1; } else error("nd_weyl_gr : invalid argument"); @@ -2590,7 +3052,8 @@ void Pnd_weyl_gr(NODE arg,LIST *rp) void Pnd_weyl_gr_trace(NODE arg,LIST *rp) { LIST f,v; - int m,homo,ac; + int m,homo,ac,retdp; + Obj val; Num nhomo; struct order_spec *ord; @@ -2605,16 +3068,18 @@ void Pnd_weyl_gr_trace(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; do_weyl = 0; return; } - homo = QTOS((Q)ARG2(arg)); - m = QTOS((Q)ARG3(arg)); + homo = ZTOS((Q)ARG2(arg)); + m = ZTOS((Q)ARG3(arg)); create_order_spec(0,ARG4(arg),&ord); } else if ( ac == 1 ) { f = (LIST)ARG0(arg); parse_gr_option(f,current_option,&v,&nhomo,&m,&ord); - homo = QTOS((Q)nhomo); + homo = ZTOS((Q)nhomo); } else error("nd_weyl_gr_trace : invalid argument"); - nd_gr_trace(f,v,m,homo,0,ord,rp); + retdp = 0; + if ( get_opt("dp",&val) && val ) retdp = 1; + nd_gr_trace(f,v,m,homo,retdp,0,ord,rp); do_weyl = 0; } @@ -2635,7 +3100,7 @@ void Pnd_nf(NODE arg,Obj *rp) } v = (LIST)ARG2(arg); create_order_spec(0,ARG3(arg),&ord); - nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),ord,rp); + nd_nf_p(f,g,v,ZTOS((Q)ARG4(arg)),ord,rp); } void Pnd_weyl_nf(NODE arg,Obj *rp) @@ -2655,7 +3120,7 @@ void Pnd_weyl_nf(NODE arg,Obj *rp) } v = (LIST)ARG2(arg); create_order_spec(0,ARG3(arg),&ord); - nd_nf_p(f,g,v,QTOS((Q)ARG4(arg)),ord,rp); + nd_nf_p(f,g,v,ZTOS((Q)ARG4(arg)),ord,rp); } /* for Weyl algebra */ @@ -2682,13 +3147,13 @@ void Pdp_weyl_gr_main(NODE arg,LIST *rp) v = (LIST)ARG1(arg); homo = (Num)ARG2(arg); m = (Z)ARG3(arg); - STOQ(0x80000000,z); + STOZ(0x80000000,z); if ( !m ) modular = 0; else if ( cmpz(m,z) >= 0 ) error("dp_weyl_gr_main : too large modulus"); else - modular = QTOS(m); + modular = ZTOS(m); create_order_spec(0,ARG4(arg),&ord); } else if ( current_option ) parse_gr_option(f,current_option,&v,&homo,&modular,&ord); @@ -2750,7 +3215,7 @@ void Pdp_weyl_f4_mod_main(NODE arg,LIST *rp) 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 = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = ZTOS((Q)ARG2(arg)); f = remove_zero_from_list(f); if ( !BDY(f) ) { *rp = f; return; @@ -2779,7 +3244,7 @@ void Pdp_weyl_gr_mod_main(NODE arg,LIST *rp) if ( !BDY(f) ) { *rp = f; return; } - homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg)); + homo = (Num)ARG2(arg); m = ZTOS((Q)ARG3(arg)); if ( !m ) error("dp_weyl_gr_mod_main : invalid argument"); create_order_spec(0,ARG4(arg),&ord); @@ -2821,7 +3286,7 @@ void Pdp_set_weight(NODE arg,VECT *rp) 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]); + current_dl_weight_vector[i] = ZTOS((Q)v->body[i]); for ( i = 0; i < n; i++ ) if ( current_dl_weight_vector[i] < 0 ) break; if ( i < n ) @@ -2863,7 +3328,7 @@ void Pdp_set_module_weight(NODE arg,VECT *rp) 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]); + current_module_weight_vector[i] = ZTOS((Q)v->body[i]); *rp = v; } } @@ -2954,7 +3419,7 @@ void Pdp_weyl_set_weight(NODE arg,VECT *rp) n = v->len; current_weyl_weight_vector = (int *)CALLOC(n,sizeof(int)); for ( i = 0; i < n; i++ ) - current_weyl_weight_vector[i] = QTOS((Q)v->body[i]); + current_weyl_weight_vector[i] = ZTOS((Q)v->body[i]); *rp = v; } } @@ -3142,8 +3607,8 @@ NODE sumi_criB(int nv,NODE d,DP *f,int m) r0 = 0; for ( ; d; d = NEXT(d) ) { p = (LIST)BDY(d); - p0 = QTOS((Q)ARG0(BDY(p))); - p1 = QTOS((Q)ARG1(BDY(p))); + p0 = ZTOS((Q)ARG0(BDY(p))); + p1 = ZTOS((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) || @@ -3191,7 +3656,7 @@ NODE sumi_criFMD(int nv,DP *f,int m) if ( k2 < nv ) { NEWMP(mp); mp->dl = l1; C(mp) = (Obj)ONE; NEXT(mp) = 0; MKDP(nv,mp,u); u->sugar = l1->td; - STOQ(i,iq); STOQ(m,mq); + STOZ(i,iq); STOZ(m,mq); nd = mknode(3,iq,mq,u); MKLIST(list,nd); MKNODE(r1,list,r); @@ -3353,10 +3818,10 @@ void Psumi_symbolic(NODE arg,LIST *rp) int q,simp; l = BDY((LIST)ARG0(arg)); - q = QTOS((Q)ARG1(arg)); + q = ZTOS((Q)ARG1(arg)); f2 = BDY((LIST)ARG2(arg)); g = (DP *)BDY((VECT)ARG3(arg)); - simp = QTOS((Q)ARG4(arg)); + simp = ZTOS((Q)ARG4(arg)); *rp = sumi_symbolic(l,q,f2,g,simp); } @@ -3368,7 +3833,7 @@ void Psumi_updatepairs(NODE arg,LIST *rp) d = (LIST)ARG0(arg); f = (DP *)BDY((VECT)ARG1(arg)); - m = QTOS((Q)ARG2(arg)); + m = ZTOS((Q)ARG2(arg)); *rp = sumi_updatepairs(d,f,m); } @@ -3423,7 +3888,7 @@ void Pdpv_ord(NODE arg,Obj *rp) ac = argc(arg); if ( ac ) { - id = QTOS((Q)ARG0(arg)); + id = ZTOS((Q)ARG0(arg)); if ( ac > 1 && ARG1(arg) && OID((Obj)ARG1(arg))==O_LIST ) shift = (LIST)ARG1(arg); else @@ -3433,23 +3898,19 @@ void Pdpv_ord(NODE arg,Obj *rp) *rp = dp_current_modspec->obj; } -extern int dpm_ispot; +extern int dpm_ordtype; -void Pdpm_ord(NODE arg,LIST *rp) +void set_schreyer_order(LIST n); + +LIST schreyer_obj; + +void Pdpm_set_schreyer(NODE arg,LIST *rp) { - Z q; - NODE nd; - struct order_spec *spec; - - if ( arg ) { - nd = BDY((LIST)ARG0(arg)); - if ( !create_order_spec(0,(Obj)ARG1(nd),&spec) ) - error("dpm_ord : invalid order specification"); - initdpm(spec,QTOS((Q)ARG0(nd))); + if ( argc(arg) ) { + schreyer_obj = (LIST)ARG0(arg); + set_schreyer_order(schreyer_obj); } - STOQ(dpm_ispot,q); - nd = mknode(2,q,dp_current_spec->obj); - MKLIST(*rp,nd); + *rp = schreyer_obj; } void Pdpm_hm(NODE arg,DPM *rp) @@ -3464,10 +3925,71 @@ void Pdpm_ht(NODE arg,DPM *rp) { DPM p; - p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dp_ht"); + p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_ht"); dpm_ht(p,rp); } +void dpm_rest(DPM p,DPM *r); + +void Pdpm_rest(NODE arg,DPM *rp) +{ + DPM p; + + p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_ht"); + dpm_rest(p,rp); +} + + +void Pdpm_hp(NODE arg,Z *rp) +{ + DPM p; + int pos; + + p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_ht"); + pos = BDY(p)->pos; + STOZ(pos,*rp); +} + +void dpm_shift(DPM p,int s,DPM *rp); + +void Pdpm_shift(NODE arg,DPM *rp) +{ + DPM p; + int s; + + p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_shift"); + s = ZTOS((Z)ARG1(arg)); + dpm_shift(p,s,rp); +} + +void dpm_sort(DPM p,DPM *rp); + +void Pdpm_sort(NODE arg,DPM *rp) +{ + DPM p; + int s; + + p = (DPM)ARG0(arg); + if ( !p ) *rp = 0; + dpm_sort(p,rp); +} + +void dpm_split(DPM p,int s,DPM *up,DPM *lo); + +void Pdpm_split(NODE arg,LIST *rp) +{ + DPM p,up,lo; + int s; + NODE nd; + + p = (DPM)ARG0(arg); + s = ZTOS((Z)ARG1(arg)); + dpm_split(p,s,&up,&lo); + nd = mknode(2,up,lo); + MKLIST(*rp,nd); +} + + void Pdpm_hc(NODE arg,Obj *rp) { asir_assert(ARG0(arg),O_DPM,"dpm_hc"); @@ -3493,7 +4015,7 @@ void Pdpv_ht(NODE arg,LIST *rp) ht = 0; else dp_ht(BDY(p)[pos],&ht); - STOQ(pos,q); + STOZ(pos,q); n = mknode(2,q,ht); MKLIST(*rp,n); } @@ -3513,7 +4035,7 @@ void Pdpv_hm(NODE arg,LIST *rp) ht = 0; else dp_hm(BDY(p)[pos],&ht); - STOQ(pos,q); + STOZ(pos,q); n = mknode(2,q,ht); MKLIST(*rp,n); } @@ -3533,7 +4055,7 @@ void Pdpv_hc(NODE arg,LIST *rp) hc = 0; else hc = (P)BDY(BDY(p)[pos])->c; - STOQ(pos,q); + STOZ(pos,q); n = mknode(2,q,hc); MKLIST(*rp,n); } @@ -3577,6 +4099,10 @@ int dpv_hp(DPV p) case ORD_LEX: for ( i = 0; i < len; i++ ) if ( e[i] ) return i; + return -1; + break; + default: + error("dpv_hp : unsupported term ordering"); return -1; break; }