=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.1.1.1 retrieving revision 1.10 diff -u -p -r1.1.1.1 -r1.10 --- OpenXM_contrib2/asir2000/builtin/dp.c 1999/12/03 07:39:07 1.1.1.1 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2000/12/08 06:43:09 1.10 @@ -1,198 +1,334 @@ -/* $OpenXM: OpenXM/src/asir99/builtin/dp.c,v 1.1.1.1 1999/11/10 08:12:25 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * 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 + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * 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.9 2000/12/08 02:39:05 noro Exp $ +*/ #include "ca.h" #include "base.h" #include "parse.h" extern int dp_fcoeffs; +extern int dp_nelim; +extern int dp_order_pair_length; +extern struct order_pair *dp_order_pair; +extern struct order_spec dp_current_spec; + void Pdp_ord(), Pdp_ptod(), Pdp_dtop(); 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_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(),Pdp_nf_ptozp(); +void Pdp_nf(),Pdp_true_nf(); void Pdp_nf_mod(),Pdp_true_nf_mod(); void Pdp_criB(),Pdp_nelim(); -void Pdp_minp(),Pdp_nf_demand(),Pdp_sp_mod(); +void Pdp_minp(),Pdp_sp_mod(); void Pdp_homo(),Pdp_dehomo(); void Pdp_gr_mod_main(); void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags(); void Pdp_f4_main(),Pdp_f4_mod_main(); void Pdp_gr_print(); +void Pdp_mbase(),Pdp_lnf_mod(),Pdp_nf_tab_mod(),Pdp_mdtod(); +void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), Pdp_sep(); +void Pdp_cont(); struct ftab dp_tab[] = { - {"dp_ord",Pdp_ord,-1}, - {"dp_ptod",Pdp_ptod,2}, - {"dp_dtop",Pdp_dtop,2}, + /* content reduction */ {"dp_ptozp",Pdp_ptozp,1}, {"dp_ptozp2",Pdp_ptozp2,2}, {"dp_prim",Pdp_prim,1}, - {"dp_redble",Pdp_redble,2}, - {"dp_subd",Pdp_subd,2}, - {"dp_red",Pdp_red,3}, - {"dp_red_mod",Pdp_red_mod,4}, + {"dp_red_coef",Pdp_red_coef,2}, + {"dp_cont",Pdp_cont,1}, + + /* s-poly */ {"dp_sp",Pdp_sp,2}, {"dp_sp_mod",Pdp_sp_mod,3}, - {"dp_lcm",Pdp_lcm,2}, - {"dp_hm",Pdp_hm,1}, - {"dp_ht",Pdp_ht,1}, - {"dp_hc",Pdp_hc,1}, - {"dp_rest",Pdp_rest,1}, - {"dp_td",Pdp_td,1}, - {"dp_sugar",Pdp_sugar,1}, - {"dp_cri1",Pdp_cri1,2}, - {"dp_cri2",Pdp_cri2,2}, - {"dp_criB",Pdp_criB,3}, - {"dp_minp",Pdp_minp,2}, - {"dp_mod",Pdp_mod,3}, - {"dp_rat",Pdp_rat,1}, - {"dp_tdiv",Pdp_tdiv,2}, - {"dp_red_coef",Pdp_red_coef,2}, - {"dp_nelim",Pdp_nelim,-1}, - {"dp_mag",Pdp_mag,1}, - {"dp_set_kara",Pdp_set_kara,-1}, + + /* m-reduction */ + {"dp_red",Pdp_red,3}, + {"dp_red_mod",Pdp_red_mod,4}, + + /* normal form */ {"dp_nf",Pdp_nf,4}, {"dp_true_nf",Pdp_true_nf,4}, - {"dp_nf_ptozp",Pdp_nf_ptozp,5}, - {"dp_nf_demand",Pdp_nf_demand,5}, {"dp_nf_mod",Pdp_nf_mod,5}, {"dp_true_nf_mod",Pdp_true_nf_mod,5}, - {"dp_homo",Pdp_homo,1}, - {"dp_dehomo",Pdp_dehomo,1}, + {"dp_lnf_mod",Pdp_lnf_mod,3}, + {"dp_nf_tab_mod",Pdp_nf_tab_mod,3}, + + /* Buchberger algorithm */ {"dp_gr_main",Pdp_gr_main,5}, -/* {"dp_gr_hm_main",Pdp_gr_hm_main,5}, */ -/* {"dp_gr_d_main",Pdp_gr_d_main,6}, */ {"dp_gr_mod_main",Pdp_gr_mod_main,5}, + + /* F4 algorithm */ {"dp_f4_main",Pdp_f4_main,3}, {"dp_f4_mod_main",Pdp_f4_mod_main,4}, - {"dp_gr_flags",Pdp_gr_flags,-1}, - {"dp_gr_print",Pdp_gr_print,-1}, + {0,0,0}, }; -extern int dp_nelim; -extern int dp_order_pair_length; -extern struct order_pair *dp_order_pair; -extern struct order_spec dp_current_spec; +struct ftab dp_supp_tab[] = { + /* setting flags */ + {"dp_ord",Pdp_ord,-1}, + {"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}, -void Pdp_ord(arg,rp) + /* converters */ + {"dp_ptod",Pdp_ptod,2}, + {"dp_dtop",Pdp_dtop,2}, + {"dp_homo",Pdp_homo,1}, + {"dp_dehomo",Pdp_dehomo,1}, + {"dp_etov",Pdp_etov,1}, + {"dp_vtoe",Pdp_vtoe,1}, + {"dp_dtov",Pdp_dtov,1}, + {"dp_mdtod",Pdp_mdtod,1}, + {"dp_mod",Pdp_mod,3}, + {"dp_rat",Pdp_rat,1}, + + /* criteria */ + {"dp_cri1",Pdp_cri1,2}, + {"dp_cri2",Pdp_cri2,2}, + {"dp_criB",Pdp_criB,3}, + + /* simple operation */ + {"dp_subd",Pdp_subd,2}, + {"dp_lcm",Pdp_lcm,2}, + {"dp_hm",Pdp_hm,1}, + {"dp_ht",Pdp_ht,1}, + {"dp_hc",Pdp_hc,1}, + {"dp_rest",Pdp_rest,1}, + + /* degree and size */ + {"dp_td",Pdp_td,1}, + {"dp_mag",Pdp_mag,1}, + {"dp_sugar",Pdp_sugar,1}, + + /* misc */ + {"dp_mbase",Pdp_mbase,1}, + {"dp_redble",Pdp_redble,2}, + {"dp_sep",Pdp_sep,2}, + {"dp_idiv",Pdp_idiv,2}, + {"dp_tdiv",Pdp_tdiv,2}, + {"dp_minp",Pdp_minp,2}, + + {0,0,0} +}; + +void Pdp_mdtod(arg,rp) NODE arg; -Obj *rp; +DP *rp; { - struct order_spec spec; + MP m,mr,mr0; + DP p; + P t; - if ( !arg ) - *rp = dp_current_spec.obj; - else if ( !create_order_spec((Obj)ARG0(arg),&spec) ) - error("dp_ord : invalid order specification"); + p = (DP)ARG0(arg); + if ( !p ) + *rp = 0; else { - initd(&spec); *rp = spec.obj; + for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { + mptop(m->c,&t); NEXTMP(mr0,mr); mr->c = t; mr->dl = m->dl; + } + NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar; } } -int create_order_spec(obj,spec) -Obj obj; -struct order_spec *spec; +void Pdp_sep(arg,rp) +NODE arg; +VECT *rp; { - int i,j,n,s,row,col; - struct order_pair *l; - NODE node,t,tn; - MAT m; - pointer **b; - int **w; + DP p,r; + MP m,t; + MP *w0,*w; + int i,n,d,nv,sugar; + VECT v; + pointer *pv; - if ( !obj || NUM(obj) ) { - spec->id = 0; spec->obj = obj; - spec->ord.simple = QTOS((Q)obj); - return 1; - } else if ( OID(obj) == O_LIST ) { - node = BDY((LIST)obj); - for ( n = 0, t = node; t; t = NEXT(t), n++ ); - l = (struct order_pair *)MALLOC_ATOMIC(n*sizeof(struct order_pair)); - for ( i = 0, t = node, s = 0; i < n; t = NEXT(t), i++ ) { - tn = BDY((LIST)BDY(t)); l[i].order = QTOS((Q)BDY(tn)); - tn = NEXT(tn); l[i].length = QTOS((Q)BDY(tn)); - s += l[i].length; - } - spec->id = 1; spec->obj = obj; - spec->ord.block.order_pair = l; - spec->ord.block.length = n; spec->nv = s; - return 1; - } else if ( OID(obj) == O_MAT ) { - m = (MAT)obj; row = m->row; col = m->col; b = BDY(m); - w = almat(row,col); - for ( i = 0; i < row; i++ ) - for ( j = 0; j < col; j++ ) - w[i][j] = QTOS((Q)b[i][j]); - spec->id = 2; spec->obj = obj; - spec->nv = col; spec->ord.matrix.row = row; - spec->ord.matrix.matrix = w; - return 1; - } else - return 0; + p = (DP)ARG0(arg); m = BDY(p); + d = QTOS((Q)ARG1(arg)); + for ( t = m, n = 0; t; t = NEXT(t), n++ ); + if ( d > n ) + d = n; + MKVECT(v,d); *rp = v; + pv = BDY(v); nv = p->nv; sugar = p->sugar; + w0 = (MP *)MALLOC(d*sizeof(MP)); bzero(w0,d*sizeof(MP)); + w = (MP *)MALLOC(d*sizeof(MP)); bzero(w,d*sizeof(MP)); + for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, i %= d ) { + NEXTMP(w0[i],w[i]); w[i]->c = t->c; w[i]->dl = t->dl; + } + for ( i = 0; i < d; i++ ) { + NEXT(w[i]) = 0; MKDP(nv,w0[i],r); r->sugar = sugar; + pv[i] = (pointer)r; + } } -void homogenize_order(old,n,new) -struct order_spec *old,*new; -int n; +void Pdp_idiv(arg,rp) +NODE arg; +DP *rp; { - struct order_pair *l; - int length,nv,row,i,j; - int **newm,**oldm; + dp_idiv((DP)ARG0(arg),(Q)ARG1(arg),rp); +} - switch ( old->id ) { - case 0: - switch ( old->ord.simple ) { - case 0: - new->id = 0; new->ord.simple = 0; break; - case 1: - l = (struct order_pair *) - MALLOC_ATOMIC(2*sizeof(struct order_pair)); - l[0].length = n; l[0].order = 1; - l[1].length = 1; l[1].order = 2; - new->id = 1; - new->ord.block.order_pair = l; - new->ord.block.length = 2; new->nv = n+1; - break; - case 2: - new->id = 0; new->ord.simple = 1; break; - case 3: case 4: case 5: - new->id = 0; new->ord.simple = old->ord.simple+3; - dp_nelim = n-1; break; - case 6: case 7: case 8: case 9: - new->id = 0; new->ord.simple = old->ord.simple; break; - default: - error("homogenize_order : invalid input"); - } - break; - case 1: - length = old->ord.block.length; - l = (struct order_pair *) - MALLOC_ATOMIC((length+1)*sizeof(struct order_pair)); - bcopy((char *)old->ord.block.order_pair,(char *)l,length*sizeof(struct order_pair)); - l[length].order = 2; l[length].length = 1; - new->id = 1; new->nv = n+1; - new->ord.block.order_pair = l; - new->ord.block.length = length+1; - break; - case 2: - nv = old->nv; row = old->ord.matrix.row; - oldm = old->ord.matrix.matrix; newm = almat(row+1,nv+1); - for ( i = 0; i <= nv; i++ ) - newm[0][i] = 1; - for ( i = 0; i < row; i++ ) { - for ( j = 0; j < nv; j++ ) - newm[i+1][j] = oldm[i][j]; - newm[i+1][j] = 0; - } - new->id = 2; new->nv = nv+1; - new->ord.matrix.row = row+1; new->ord.matrix.matrix = newm; - break; - default: - error("homogenize_order : invalid input"); +void Pdp_cont(arg,rp) +NODE arg; +Q *rp; +{ + dp_cont((DP)ARG0(arg),rp); +} + +void Pdp_dtov(arg,rp) +NODE arg; +VECT *rp; +{ + dp_dtov((DP)ARG0(arg),rp); +} + +void Pdp_mbase(arg,rp) +NODE arg; +LIST *rp; +{ + NODE mb; + + asir_assert(ARG0(arg),O_LIST,"dp_mbase"); + dp_mbase(BDY((LIST)ARG0(arg)),&mb); + MKLIST(*rp,mb); +} + +void Pdp_etov(arg,rp) +NODE arg; +VECT *rp; +{ + DP dp; + int n,i; + int *d; + VECT v; + Q t; + + dp = (DP)ARG0(arg); + asir_assert(dp,O_DP,"dp_etov"); + 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; } + *rp = v; } +void Pdp_vtoe(arg,rp) +NODE arg; +DP *rp; +{ + DP dp; + DL dl; + MP m; + int n,i,td; + int *d; + VECT v; + + v = (VECT)ARG0(arg); + asir_assert(v,O_VECT,"dp_vtoe"); + 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]; + } + dl->td = td; + NEWMP(m); m->dl = dl; m->c = (P)ONE; NEXT(m) = 0; + MKDP(n,m,dp); dp->sugar = td; + *rp = dp; +} + +void Pdp_lnf_mod(arg,rp) +NODE arg; +LIST *rp; +{ + DP r1,r2; + NODE b,g,n; + int mod; + + asir_assert(ARG0(arg),O_LIST,"dp_lnf_mod"); + 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)); + 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; + NEXT(NEXT(n)) = 0; MKLIST(*rp,n); +} + +void Pdp_nf_tab_mod(arg,rp) +NODE arg; +DP *rp; +{ + asir_assert(ARG0(arg),O_DP,"dp_nf_tab_mod"); + 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); +} + +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"); + else { + initd(&spec); *rp = spec.obj; + } +} + void Pdp_ptod(arg,rp) NODE arg; DP *rp; @@ -244,12 +380,7 @@ NODE arg; DP *rp; { asir_assert(ARG0(arg),O_DP,"dp_ptozp"); -#if INET - if ( Dist ) - dp_ptozp_d(BDY(Dist),length(BDY(Dist)),(DP)ARG0(arg),rp); - else -#endif - dp_ptozp((DP)ARG0(arg),rp); + dp_ptozp((DP)ARG0(arg),rp); } void Pdp_ptozp2(arg,rp) @@ -262,12 +393,7 @@ LIST *rp; p0 = (DP)ARG0(arg); p1 = (DP)ARG1(arg); asir_assert(p0,O_DP,"dp_ptozp2"); asir_assert(p1,O_DP,"dp_ptozp2"); -#if INET - if ( Dist ) - dp_ptozp2_d(BDY(Dist),length(BDY(Dist)),p0,p1,&h,&r); - else -#endif - dp_ptozp2(p0,p1,&h,&r); + dp_ptozp2(p0,p1,&h,&r); NEWNODE(n0); BDY(n0) = (pointer)h; NEWNODE(NEXT(n0)); BDY(NEXT(n0)) = (pointer)r; NEXT(NEXT(n0)) = 0; @@ -284,104 +410,6 @@ DP *rp; dp_prim((DP)ARG0(arg),&t); dp_ptozp(t,rp); } -extern int NoGCD; - -void dp_prim(p,rp) -DP p,*rp; -{ - P t,g; - DP p1; - MP m,mr,mr0; - int i,n; - P *w; - Q *c; - Q dvr; - - if ( !p ) - *rp = 0; - else if ( dp_fcoeffs ) - *rp = p; - else if ( NoGCD ) - dp_ptozp(p,rp); - else { - dp_ptozp(p,&p1); p = p1; - for ( m = BDY(p), n = 0; m; m = NEXT(m), n++ ); - if ( n == 1 ) { - m = BDY(p); - NEWMP(mr); mr->dl = m->dl; mr->c = (P)ONE; NEXT(mr) = 0; - MKDP(p->nv,mr,*rp); (*rp)->sugar = p->sugar; - return; - } - w = (P *)ALLOCA(n*sizeof(P)); - c = (Q *)ALLOCA(n*sizeof(Q)); - for ( m =BDY(p), i = 0; i < n; m = NEXT(m), i++ ) - if ( NUM(m->c) ) { - c[i] = (Q)m->c; w[i] = (P)ONE; - } else - ptozp(m->c,1,&c[i],&w[i]); - qltozl(c,n,&dvr); heu_nezgcdnpz(CO,w,n,&t); mulp(CO,t,(P)dvr,&g); - if ( NUM(g) ) - *rp = p; - else { - for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { - NEXTMP(mr0,mr); divsp(CO,m->c,g,&mr->c); mr->dl = m->dl; - } - NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar; - } - } -} - -void heu_nezgcdnpz(vl,pl,m,pr) -VL vl; -P *pl,*pr; -int m; -{ - int i,r; - P gcd,t,s1,s2,u; - Q rq; - - while ( 1 ) { - for ( i = 0, s1 = 0; i < m; i++ ) { - r = random(); UTOQ(r,rq); - mulp(vl,pl[i],(P)rq,&t); addp(vl,s1,t,&u); s1 = u; - } - for ( i = 0, s2 = 0; i < m; i++ ) { - r = random(); UTOQ(r,rq); - mulp(vl,pl[i],(P)rq,&t); addp(vl,s2,t,&u); s2 = u; - } - ezgcdp(vl,s1,s2,&gcd); - for ( i = 0; i < m; i++ ) { - if ( !divtpz(vl,pl[i],gcd,&t) ) - break; - } - if ( i == m ) - break; - } - *pr = gcd; -} - -void dp_prim_mod(p,mod,rp) -int mod; -DP p,*rp; -{ - P t,g; - MP m,mr,mr0; - - if ( !p ) - *rp = 0; - else if ( NoGCD ) - *rp = p; - else { - for ( m = BDY(p), g = m->c, m = NEXT(m); m; m = NEXT(m) ) { - gcdprsmp(CO,mod,g,m->c,&t); g = t; - } - for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { - NEXTMP(mr0,mr); divsmp(CO,mod,m->c,g,&mr->c); mr->dl = m->dl; - } - NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar; - } -} - void Pdp_mod(arg,rp) NODE arg; DP *rp; @@ -406,56 +434,8 @@ DP *rp; dp_rat((DP)ARG0(arg),rp); } -void dp_mod(p,mod,subst,rp) -DP p; -int mod; -NODE subst; -DP *rp; -{ - MP m,mr,mr0; - P t,s,s1; - V v; - NODE tn; +extern int DP_Multiple; - if ( !p ) - *rp = 0; - else { - for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { - for ( tn = subst, s = m->c; tn; tn = NEXT(tn) ) { - v = VR((P)BDY(tn)); tn = NEXT(tn); - substp(CO,s,v,(P)BDY(tn),&s1); s = s1; - } - ptomp(mod,s,&t); - if ( t ) { - NEXTMP(mr0,mr); mr->c = t; mr->dl = m->dl; - } - } - if ( mr0 ) { - NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar; - } else - *rp = 0; - } -} - -void dp_rat(p,rp) -DP p; -DP *rp; -{ - MP m,mr,mr0; - - if ( !p ) - *rp = 0; - else { - for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { - NEXTMP(mr0,mr); mptop(m->c,&mr->c); mr->dl = m->dl; - } - if ( mr0 ) { - NEXT(mr) = 0; MKDP(p->nv,mr0,*rp); (*rp)->sugar = p->sugar; - } else - *rp = 0; - } -} - void Pdp_nf(arg,rp) NODE arg; DP *rp; @@ -474,7 +454,7 @@ DP *rp; } b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); full = (Q)ARG3(arg) ? 1 : 0; - dp_nf(b,g,ps,full,rp); + dp_nf_ptozp(b,g,ps,full,DP_Multiple,rp); } void Pdp_true_nf(arg,rp) @@ -504,293 +484,6 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void dp_nf(b,g,ps,full,rp) -NODE b; -DP g; -DP *ps; -int full; -DP *rp; -{ - DP u,p,d,s,t; - P dmy; - NODE l; - MP m,mr; - int i,n; - int *wb; - int sugar,psugar; - - if ( !g ) { - *rp = 0; return; - } - for ( n = 0, l = b; l; l = NEXT(l), n++ ); - wb = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, l = b; i < n; l = NEXT(l), i++ ) - wb[i] = QTOS((Q)BDY(l)); - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, i = 0; i < n; i++ ) { - if ( dp_redble(g,p = ps[wb[i]]) ) { - dp_red(d,g,p,&t,&u,&dmy); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; return; - } - d = t; - break; - } - } - if ( u ) - g = u; - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addd(CO,d,t,&s); d = s; - dp_rest(g,&t); g = t; - } - } - if ( d ) - d->sugar = sugar; - *rp = d; -} - -void dp_true_nf(b,g,ps,full,rp,dnp) -NODE b; -DP g; -DP *ps; -int full; -DP *rp; -P *dnp; -{ - DP u,p,d,s,t; - NODE l; - MP m,mr; - int i,n; - int *wb; - int sugar,psugar; - P dn,tdn,tdn1; - - dn = (P)ONE; - if ( !g ) { - *rp = 0; *dnp = dn; return; - } - for ( n = 0, l = b; l; l = NEXT(l), n++ ); - wb = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, l = b; i < n; l = NEXT(l), i++ ) - wb[i] = QTOS((Q)BDY(l)); - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, i = 0; i < n; i++ ) { - if ( dp_redble(g,p = ps[wb[i]]) ) { - dp_red(d,g,p,&t,&u,&tdn); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; *dnp = dn; return; - } else { - d = t; - mulp(CO,dn,tdn,&tdn1); dn = tdn1; - } - break; - } - } - if ( u ) - g = u; - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; *dnp = dn; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addd(CO,d,t,&s); d = s; - dp_rest(g,&t); g = t; - } - } - if ( d ) - d->sugar = sugar; - *rp = d; *dnp = dn; -} - -#define HMAG(p) (p_mag(BDY(p)->c)) - -void Pdp_nf_ptozp(arg,rp) -NODE arg; -DP *rp; -{ - NODE b; - DP g; - DP *ps; - int full,multiple; - - asir_assert(ARG0(arg),O_LIST,"dp_nf_ptozp"); - asir_assert(ARG1(arg),O_DP,"dp_nf_ptozp"); - asir_assert(ARG2(arg),O_VECT,"dp_nf_ptozp"); - asir_assert(ARG3(arg),O_N,"dp_nf_ptozp"); - asir_assert(ARG4(arg),O_N,"dp_nf_ptozp"); - if ( !(g = (DP)ARG1(arg)) ) { - *rp = 0; return; - } - b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); - full = (Q)ARG3(arg) ? 1 : 0; - multiple = QTOS((Q)ARG4(arg)); - dp_nf_ptozp(b,g,ps,full,multiple,rp); -} - -void dp_nf_ptozp(b,g,ps,full,multiple,rp) -NODE b; -DP g; -DP *ps; -int full,multiple; -DP *rp; -{ - DP u,p,d,s,t; - P dmy; - NODE l; - MP m,mr; - int i,n; - int *wb; - int hmag; - int sugar,psugar; - - if ( !g ) { - *rp = 0; return; - } - for ( n = 0, l = b; l; l = NEXT(l), n++ ); - wb = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, l = b; i < n; l = NEXT(l), i++ ) - wb[i] = QTOS((Q)BDY(l)); - hmag = multiple*HMAG(g); - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, i = 0; i < n; i++ ) { - if ( dp_redble(g,p = ps[wb[i]]) ) { - dp_red(d,g,p,&t,&u,&dmy); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; return; - } - d = t; - break; - } - } - if ( u ) { - g = u; - if ( d ) { - if ( HMAG(d) > hmag ) { - dp_ptozp2(d,g,&t,&u); d = t; g = u; - hmag = multiple*HMAG(d); - } - } else { - if ( HMAG(g) > hmag ) { - dp_ptozp(g,&t); g = t; - hmag = multiple*HMAG(g); - } - } - } - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addd(CO,d,t,&s); d = s; - dp_rest(g,&t); g = t; - - } - } - if ( d ) - d->sugar = sugar; - *rp = d; -} - -void Pdp_nf_demand(arg,rp) -NODE arg; -DP *rp; -{ - DP g,u,p,d,s,t; - P dmy; - NODE b,l; - DP *hps; - MP m,mr; - int i,n; - int *wb; - int full; - char *fprefix; - int sugar,psugar; - - asir_assert(ARG0(arg),O_LIST,"dp_nf_demand"); - asir_assert(ARG1(arg),O_DP,"dp_nf_demand"); - asir_assert(ARG2(arg),O_N,"dp_nf_demand"); - asir_assert(ARG3(arg),O_VECT,"dp_nf_demand"); - asir_assert(ARG4(arg),O_STR,"dp_nf_demand"); - if ( !(g = (DP)ARG1(arg)) ) { - *rp = 0; return; - } - b = BDY((LIST)ARG0(arg)); full = (Q)ARG2(arg) ? 1 : 0; - hps = (DP *)BDY((VECT)ARG3(arg)); fprefix = BDY((STRING)ARG4(arg)); - for ( n = 0, l = b; l; l = NEXT(l), n++ ); - wb = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, l = b; i < n; l = NEXT(l), i++ ) - wb[i] = QTOS((Q)BDY(l)); - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, i = 0; i < n; i++ ) { - if ( dp_redble(g,hps[wb[i]]) ) { - FILE *fp; - char fname[BUFSIZ]; - - sprintf(fname,"%s%d",fprefix,wb[i]); - fprintf(stderr,"loading %s\n",fname); - fp = fopen(fname,"r"); skipvl(fp); - loadobj(fp,(Obj *)&p); fclose(fp); - dp_red(d,g,p,&t,&u,&dmy); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; return; - } - d = t; - break; - } - } - if ( u ) - g = u; - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addd(CO,d,t,&s); d = s; - dp_rest(g,&t); g = t; - - } - } - if ( d ) - d->sugar = sugar; - *rp = d; -} - void Pdp_nf_mod(arg,rp) NODE arg; DP *rp; @@ -799,6 +492,7 @@ DP *rp; DP g; DP *ps; int mod,full,ac; + NODE n,n0; ac = argc(arg); asir_assert(ARG0(arg),O_LIST,"dp_nf_mod"); @@ -811,7 +505,13 @@ DP *rp; } b = BDY((LIST)ARG0(arg)); ps = (DP *)BDY((VECT)ARG2(arg)); full = QTOS((Q)ARG3(arg)); mod = QTOS((Q)ARG4(arg)); - dp_nf_mod_qindex(b,g,ps,mod,full,rp); + for ( n0 = n = 0; b; b = NEXT(b) ) { + NEXTNODE(n0,n); + BDY(n) = (pointer)QTOS((Q)BDY(b)); + } + if ( n0 ) + NEXT(n) = 0; + dp_nf_mod(n,g,ps,mod,full,rp); } void Pdp_true_nf_mod(arg,rp) @@ -842,169 +542,6 @@ LIST *rp; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void dp_nf_mod_qindex(b,g,ps,mod,full,rp) -NODE b; -DP g; -DP *ps; -int mod,full; -DP *rp; -{ - DP u,p,d,s,t; - P dmy; - NODE l; - MP m,mr; - int sugar,psugar; - - if ( !g ) { - *rp = 0; return; - } - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, l = b; l; l = NEXT(l) ) { - if ( dp_redble(g,p = ps[QTOS((Q)BDY(l))]) ) { - dp_red_mod(d,g,p,mod,&t,&u,&dmy); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; return; - } - d = t; - break; - } - } - if ( u ) - g = u; - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addmd(CO,mod,d,t,&s); d = s; - dp_rest(g,&t); g = t; - } - } - if ( d ) - d->sugar = sugar; - *rp = d; -} - -void dp_nf_mod(b,g,ps,mod,full,rp) -NODE b; -DP g; -DP *ps; -int mod,full; -DP *rp; -{ - DP u,p,d,s,t; - P dmy; - NODE l; - MP m,mr; - int sugar,psugar; - - if ( !g ) { - *rp = 0; return; - } - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, l = b; l; l = NEXT(l) ) { - if ( dp_redble(g,p = ps[(int)BDY(l)]) ) { - dp_red_mod(d,g,p,mod,&t,&u,&dmy); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; return; - } - d = t; - break; - } - } - if ( u ) - g = u; - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addmd(CO,mod,d,t,&s); d = s; - dp_rest(g,&t); g = t; - } - } - if ( d ) - d->sugar = sugar; - *rp = d; -} - -void dp_true_nf_mod(b,g,ps,mod,full,rp,dnp) -NODE b; -DP g; -DP *ps; -int mod,full; -DP *rp; -P *dnp; -{ - DP u,p,d,s,t; - NODE l; - MP m,mr; - int i,n; - int *wb; - int sugar,psugar; - P dn,tdn,tdn1; - - dn = (P)ONEM; - if ( !g ) { - *rp = 0; *dnp = dn; return; - } - for ( n = 0, l = b; l; l = NEXT(l), n++ ); - wb = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, l = b; i < n; l = NEXT(l), i++ ) - wb[i] = QTOS((Q)BDY(l)); - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, i = 0; i < n; i++ ) { - if ( dp_redble(g,p = ps[wb[i]]) ) { - dp_red_mod(d,g,p,mod,&t,&u,&tdn); - psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; - sugar = MAX(sugar,psugar); - if ( !u ) { - if ( d ) - d->sugar = sugar; - *rp = d; *dnp = dn; return; - } else { - d = t; - mulmp(CO,mod,dn,tdn,&tdn1); dn = tdn1; - } - break; - } - } - if ( u ) - g = u; - else if ( !full ) { - if ( g ) { - MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t; - } - *rp = g; *dnp = dn; return; - } else { - m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c; - NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td; - addmd(CO,mod,d,t,&s); d = s; - dp_rest(g,&t); g = t; - } - } - if ( d ) - d->sugar = sugar; - *rp = d; *dnp = dn; -} - void Pdp_tdiv(arg,rp) NODE arg; DP *rp; @@ -1062,49 +599,6 @@ DP *rp; } } -void qltozl(w,n,dvr) -Q *w,*dvr; -int n; -{ - N nm,dn; - N g,l1,l2,l3; - Q c,d; - int i; - struct oVECT v; - - for ( i = 0; i < n; i++ ) - if ( w[i] && !INT(w[i]) ) - break; - if ( i == n ) { - v.id = O_VECT; v.len = n; v.body = (pointer *)w; - igcdv(&v,dvr); return; - } - c = w[0]; nm = NM(c); dn = INT(c) ? ONEN : DN(c); - for ( i = 1; i < n; i++ ) { - c = w[i]; l1 = INT(c) ? ONEN : DN(c); - gcdn(nm,NM(c),&g); nm = g; - gcdn(dn,l1,&l2); muln(dn,l1,&l3); divsn(l3,l2,&dn); - } - if ( UNIN(dn) ) - NTOQ(nm,1,d); - else - NDTOQ(nm,dn,1,d); - *dvr = d; -} - -int comp_nm(a,b) -Q *a,*b; -{ - return cmpn((*a)?NM(*a):0,(*b)?NM(*b):0); -} - -void sortbynm(w,n) -Q *w; -int n; -{ - qsort(w,n,sizeof(Q),(int (*)(const void *,const void *))comp_nm); -} - void Pdp_redble(arg,rp) NODE arg; Q *rp; @@ -1135,56 +629,6 @@ LIST *rp; NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)r; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } - -int dp_redble(p1,p2) -DP p1,p2; -{ - int i,n; - DL d1,d2; - - d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - if ( d1->td < d2->td ) - return 0; - else { - for ( i = 0, n = p1->nv; i < n; i++ ) - if ( d1->d[i] < d2->d[i] ) - return 0; - return 1; - } -} - -void dp_red_mod(p0,p1,p2,mod,head,rest,dnp) -DP p0,p1,p2; -int mod; -DP *head,*rest; -P *dnp; -{ - int i,n; - DL d1,d2,d; - MP m; - DP t,s,r,h; - P c1,c2,g,u; - - n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - NEWDL(d,n); d->td = d1->td - d2->td; - for ( i = 0; i < n; i++ ) - d->d[i] = d1->d[i]-d2->d[i]; - c1 = (P)BDY(p1)->c; c2 = (P)BDY(p2)->c; - gcdprsmp(CO,mod,c1,c2,&g); - divsmp(CO,mod,c1,g,&u); c1 = u; divsmp(CO,mod,c2,g,&u); c2 = u; - if ( NUM(c2) ) { - divsmp(CO,mod,c1,c2,&u); c1 = u; c2 = (P)ONEM; - } - NEWMP(m); m->dl = d; chsgnmp(mod,(P)c1,&m->c); NEXT(m) = 0; - MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p2,s,&t); - if ( NUM(c2) ) { - addmd(CO,mod,p1,t,&r); h = p0; - } else { - mulmdc(CO,mod,p1,c2,&s); addmd(CO,mod,s,t,&r); mulmdc(CO,mod,p0,c2,&h); - } - *head = h; *rest = r; *dnp = c2; -} - void Pdp_subd(arg,rp) NODE arg; DP *rp; @@ -1197,76 +641,23 @@ DP *rp; dp_subd(p1,p2,rp); } -void dp_subd(p1,p2,rp) -DP p1,p2; -DP *rp; -{ - int i,n; - DL d1,d2,d; - MP m; - DP s; - - n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - NEWDL(d,n); d->td = d1->td - d2->td; - for ( i = 0; i < n; i++ ) - d->d[i] = d1->d[i]-d2->d[i]; - NEWMP(m); m->dl = d; m->c = (P)ONE; NEXT(m) = 0; MKDP(n,m,s); s->sugar = d->td; - *rp = s; -} - void Pdp_red(arg,rp) NODE arg; LIST *rp; { NODE n; - DP head,rest; + DP head,rest,dmy1; P dmy; asir_assert(ARG0(arg),O_DP,"dp_red"); asir_assert(ARG1(arg),O_DP,"dp_red"); asir_assert(ARG2(arg),O_DP,"dp_red"); - dp_red((DP)ARG0(arg),(DP)ARG1(arg),(DP)ARG2(arg),&head,&rest,&dmy); + dp_red((DP)ARG0(arg),(DP)ARG1(arg),(DP)ARG2(arg),&head,&rest,&dmy,&dmy1); NEWNODE(n); BDY(n) = (pointer)head; NEWNODE(NEXT(n)); BDY(NEXT(n)) = (pointer)rest; NEXT(NEXT(n)) = 0; MKLIST(*rp,n); } -void dp_red(p0,p1,p2,head,rest,dnp) -DP p0,p1,p2; -DP *head,*rest; -P *dnp; -{ - int i,n; - DL d1,d2,d; - MP m; - DP t,s,r,h; - Q c,c1,c2; - N gn,tn; - P g,a; - - n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - NEWDL(d,n); d->td = d1->td - d2->td; - for ( i = 0; i < n; i++ ) - d->d[i] = d1->d[i]-d2->d[i]; - c1 = (Q)BDY(p1)->c; c2 = (Q)BDY(p2)->c; - if ( dp_fcoeffs ) { - /* do nothing */ - } else if ( INT(c1) && INT(c2) ) { - gcdn(NM(c1),NM(c2),&gn); - if ( !UNIN(gn) ) { - divsn(NM(c1),gn,&tn); NTOQ(tn,SGN(c1),c); c1 = c; - divsn(NM(c2),gn,&tn); NTOQ(tn,SGN(c2),c); c2 = c; - } - } else { - ezgcdpz(CO,(P)c1,(P)c2,&g); - divsp(CO,(P)c1,g,&a); c1 = (Q)a; divsp(CO,(P)c2,g,&a); c2 = (Q)a; - } - NEWMP(m); m->dl = d; chsgnp((P)c1,&m->c); NEXT(m) = 0; MKDP(n,m,s); s->sugar = d->td; - muld(CO,p2,s,&t); muldc(CO,p1,(P)c2,&s); addd(CO,s,t,&r); - muldc(CO,p0,(P)c2,&h); - *head = h; *rest = r; *dnp = (P)c2; -} - void Pdp_sp(arg,rp) NODE arg; DP *rp; @@ -1278,58 +669,6 @@ DP *rp; dp_sp(p1,p2,rp); } -void dp_sp(p1,p2,rp) -DP p1,p2; -DP *rp; -{ - int i,n,td; - int *w; - DL d1,d2,d; - MP m; - DP t,s,u; - Q c,c1,c2; - N gn,tn; - - n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - w = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, td = 0; i < n; i++ ) { - w[i] = MAX(d1->d[i],d2->d[i]); td += w[i]; - } - - NEWDL(d,n); d->td = td - d1->td; - for ( i = 0; i < n; i++ ) - d->d[i] = w[i] - d1->d[i]; -#if 0 - NEWMP(m); m->dl = d; divsp(CO,ONE,BDY(p1)->c,&m->c); NEXT(m) = 0; - MKDP(n,m,s); muld(CO,p1,s,&t); - - NEWDL(d,n); d->td = td - d2->td; - for ( i = 0; i < n; i++ ) - d->d[i] = w[i] - d2->d[i]; - NEWMP(m); m->dl = d; divsp(CO,ONE,BDY(p2)->c,&m->c); NEXT(m) = 0; - MKDP(n,m,s); muld(CO,p2,s,&u); -#endif - c1 = (Q)BDY(p1)->c; c2 = (Q)BDY(p2)->c; - if ( INT(c1) && INT(c2) ) { - gcdn(NM(c1),NM(c2),&gn); - if ( !UNIN(gn) ) { - divsn(NM(c1),gn,&tn); NTOQ(tn,SGN(c1),c); c1 = c; - divsn(NM(c2),gn,&tn); NTOQ(tn,SGN(c2),c); c2 = c; - } - } - - NEWMP(m); m->dl = d; m->c = (P)c2; NEXT(m) = 0; - MKDP(n,m,s); s->sugar = d->td; muld(CO,p1,s,&t); - - NEWDL(d,n); d->td = td - d2->td; - for ( i = 0; i < n; i++ ) - d->d[i] = w[i] - d2->d[i]; - NEWMP(m); m->dl = d; m->c = (P)c1; NEXT(m) = 0; - MKDP(n,m,s); s->sugar = d->td; muld(CO,p2,s,&u); - - subd(CO,t,u,rp); -} - void Pdp_sp_mod(arg,rp) NODE arg; DP *rp; @@ -1344,35 +683,6 @@ DP *rp; dp_sp_mod(p1,p2,mod,rp); } -void dp_sp_mod(p1,p2,mod,rp) -DP p1,p2; -int mod; -DP *rp; -{ - int i,n,td; - int *w; - DL d1,d2,d; - MP m; - DP t,s,u; - - n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - w = (int *)ALLOCA(n*sizeof(int)); - for ( i = 0, td = 0; i < n; i++ ) { - w[i] = MAX(d1->d[i],d2->d[i]); td += w[i]; - } - NEWDL(d,n); d->td = td - d1->td; - for ( i = 0; i < n; i++ ) - d->d[i] = w[i] - d1->d[i]; - NEWMP(m); m->dl = d; m->c = (P)BDY(p2)->c; NEXT(m) = 0; - MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p1,s,&t); - NEWDL(d,n); d->td = td - d2->td; - for ( i = 0; i < n; i++ ) - d->d[i] = w[i] - d2->d[i]; - NEWMP(m); m->dl = d; m->c = (P)BDY(p1)->c; NEXT(m) = 0; - MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,p2,s,&u); - submd(CO,mod,t,u,rp); -} - void Pdp_lcm(arg,rp) NODE arg; DP *rp; @@ -1404,21 +714,6 @@ DP *rp; dp_hm(p,rp); } -void dp_hm(p,rp) -DP p; -DP *rp; -{ - MP m,mr; - - if ( !p ) - *rp = 0; - else { - m = BDY(p); - NEWMP(mr); mr->dl = m->dl; mr->c = m->c; NEXT(mr) = 0; - MKDP(p->nv,mr,*rp); (*rp)->sugar = mr->dl->td; /* XXX */ - } -} - void Pdp_ht(arg,rp) NODE arg; DP *rp; @@ -1458,21 +753,6 @@ DP *rp; dp_rest((DP)ARG0(arg),rp); } -void dp_rest(p,rp) -DP p,*rp; -{ - MP m; - - m = BDY(p); - if ( !NEXT(m) ) - *rp = 0; - else { - MKDP(p->nv,NEXT(m),*rp); - if ( *rp ) - (*rp)->sugar = p->sugar; - } -} - void Pdp_td(arg,rp) NODE arg; Q *rp; @@ -1618,33 +898,6 @@ LIST *rp; } } -DL lcm_of_DL(nv,dl1,dl2,dl) -int nv; -DL dl1,dl2; -register DL dl; -{ - register int n, *d1, *d2, *d, td; - - if ( !dl ) NEWDL(dl,nv); - d = dl->d, d1 = dl1->d, d2 = dl2->d; - for ( td = 0, n = nv; --n >= 0; d1++, d2++, d++ ) - td += (*d = *d1 > *d2 ? *d1 : *d2 ); - dl->td = td; - return dl; -} - -int dl_equal(nv,dl1,dl2) -int nv; -DL dl1, dl2; -{ - register int *d1, *d2, n; - - if ( dl1->td != dl2->td ) return 0; - for ( d1 = dl1->d, d2 = dl2->d, n = nv; --n >= 0; d1++, d2++ ) - if ( *d1 != *d2 ) return 0; - return 1; -} - void Pdp_nelim(arg,rp) NODE arg; Q *rp; @@ -1696,75 +949,126 @@ DP *rp; dp_homo((DP)ARG0(arg),rp); } -void dp_homo(p,rp) -DP p; +void Pdp_dehomo(arg,rp) +NODE arg; DP *rp; { - MP m,mr,mr0; - int i,n,nv,td; - DL dl,dlh; + asir_assert(ARG0(arg),O_DP,"dp_dehomo"); + dp_dehomo((DP)ARG0(arg),rp); +} - if ( !p ) - *rp = 0; - else { - n = p->nv; nv = n + 1; - m = BDY(p); td = sugard(m); - for ( mr0 = 0; m; m = NEXT(m) ) { - NEXTMP(mr0,mr); mr->c = m->c; - dl = m->dl; - mr->dl = dlh = (DL)MALLOC_ATOMIC((nv+1)*sizeof(int)); - dlh->td = td; - for ( i = 0; i < n; i++ ) - dlh->d[i] = dl->d[i]; - dlh->d[n] = td - dl->td; +void Pdp_gr_flags(arg,rp) +NODE arg; +LIST *rp; +{ + Obj name,value; + NODE n; + + if ( arg ) { + asir_assert(ARG0(arg),O_LIST,"dp_gr_flags"); + n = BDY((LIST)ARG0(arg)); + while ( n ) { + name = (Obj)BDY(n); n = NEXT(n); + if ( !n ) + break; + else { + value = (Obj)BDY(n); n = NEXT(n); + } + dp_set_flag(name,value); } - NEXT(mr) = 0; MKDP(nv,mr0,*rp); (*rp)->sugar = p->sugar; } + dp_make_flaglist(rp); } -void Pdp_dehomo(arg,rp) +extern int DP_Print; + +void Pdp_gr_print(arg,rp) NODE arg; -DP *rp; +Q *rp; { - asir_assert(ARG0(arg),O_DP,"dp_dehomo"); - dp_dehomo((DP)ARG0(arg),rp); + Q q; + + if ( arg ) { + asir_assert(ARG0(arg),O_N,"dp_gr_print"); + q = (Q)ARG0(arg); DP_Print = QTOS(q); + } else + STOQ(DP_Print,q); + *rp = q; } -void dp_dehomo(p,rp) -DP p; -DP *rp; +void Pdp_gr_main(arg,rp) +NODE arg; +LIST *rp; { - MP m,mr,mr0; - int i,n,nv; - DL dl,dlh; + LIST f,v; + Num homo; + Q m; + int modular; + struct order_spec ord; - if ( !p ) - *rp = 0; - else { - n = p->nv; nv = n - 1; - m = BDY(p); - for ( mr0 = 0; m; m = NEXT(m) ) { - NEXTMP(mr0,mr); mr->c = m->c; - dlh = m->dl; - mr->dl = dl = (DL)MALLOC_ATOMIC((nv+1)*sizeof(int)); - dl->td = dlh->td - dlh->d[nv]; - for ( i = 0; i < nv; i++ ) - dl->d[i] = dlh->d[i]; - } - NEXT(mr) = 0; MKDP(nv,mr0,*rp); (*rp)->sugar = p->sugar; - } + 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"); + else + modular = QTOS(m); + create_order_spec(ARG4(arg),&ord); + dp_gr_main(f,v,homo,modular,&ord,rp); } -int dp_nt(p) -DP p; +void Pdp_f4_main(arg,rp) +NODE arg; +LIST *rp; { - int i; - MP m; + LIST f,v; + struct order_spec ord; - if ( !p ) - return 0; - else { - for ( i = 0, m = BDY(p); m; m = NEXT(m), i++ ); - return i; - } + 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); } + +void Pdp_f4_mod_main(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + int m; + struct order_spec ord; + + asir_assert(ARG0(arg),O_LIST,"dp_f4_main"); + asir_assert(ARG1(arg),O_LIST,"dp_f4_main"); + asir_assert(ARG2(arg),O_N,"dp_f4_main"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); m = QTOS((Q)ARG2(arg)); + create_order_spec(ARG3(arg),&ord); + dp_f4_mod_main(f,v,m,&ord,rp); +} + +void Pdp_gr_mod_main(arg,rp) +NODE arg; +LIST *rp; +{ + LIST f,v; + Num homo; + int m; + struct order_spec ord; + + asir_assert(ARG0(arg),O_LIST,"dp_gr_mod_main"); + asir_assert(ARG1(arg),O_LIST,"dp_gr_mod_main"); + 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); + homo = (Num)ARG2(arg); m = QTOS((Q)ARG3(arg)); + create_order_spec(ARG4(arg),&ord); + dp_gr_mod_main(f,v,homo,m,&ord,rp); +} +