=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.5 retrieving revision 1.9 diff -u -p -r1.5 -r1.9 --- OpenXM_contrib2/asir2000/builtin/gr.c 2000/05/29 08:54:45 1.5 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2000/08/22 05:03:58 1.9 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.4 2000/04/25 04:07:58 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.8 2000/08/21 08:31:19 noro Exp $ +*/ #include "ca.h" #include "parse.h" #include "base.h" @@ -42,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); @@ -127,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; @@ -714,7 +765,7 @@ int m; dltod(BDY(s),nv,&tdp); dp_subd(tdp,ps[(int)BDY(r)],&sd); _dp_mod(sd,m,0,&sdm); - _mulmd(CO,m,ps[(int)BDY(r)],sdm,&f2); + _mulmd(CO,m,sdm,ps[(int)BDY(r)],&f2); MKNODE(bt,f2,blist); blist = bt; s = symb_merge(s,dp_dllist(f2),nv); nred++; @@ -956,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)); @@ -967,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; } @@ -983,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); @@ -995,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; + } } } @@ -1092,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 @@ -1184,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; @@ -1192,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++; } @@ -1267,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; @@ -1355,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; @@ -1380,10 +1498,11 @@ 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); + 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; @@ -1402,6 +1521,11 @@ 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; + } + new_sugar = h->sugar; get_eg(&tsp1); add_eg(&eg_sp,&tsp0,&tsp1); get_eg(&tnf0); t_0 = get_rtime(); @@ -1460,9 +1584,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; } @@ -1508,10 +1632,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; @@ -1593,9 +1717,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 ) { @@ -1617,17 +1741,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; } @@ -1713,8 +1839,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; @@ -1727,9 +1853,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; @@ -1762,6 +1899,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; @@ -1783,6 +1923,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; @@ -1802,6 +1945,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)]) ) { @@ -1856,10 +2000,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; @@ -1896,11 +2053,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 ) { @@ -1924,6 +2090,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; @@ -2544,6 +2714,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) @@ -2560,6 +2734,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; @@ -2584,21 +2760,25 @@ LIST *list; #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 ( prefix ) + sprintf(path,"%s%c%s%d",Demand,DELIM,prefix,index); + else + sprintf(path,"%s%c%d",Demand,DELIM,index); #if defined(VISUAL) || defined(THINK_C) 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) @@ -2671,7 +2851,8 @@ DP *ps; int full,multiple; DP *rp; { - DP u,p,d,s,t,dmy; + P dmy; + DP u,p,d,s,t,dmy1; NODE l; MP m,mr; int i,n; @@ -2697,7 +2878,7 @@ 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); + dp_red(d,g,p,&t,&u,&dmy,&dmy1); psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar; sugar = MAX(sugar,psugar); if ( !u ) {