=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.2 retrieving revision 1.11 diff -u -p -r1.2 -r1.11 --- OpenXM_contrib2/asir2000/builtin/gr.c 2000/04/13 06:01:01 1.2 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2000/12/05 01:24:50 1.11 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.1.1.1 1999/12/03 07:39:07 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/gr.c,v 1.10 2000/09/08 02:56:32 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "base.h" @@ -33,6 +81,7 @@ int TP,NBP,NMP,NFP,NDP,ZR,NZR; #define NEWDP_pairs ((DP_pairs)MALLOC(sizeof(struct dp_pairs))) extern int (*cmpdl)(); +extern int do_weyl; void Pdp_gr_flags(), Pdp_gr_print(); void Pdp_gr_main(),Pdp_gr_mod_main(),Pdp_f4_main(),Pdp_f4_mod_main(); @@ -41,7 +90,7 @@ void print_stat(void); void init_stat(void); int dp_load_t(int,DP *); void dp_load(int,DP *); -void dp_save(int,DP); +void dp_save(int,Obj,char *); void dp_make_flaglist(LIST *); void dp_set_flag(Obj,Obj); int membercheck(NODE,NODE); @@ -126,7 +175,10 @@ static char *Demand = 0; static int PtozpRA = 0; LIST Dist = 0; int NoGCD = 0; +int GenTrace = 0; +int OXCheck = -1; int doing_f4; +NODE TraceList; void Pdp_gr_flags(arg,rp) NODE arg; @@ -259,6 +311,8 @@ DL dl1,dl2; return 0; } +/* b[] should be cleared */ + void _dpmod_to_vect(f,at,b) DP f; DL *at; @@ -510,7 +564,7 @@ LIST *rp; int i; struct order_spec ord1; VL fv,vv,vc; - DP b,c; + DP b,c,c1; NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx; dp_fcoeffs = 0; @@ -523,8 +577,9 @@ LIST *rp; for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&b); _dp_mod(b,m,0,&c); + _dp_monic(c,m,&c1); if ( c ) { - NEXTNODE(fd0,fd); BDY(fd) = (pointer)c; + NEXTNODE(fd0,fd); BDY(fd) = (pointer)c1; } } if ( fd0 ) NEXT(fd) = 0; @@ -618,7 +673,11 @@ NODE f; fprintf(asir_out,"mat : %d x %d",row,col); fflush(asir_out); } +#if 0 + rank = generic_gauss_elim_hensel(mat,&nm,&dn,&rind,&cind); +#else rank = generic_gauss_elim(mat,&nm,&dn,&rind,&cind); +#endif if ( Print ) fprintf(asir_out,"done rank = %d\n",rank,row,col); for ( i = 0; i < rank; i++ ) { @@ -653,6 +712,8 @@ NODE f; return g; } +/* initial bases are monic */ + NODE gb_f4_mod(f,m) NODE f; int m; @@ -664,14 +725,15 @@ int m; DP h,nf,f1,f2,f21,f21r,sp,sp1,sd,sdm,tdp; MP mp,mp0; NODE blist,bt,nt; - DL *ht,*at; - int **mat; - int *colstat; - int rank,nred,nonzero; - struct oEGT tmp0,tmp1,tmp2,eg_split_symb,eg_split_elim; - extern struct oEGT eg_symb,eg_elim; + DL *ht,*at,*st; + int **spmat,**redmat; + int *colstat,*w; + int rank,nred,nsp,nonzero,spcol; + int *indred,*isred,*ri; + struct oEGT tmp0,tmp1,tmp2,eg_split_symb,eg_split_elim1,eg_split_elim2; + extern struct oEGT eg_symb,eg_elim1,eg_elim2; - init_eg(&eg_symb); init_eg(&eg_elim); + init_eg(&eg_symb); init_eg(&eg_elim1); init_eg(&eg_elim2); for ( gall = g = 0, d = 0, r = f; r; r = NEXT(r) ) { i = (int)BDY(r); d = updpairs(d,g,i); @@ -709,66 +771,112 @@ int m; nred++; } } + + get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); + init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); /* the first nred polys in blist are reducers */ /* row = the number of all the polys */ for ( r = blist, row = 0; r; r = NEXT(r), row++ ); + + /* head terms of reducers */ ht = (DL *)MALLOC(nred*sizeof(DL)); for ( r = blist, i = 0; i < nred; r = NEXT(r), i++ ) ht[i] = BDY((DP)BDY(r))->dl; + + /* col = number of all terms */ for ( s = s0, col = 0; s; s = NEXT(s), col++ ); + + /* head terms of all terms */ at = (DL *)MALLOC(col*sizeof(DL)); for ( s = s0, i = 0; i < col; s = NEXT(s), i++ ) at[i] = (DL)BDY(s); - mat = almat(row,col); - for ( i = 0, r = blist; i < row; r = NEXT(r), i++ ) - _dpmod_to_vect(BDY(r),at,mat[i]); - colstat = (int *)MALLOC_ATOMIC(col*sizeof(int)); - for ( i = 0, nonzero=0; i < row; i++ ) - for ( j = 0; j < col; j++ ) - if ( mat[i][j] ) + + /* store coefficients separately in spmat and redmat */ + nsp = row-nred; + + /* reducer matrix */ + redmat = (int **)almat(nred,col); + for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ) + _dpmod_to_vect(BDY(r),at,redmat[i]); + /* XXX */ +/* reduce_reducers_mod(redmat,nred,col,m); */ + /* register the position of the head term */ + indred = (int *)MALLOC(nred*sizeof(int)); + bzero(indred,nred*sizeof(int)); + isred = (int *)MALLOC(col*sizeof(int)); + bzero(isred,col*sizeof(int)); + for ( i = 0; i < nred; i++ ) { + ri = redmat[i]; + for ( j = 0; j < col && !ri[j]; j++ ); + indred[i] = j; + isred[j] = 1; + } + + spcol = col-nred; + /* head terms not in ht */ + st = (DL *)MALLOC(spcol*sizeof(DL)); + for ( j = 0, k = 0; j < col; j++ ) + if ( !isred[j] ) + st[k++] = at[j]; + + /* spoly matrix; stored in reduced form; terms in ht[] are omitted */ + spmat = almat(nsp,spcol); + w = (int *)MALLOC(col*sizeof(int)); + for ( ; i < row; r = NEXT(r), i++ ) { + bzero(w,col*sizeof(int)); + _dpmod_to_vect(BDY(r),at,w); + reduce_sp_by_red_mod(w,redmat,indred,nred,col,m); + for ( j = 0, k = 0; j < col; j++ ) + if ( !isred[j] ) + spmat[i-nred][k++] = w[j]; + } + + get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0); + init_eg(&eg_split_elim1); add_eg(&eg_split_elim1,&tmp1,&tmp0); + + colstat = (int *)MALLOC_ATOMIC(spcol*sizeof(int)); + for ( i = 0, nonzero=0; i < nsp; i++ ) + for ( j = 0; j < spcol; j++ ) + if ( spmat[i][j] ) nonzero++; if ( Print ) - fprintf(asir_out,"mat : %d x %d (nonzero=%f%%)...", - row,col,((double)nonzero*100)/(row*col)); - get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); - init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); - rank = generic_gauss_elim_mod(mat,row,col,m,colstat); - get_eg(&tmp2); add_eg(&eg_elim,&tmp1,&tmp2); - init_eg(&eg_split_elim); add_eg(&eg_split_elim,&tmp1,&tmp2); + fprintf(asir_out,"spmat : %d x %d (nonzero=%f%%)...", + nsp,spcol,((double)nonzero*100)/(nsp*spcol)); + rank = generic_gauss_elim_mod(spmat,nsp,spcol,m,colstat); + + get_eg(&tmp1); add_eg(&eg_elim2,&tmp0,&tmp1); + init_eg(&eg_split_elim2); add_eg(&eg_split_elim2,&tmp0,&tmp1); + if ( Print ) { fprintf(asir_out,"done rank = %d\n",rank,row,col); print_eg("Symb",&eg_split_symb); - print_eg("Elim",&eg_split_elim); + print_eg("Elim1",&eg_split_elim1); + print_eg("Elim2",&eg_split_elim2); fprintf(asir_out,"\n"); } - for ( j = 0, i = 0; j < col; j++ ) + for ( j = 0, i = 0; j < spcol; j++ ) if ( colstat[j] ) { - for ( k = 0; k < nred; k++ ) - if ( !cmpdl(nv,at[j],ht[k]) ) - break; - if ( k == nred ) { - /* this is a new base */ - mp0 = 0; - NEXTMP(mp0,mp); mp->dl = at[j]; mp->c = STOI(1); - for ( k = j+1; k < col; k++ ) - if ( !colstat[k] && mat[i][k] ) { - NEXTMP(mp0,mp); mp->dl = at[k]; - mp->c = STOI(mat[i][k]); - } - NEXT(mp) = 0; - MKDP(nv,mp0,nf); nf->sugar = dm->sugar; - nh = newps_mod(nf,m); - d = updpairs(d,g,nh); - g = updbase(g,nh); - gall = append_one(gall,nh); + mp0 = 0; + NEXTMP(mp0,mp); mp->dl = st[j]; mp->c = STOI(1); + for ( k = j+1; k < spcol; k++ ) + if ( !colstat[k] && spmat[i][k] ) { + NEXTMP(mp0,mp); mp->dl = st[k]; + mp->c = STOI(spmat[i][k]); } + NEXT(mp) = 0; + MKDP(nv,mp0,nf); nf->sugar = dm->sugar; + nh = newps_mod(nf,m); + d = updpairs(d,g,nh); + g = updbase(g,nh); + gall = append_one(gall,nh); i++; } } if ( Print ) { print_eg("Symb",&eg_symb); - print_eg("Elim",&eg_elim); + print_eg("Elim1",&eg_elim1); + print_eg("Elim2",&eg_elim2); fflush(asir_out); } return g; @@ -899,9 +1007,9 @@ NODE f,*r; int m; { int i; - NODE s,s0; + NODE s,s0,f0; - f = NODE_sortb(f,1); + f0 = f = NODE_sortb(f,1); psn = length(f); pslen = 2*psn; ps = (DP *)MALLOC(pslen*sizeof(DP)); psh = (DL *)MALLOC(pslen*sizeof(DL)); @@ -910,11 +1018,24 @@ int m; for ( i = 0; i < psn; i++, f = NEXT(f) ) { prim_part((DP)BDY(f),m,&ps[i]); if ( Demand ) - dp_save(i,ps[i]); + dp_save(i,(Obj)ps[i],0); psh[i] = BDY(ps[i])->dl; pss[i] = ps[i]->sugar; psc[i] = BDY(ps[i])->c; } + if ( GenTrace && (OXCheck >= 0) ) { + Q q; + STRING fname; + LIST input; + NODE arg; + Obj dmy; + + STOQ(OXCheck,q); + MKSTR(fname,"register_input"); + MKLIST(input,f0); + arg = mknode(3,q,fname,input); + Pox_cmo_rpc(arg,&dmy); + } for ( s0 = 0, i = 0; i < psn; i++ ) { NEXTNODE(s0,s); BDY(s) = (pointer)i; } @@ -926,6 +1047,8 @@ void prim_part(f,m,r) DP f,*r; int m; { + P d,t; + if ( m > 0 ) { if ( PCoeffs ) dp_prim_mod(f,m,r); @@ -938,6 +1061,11 @@ int m; dp_prim(f,r); else dp_ptozp(f,r); + if ( GenTrace && TraceList ) { + divsp(CO,BDY(f)->c,BDY(*r)->c,&d); + mulp(CO,(P)ARG3(BDY((LIST)BDY(TraceList))),d,&t); + ARG3(BDY((LIST)BDY(TraceList))) = t; + } } } @@ -1035,8 +1163,17 @@ NODE *h; } get_eg(&tmp0); dp_load(w[i],&ps[w[i]]); - _dp_nf(top,ps[w[i]],ps,1,&g); + if ( GenTrace ) { + Q q; + NODE node; + LIST hist; + + STOQ(w[i],q); + node = mknode(4,ONE,q,ONE,ONE); + MKLIST(hist,node); + MKNODE(TraceList,hist,0); + } if ( !PtozpRA || !Multiple ) _dp_nf(top,ps[w[i]],ps,1,&g); else @@ -1127,7 +1264,7 @@ NODE subst; ps[psn] = a; else ps[psn] = 0; - dp_save(psn,a); + dp_save(psn,(Obj)a,0); } else ps[psn] = a; psh[psn] = BDY(a)->dl; @@ -1135,6 +1272,31 @@ NODE subst; psc[psn] = BDY(a)->c; if ( m ) _dp_mod(a,m,subst,&psm[psn]); + if ( GenTrace ) { + NODE tn,tr,tr1; + LIST trace; + + /* reverse the TraceList */ + tn = TraceList; + for ( tr = 0; tn; tn = NEXT(tn) ) { + MKNODE(tr1,BDY(tn),tr); tr = tr1; + } + MKLIST(trace,tr); + if ( OXCheck >= 0 ) { + NODE arg; + Q q1,q2; + STRING fname; + Obj dmy; + + STOQ(OXCheck,q1); + MKSTR(fname,"check_trace"); + STOQ(psn,q2); + arg = mknode(5,q1,fname,a,q2,trace); + Pox_cmo_rpc(arg,&dmy); + } else + dp_save(psn,(Obj)trace,"t"); + TraceList = 0; + } return psn++; } @@ -1210,7 +1372,18 @@ NODE f,*g; } for ( top = 0, i = n-1; i >= 0; i-- ) if ( r[i] >= 0 ) { - dp_load(r[i],&ps[r[i]]); dp_dehomo(ps[r[i]],&u); j = newps(u,0,0); + dp_load(r[i],&ps[r[i]]); dp_dehomo(ps[r[i]],&u); + if ( GenTrace ) { + Q q; + LIST hist; + NODE node; + + STOQ(r[i],q); + node = mknode(4,0,q,0,0); + MKLIST(hist,node); + MKNODE(TraceList,hist,0); + } + j = newps(u,0,0); MKNODE(t,j,top); top = t; } *g = top; @@ -1298,6 +1471,8 @@ NODE subst; struct oEGT tnf0,tnf1,tnfm0,tnfm1,tpz0,tpz1,tsp0,tsp1,tspm0,tspm1,tnp0,tnp1,tmp0,tmp1; int skip_nf_flag; double t_0; + Q q; + int new_sugar; static prev_sugar = -1; Max_mag = 0; @@ -1323,10 +1498,12 @@ NODE subst; get_eg(&tmp1); add_eg(&eg_mp,&tmp0,&tmp1); if ( m ) { get_eg(&tspm0); - _dp_sp_mod(psm[l->dp1],psm[l->dp2],m,&h); + _dp_sp_mod_dup(psm[l->dp1],psm[l->dp2],m,&h); + if ( h ) + new_sugar = h->sugar; get_eg(&tspm1); add_eg(&eg_spm,&tspm0,&tspm1); get_eg(&tnfm0); - _dp_nf_mod(gall,h,psm,m,0,&nfm); + _dp_nf_mod_destructive(gall,h,psm,m,0,&nfm); get_eg(&tnfm1); add_eg(&eg_nfm,&tnfm0,&tnfm1); } else nfm = (DP)1; @@ -1345,6 +1522,12 @@ NODE subst; } } else dp_sp(ps[l->dp1],ps[l->dp2],&h); + if ( GenTrace ) { + STOQ(l->dp1,q); ARG1(BDY((LIST)BDY(NEXT(TraceList)))) = q; + STOQ(l->dp2,q); ARG1(BDY((LIST)BDY(TraceList))) = q; + } + if ( h ) + new_sugar = h->sugar; get_eg(&tsp1); add_eg(&eg_sp,&tsp0,&tsp1); get_eg(&tnf0); t_0 = get_rtime(); @@ -1403,9 +1586,9 @@ skip_nf: add_eg(&eg_znfm,&tnfm0,&tnfm1); ZR++; if ( Print || PrintShort ) { - if ( h && (h->sugar != prev_sugar) ) { - fprintf(asir_out,"[%d]",h->sugar); - prev_sugar = h->sugar; + if ( new_sugar != prev_sugar ) { + fprintf(asir_out,"[%d]",new_sugar); + prev_sugar = new_sugar; } fprintf(asir_out,"."); fflush(asir_out); prev = 0; } @@ -1451,10 +1634,10 @@ NODE dlist; l->dp2 = QTOS((Q)BDY(pair)); if ( m ) { get_eg(&tspm0); - _dp_sp_mod(psm[l->dp1],psm[l->dp2],m,&h); + _dp_sp_mod_dup(ps[l->dp1],ps[l->dp2],m,&h); get_eg(&tspm1); add_eg(&eg_spm,&tspm0,&tspm1); get_eg(&tnfm0); - _dp_nf_mod(gall,h,psm,m,0,&nfm); + _dp_nf_mod_destructive(gall,h,ps,m,!Top,&nf); get_eg(&tnfm1); add_eg(&eg_nfm,&tnfm0,&tnfm1); } else nfm = (DP)1; @@ -1536,9 +1719,9 @@ int m; get_eg(&tspm1); add_eg(&eg_spm,&tspm0,&tspm1); get_eg(&tnfm0); dp_nf_mod(gall,h,ps,m,!Top,&nf); } else { - _dp_sp_mod(ps[l->dp1],ps[l->dp2],m,&h); + _dp_sp_mod_dup(ps[l->dp1],ps[l->dp2],m,&h); get_eg(&tspm1); add_eg(&eg_spm,&tspm0,&tspm1); get_eg(&tnfm0); - _dp_nf_mod(gall,h,ps,m,!Top,&nf); + _dp_nf_mod_destructive(gall,h,ps,m,!Top,&nf); } get_eg(&tnfm1); add_eg(&eg_nfm,&tnfm0,&tnfm1); if ( nf ) { @@ -1560,17 +1743,19 @@ int m; print_split_eg(&tnfm0,&tnfm1); fflush(asir_out); fprintf(asir_out,"(%d,%d),nb=%d,nab=%d,rp=%d,sugar=%d",l->dp1,l->dp2,length(g),length(gall),DPPlength(d),pss[nh]); printdl(psh[nh]); fprintf(asir_out,"\n"); fflush(asir_out); + } else if ( PrintShort ) { + fprintf(asir_out,"+"); fflush(asir_out); } prev = 1; } else { add_eg(&eg_znfm,&tnfm0,&tnfm1); ZR++; - if ( Print ) { + if ( Print || PrintShort ) { fprintf(asir_out,"."); fflush(asir_out); prev = 0; } } } - if ( Print ) + if ( Print || PrintShort ) fprintf(asir_out,"gb_mod done\n"); return g; } @@ -1656,8 +1841,8 @@ DP *ps; int full; DP *rp; { - DP u,p,d,s,t; - P dmy; + DP u,p,d,s,t,mult; + P coef; NODE l; MP m,mr; int sugar,psugar; @@ -1670,9 +1855,20 @@ DP *rp; for ( u = 0, l = b; l; l = NEXT(l) ) { if ( dl_redble(BDY(g)->dl,psh[(int)BDY(l)]) ) { dp_load((int)BDY(l),&p); - dp_red(d,g,p,&t,&u,&dmy); + /* t+u = coef*(d+g) - mult*p (t = coef*d) */ + dp_red(d,g,p,&t,&u,&coef,&mult); psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; sugar = MAX(sugar,psugar); + if ( GenTrace ) { + LIST hist; + Q cq; + NODE node,node0; + + STOQ((int)BDY(l),cq); + node0 = mknode(4,coef,cq,mult,ONE); + MKLIST(hist,node0); + MKNODE(node,hist,TraceList); TraceList = node; + } if ( !u ) { if ( d ) d->sugar = sugar; @@ -1705,6 +1901,9 @@ DP *rp; double pz_t_e, pz_t_d, pz_t_d1, pz_t_c, im_t_s, im_t_r; +extern int GenTrace; +extern NODE TraceList; + void _dp_nf_ptozp(b,g,ps,full,multiple,r) NODE b; DP g; @@ -1726,6 +1925,9 @@ DP *r; extern int kara_mag; double get_rtime(); double t_0,t_00,tt,ttt,t_p,t_m,t_m1,t_m2,t_s,t_g,t_a; + LIST hist; + NODE node; + Q rcred,mrcred; if ( !g ) { *r = 0; return; @@ -1745,6 +1947,7 @@ DP *r; dc = 0; dp = 0; rc = ONE; rp = g; MKSTR(imul,"dp_imul_index"); + /* g = dc*dp+rc*rp */ for ( ; rp; ) { for ( u = 0, l = b; l; l = NEXT(l) ) { if ( dl_redble(BDY(rp)->dl,psh[(int)BDY(l)]) ) { @@ -1758,7 +1961,6 @@ DP *r; t_0 = get_rtime(); dp_subd(rp,red,&shift); -#if INET if ( Dist && ndist && HMAG(red) > kara_bit ) { NODE n0,n1,n2,n3; int i,s,id; @@ -1776,9 +1978,7 @@ DP *r; muldc(CO,rp,(P)cr,&t); NEXT(n0)=0; Pox_pop_local(n0,&t1); - } else -#endif - { + } else { /* if ( Print ) fprintf(asir_out,"l"); @@ -1799,10 +1999,23 @@ DP *r; psugar = (BDY(rp)->dl->td - BDY(red)->dl->td) + red->sugar; sugar = MAX(sugar,psugar); + if ( GenTrace ) { + /* u = cr*rp + (-cred)*shift*red */ + STOQ((int)BDY(l),cq); + node = mknode(4,cr,cq,0,0); + mulq(cred,rc,&rcred); + chsgnnum((Num)rcred,(Num *)&mrcred); + muldc(CO,shift,(P)mrcred,(DP *)&ARG2(node)); + MKLIST(hist,node); + } if ( !u ) { if ( dp ) dp->sugar = sugar; *r = dp; + if ( GenTrace ) { + ARG3(BDY(hist)) = ONE; + MKNODE(node,hist,TraceList); TraceList = node; + } goto final; } break; @@ -1811,7 +2024,6 @@ DP *r; if ( u ) { if ( HMAG(u) > hmag ) { t_0 = get_rtime(); -#if INET if ( Dist && HMAG(u) > kara_bit ) { if ( Print ) fprintf(asir_out,"D"); @@ -1820,10 +2032,7 @@ DP *r; if ( Print ) fprintf(asir_out,"L"); dp_ptozp_d(0,0,u,&t); - } -#else - dp_ptozp(u,&t); /* XXX */ -#endif + } dp_ptozp(u,&t); /* XXX */ tt = get_rtime()-t_0; t_g += tt; t_0 = get_rtime(); divsn(NM((Q)BDY(u)->c),NM((Q)BDY(t)->c),&cn); NTOQ(cn,1,cont); @@ -1839,11 +2048,20 @@ DP *r; tt = get_rtime()-t_0; t_a += tt; rp = t; hmag = multiple*HMAG(rp)/denom; + if ( GenTrace ) { + NTOQ(gn,1,gcd); + ARG3(BDY(hist)) = (pointer)gcd; + MKNODE(node,hist,TraceList); TraceList = node; + } } else { t_0 = get_rtime(); mulq(cr,dc,&dcq); dc = dcq; tt = get_rtime()-t_0; t_a += tt; rp = u; + if ( GenTrace ) { + ARG3(BDY(hist)) = (pointer)ONE; + MKNODE(node,hist,TraceList); TraceList = node; + } } } else if ( !full ) { if ( rp ) { @@ -1867,6 +2085,10 @@ DP *r; tt = get_rtime()-t_0; t_a += tt; } } + if ( GenTrace ) { + mulq(ARG3(BDY((LIST)BDY(TraceList))),dc,&cq); + ARG3(BDY((LIST)BDY(TraceList))) = (pointer)cq; + } if ( dp ) dp->sugar = sugar; *r = dp; @@ -2144,13 +2366,16 @@ int t; dl1 = DPPlength(d1); NFP += (dl-dl1); dl = dl1; } else dl = 1; - for ( dd = 0; d1; d1 = nd ) { - nd = NEXT(d1); - if ( !criterion_2( d1->dp1, d1->dp2 ) ) { - NEXT(d1) = dd; - dd = d1; + if ( !do_weyl ) + for ( dd = 0; d1; d1 = nd ) { + nd = NEXT(d1); + if ( !criterion_2( d1->dp1, d1->dp2 ) ) { + NEXT(d1) = dd; + dd = d1; + } } - } + else + dd = d1; dl1 = DPPlength(dd); NDP += (dl-dl1); get_eg(&tup1); add_eg(&eg_up,&tup0,&tup1); @@ -2178,7 +2403,12 @@ register int t; last = p; dp = p->dp1 = (int)BDY(r); p->dp2 = t; p->lcm = lcm_of_DL(CNVars, dl = psh[dp], tdl, (DL)0 ); - p->sugar = (ts > (s = pss[dp] - dl->td) ? ts : s) + p->lcm->td; +#if 0 + if ( do_weyl ) + p->sugar = dl_weight(p->lcm); + else +#endif + p->sugar = (ts > (s = pss[dp] - dl->td) ? ts : s) + p->lcm->td; } return last; } @@ -2353,6 +2583,17 @@ DL dl1, dl2; return 1; } +int dl_weight(dl) +DL dl; +{ + int n,w,i; + + n = CNVars/2; + for ( i = 0, w = 0; i < n; i++ ) + w += (-dl->d[i]+dl->d[n+i]); + return w; +} + int gbcheck(f) NODE f; { @@ -2468,6 +2709,10 @@ Obj name,value; Denominator = v; else if ( !strcmp(n,"PtozpRA") ) PtozpRA = v; + else if ( !strcmp(n,"GenTrace") ) + GenTrace = v; + else if ( !strcmp(n,"OXCheck") ) + OXCheck = v; } void dp_make_flaglist(list) @@ -2484,6 +2729,8 @@ LIST *list; STOQ(Reverse,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Reverse"); MKNODE(n1,name,n); n = n1; STOQ(Stat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Stat"); MKNODE(n1,name,n); n = n1; STOQ(Print,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Print"); MKNODE(n1,name,n); n = n1; + STOQ(OXCheck,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OXCheck"); MKNODE(n1,name,n); n = n1; + STOQ(GenTrace,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenTrace"); MKNODE(n1,name,n); n = n1; STOQ(PtozpRA,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PtozpRA"); MKNODE(n1,name,n); n = n1; STOQ(ShowMag,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"ShowMag"); MKNODE(n1,name,n); n = n1; STOQ(Top,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Top"); MKNODE(n1,name,n); n = n1; @@ -2503,26 +2750,21 @@ LIST *list; #define DELIM '/' -#if defined(THINK_C) -#undef DELIM -#define DELIM ':' -#endif - -void dp_save(index,p) +void dp_save(index,p,prefix) int index; -DP p; +Obj p; +char *prefix; { FILE *fp; char path[BUFSIZ]; - sprintf(path,"%s%c%d",Demand,DELIM,index); -#if defined(VISUAL) || defined(THINK_C) + if ( prefix ) + sprintf(path,"%s%c%s%d",Demand,DELIM,prefix,index); + else + sprintf(path,"%s%c%d",Demand,DELIM,index); if ( !(fp = fopen(path,"wb") ) ) -#else - if ( !(fp = fopen(path,"w") ) ) -#endif error("dp_save : cannot open a file"); - savevl(fp,VC); saveobj(fp,(Obj)p); fclose(fp); + savevl(fp,VC); saveobj(fp,p); fclose(fp); } void dp_load(index,p) @@ -2536,11 +2778,7 @@ DP *p; *p = ps[index]; else { sprintf(path,"%s%c%d",Demand,DELIM,index); -#if defined(VISUAL) || defined(THINK_C) if ( !(fp = fopen(path,"rb") ) ) -#else - if ( !(fp = fopen(path,"r") ) ) -#endif error("dp_load : cannot open a file"); skipvl(fp); loadobj(fp,(Obj *)p); fclose(fp); } @@ -2554,11 +2792,7 @@ DP *p; char path[BUFSIZ]; sprintf(path,"%s%c%d",Demand,DELIM,index); -#if defined(VISUAL) || defined(THINK_C) if ( !(fp = fopen(path,"rb") ) ) -#else - if ( !(fp = fopen(path,"r") ) ) -#endif return 0; else { skipvl(fp); loadobj(fp,(Obj *)p); fclose(fp); return 1; @@ -2582,160 +2816,3 @@ void print_stat() { print_eg("RA",&eg_ra); print_eg("MC",&eg_mc); print_eg("GC",&eg_gc); fprintf(asir_out,"T=%d,B=%d M=%d F=%d D=%d ZR=%d NZR=%d\n",TP,NBP,NMP,NFP,NDP,ZR,NZR); } - -/* - * Old codes - */ - -#if 0 -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,dmy; - NODE l; - MP m,mr; - int i,n; - int hmag,denom; - int sugar,psugar; - NODE dist; - int ndist; - int kara_bit; - extern int kara_mag; - - if ( !g ) { - *rp = 0; return; - } - denom = Denominator?Denominator:1; - hmag = multiple*HMAG(g)/denom; - kara_bit = kara_mag*27; /* XXX */ - if ( Dist ) { - dist = BDY(Dist); - ndist = length(dist); - } - sugar = g->sugar; - for ( d = 0; g; ) { - for ( u = 0, l = b; l; l = NEXT(l) ) { - if ( dl_redble(BDY(g)->dl,psh[(int)BDY(l)]) ) { - dp_load((int)BDY(l),&p); - 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 ) { - if ( Dist && HMAG(g) > kara_bit ) - dp_ptozp2_d(dist,ndist,d,g,&t,&u); - else - dp_ptozp2(d,g,&t,&u); - d = t; g = u; - hmag = multiple*HMAG(d)/denom; - } - } else { - if ( HMAG(g) > hmag ) { -#if INET - if ( Dist && HMAG(g) > kara_bit ) { - dp_ptozp_d(dist,ndist,g,&t); - } else -#endif - dp_ptozp(g,&t); - g = t; - hmag = multiple*HMAG(g)/denom; - } - } - } - 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; -} - -int criterion_2(dp1,dp2) -{ - DP g1,g2,g,s1,s2; - - monomial_gcd(ps[dp1],&g1); monomial_gcd(ps[dp2],&g2); - dp_gcd(g1,g2,&g); - dp_subd(ps[dp1],g,&s1); dp_subd(ps[dp2],g,&s2); - return _criterion_2(s1,s2); -} - -int _criterion_2( dp1, dp2 ) -DP dp1, dp2; -{ - register int i, *d1, *d2; - - d1 = BDY(dp1)->dl->d; d2 = BDY(dp2)->dl->d; - for ( i = CNVars; --i >= 0; d1++, d2++ ) - if ( (*d1 <= *d2 ? *d1 : *d2) > 0 ) return 0; - return 1; -} - -void dp_gcd(p1,p2,rp) -DP p1,p2; -DP *rp; -{ - int i,n,td; - DL d1,d2,d; - MP m; - DP s; - - n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(p2)->dl; - NEWDL(d,n); - for ( i = 0, td = 0; i < n; i++ ) { - d->d[i] = MIN(d1->d[i],d2->d[i]); - td += d->d[i]; - } - d->td = td; - NEWMP(m); m->dl = d; m->c = (P)ONE; NEXT(m) = 0; MKDP(n,m,s); s->sugar = d->td; - *rp = s; -} - -void monomial_gcd(p,rp) -DP p; -DP *rp; -{ - int n,i,td; - DL d,d1; - MP m; - DP s; - - n = p->nv; m = BDY(p); d = m->dl; - NEWDL(d1,n); - for ( i = 0; i < n; i++ ) - d1->d[i] = d->d[i]; - for ( m = NEXT(m); m; m = NEXT(m) ) { - d = m->dl; - for ( i = 0; i < n; i++ ) - d1->d[i] = MIN(d1->d[i],d->d[i]); - } - for ( i = 0, td = 0; i < n; i++ ) - td += d1->d[i]; - NEWMP(m); m->dl = d1; m->c = (P)ONE; NEXT(m) = 0; MKDP(n,m,s); s->sugar = d->td; - *rp = s; -} -#endif