=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.14 retrieving revision 1.33 diff -u -p -r1.14 -r1.33 --- OpenXM_contrib2/asir2000/builtin/gr.c 2000/12/08 02:39:05 1.14 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/17 08:37:30 1.33 @@ -45,13 +45,21 @@ * 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.13 2000/12/05 08:29:43 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.32 2001/09/17 07:16:58 noro Exp $ */ #include "ca.h" #include "parse.h" #include "base.h" #include "ox.h" +#if defined(__GNUC__) +#define INLINE inline +#elif defined(VISUAL) +#define INLINE __inline +#else +#define INLINE +#endif + #define ITOS(p) (((unsigned int)(p))&0x7fffffff) #define STOI(i) ((P)((unsigned int)(i)|0x80000000)) @@ -85,6 +93,9 @@ extern int do_weyl; extern DP_Print; +void dptoca(DP,unsigned int **); +void _tf_to_vect_compress(NODE,DL *,CDP *); +NODE mul_dllist(DL,DP); void dp_imul_d(DP,Q,DP *); void print_stat(void); void init_stat(void); @@ -105,7 +116,8 @@ DP_pairs criterion_M(DP_pairs); DP_pairs criterion_B(DP_pairs,int); DP_pairs newpairs(NODE,int); DP_pairs updpairs(DP_pairs,NODE,int); -void _dp_nf(NODE,DP,DP *,int,int,DP *); +void _dp_nf(NODE,DP,DP *,int,DP *); +void _dp_nf_z(NODE,DP,DP *,int,int,DP *); NODE gb_mod(NODE,int); NODE gbd(NODE,int,NODE,NODE); NODE gb(NODE,int,NODE); @@ -134,7 +146,7 @@ void pltovl(LIST,VL *); void printdl(DL); int DPPlength(DP_pairs); void dp_gr_mod_main(LIST,LIST,Num,int,struct order_spec *,LIST *); -void dp_gr_main(LIST,LIST,Num,int,struct order_spec *,LIST *); +void dp_gr_main(LIST,LIST,Num,int,int,struct order_spec *,LIST *); void dp_f4_main(LIST,LIST,struct order_spec *,LIST *); void dp_f4_mod_main(LIST,LIST,int,struct order_spec *,LIST *); double get_rtime(); @@ -150,17 +162,18 @@ static P *psc; static int *pss; static int psn,pslen; -static int NVars,CNVars,PCoeffs; +static int NVars,CNVars; static VL VC; +int PCoeffs; int DP_Print = 0; int DP_Multiple = 0; +int DP_NFStat = 0; LIST Dist = 0; int NoGCD = 0; int GenTrace = 0; int OXCheck = -1; -static DP_NFStat = 0; static int NoSugar = 0; static int NoCriB = 0; static int NoGC = 0; @@ -178,8 +191,9 @@ static int PtozpRA = 0; int doing_f4; NODE TraceList; +NODE AllTraceList; -int eqdl(nv,dl1,dl2) +INLINE int eqdl(nv,dl1,dl2) int nv; DL dl1,dl2; { @@ -214,6 +228,41 @@ int *b; } } +/* [t,findex] -> tf -> compressed vector */ + +void _tf_to_vect_compress(tf,at,b) +NODE tf; +DL *at; +CDP *b; +{ + int i,j,k,nv,len; + DL t,s,d1; + DP f; + MP m; + CDP r; + + t = (DL)BDY(tf); + f = ps[(int)BDY(NEXT(tf))]; + + nv = f->nv; + for ( m = BDY(f), len = 0; m; m = NEXT(m), len++ ); + r = (CDP)MALLOC(sizeof(struct oCDP)); + r->len = len; + r->psindex = (int)BDY(NEXT(tf)); + r->body = (unsigned int *)MALLOC_ATOMIC(sizeof(unsigned int)*len); + + NEWDL(s,nv); + for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) { + d1 = m->dl; + s->td = t->td+d1->td; + for ( k = 0; k < nv; k++ ) + s->d[k] = t->d[k]+d1->d[k]; + for ( ; !eqdl(nv,s,at[i]); i++ ); + r->body[j] = i; + } + *b = r; +} + void dp_to_vect(f,at,b) DP f; DL *at; @@ -245,6 +294,32 @@ DP f; return mp0; } +NODE mul_dllist(d,f) +DL d; +DP f; +{ + MP m; + NODE mp,mp0; + DL t,d1; + int i,nv; + + if ( !f ) + return 0; + nv = NV(f); + mp0 = 0; + for ( m = BDY(f); m; m = NEXT(m) ) { + NEXTNODE(mp0,mp); + NEWDL(t,nv); + d1 = m->dl; + t->td = d->td+d1->td; + for ( i = 0; i < nv; i++ ) + t->d[i] = d->d[i]+d1->d[i]; + BDY(mp) = (pointer)t; + } + NEXT(mp) = 0; + return mp0; +} + void pdl(f) NODE f; { @@ -255,19 +330,22 @@ NODE f; printf("\n"); } -void dp_gr_main(f,v,homo,modular,ord,rp) +void dp_gr_main(f,v,homo,modular,field,ord,rp) LIST f,v; Num homo; -int modular; +int modular,field; struct order_spec *ord; LIST *rp; { int i,mindex,m,nochk; struct order_spec ord1; + Q q; VL fv,vv,vc; NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx; + NODE ind,ind0; + LIST trace,gbindex; - mindex = 0; nochk = 0; dp_fcoeffs = 0; + mindex = 0; nochk = 0; dp_fcoeffs = field; get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc); NVars = length((NODE)vv); PCoeffs = vc ? 1 : 0; VC = vc; CNVars = homo ? NVars+1 : NVars; @@ -294,7 +372,7 @@ LIST *rp; modular = -modular; nochk = 1; } if ( modular ) - m = modular > 1 ? modular : lprime[mindex]; + m = modular > 1 ? modular : get_lprime(mindex); else m = 0; makesubst(vc,&subst); @@ -324,19 +402,34 @@ LIST *rp; if ( modular > 1 ) { *rp = 0; return; } else - m = lprime[++mindex]; + m = get_lprime(++mindex); makesubst(vc,&subst); psn = length(s); for ( i = psn; i < pslen; i++ ) { pss[i] = 0; psh[i] = 0; psc[i] = 0; ps[i] = 0; } } - for ( r0 = 0; x; x = NEXT(x) ) { + for ( r0 = 0, ind0 = 0; x; x = NEXT(x) ) { NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]); dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r)); + NEXTNODE(ind0,ind); + STOQ((int)BDY(x),q); BDY(ind) = q; } if ( r0 ) NEXT(r) = 0; + if ( ind0 ) NEXT(ind) = 0; MKLIST(*rp,r0); + MKLIST(gbindex,ind0); + + if ( GenTrace && OXCheck < 0 ) { + + x = AllTraceList; + for ( r = 0; x; x = NEXT(x) ) { + MKNODE(r0,BDY(x),r); r = r0; + } + MKLIST(trace,r); + r0 = mknode(3,*rp,gbindex,trace); + MKLIST(*rp,r0); + } print_stat(); if ( ShowMag ) fprintf(asir_out,"\nMax_mag=%d\n",Max_mag); @@ -353,6 +446,7 @@ LIST *rp; VL fv,vv,vc; NODE fd,fd0,r,r0,t,x,s,xx; DP a,b,c; +extern struct oEGT eg_red_mod; get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc); NVars = length((NODE)vv); PCoeffs = vc ? 1 : 0; VC = vc; @@ -390,7 +484,9 @@ LIST *rp; if ( homo ) { initd(&ord1); CNVars = NVars+1; } +/* init_eg(&eg_red_mod); */ x = gb_mod(s,m); +/* print_eg("Red_mod",&eg_red_mod); */ if ( homo ) { reducebase_dehomo(x,&xx); x = xx; initd(ord); CNVars = NVars; @@ -414,7 +510,7 @@ LIST f,v; struct order_spec *ord; LIST *rp; { - int i,mindex,m,nochk; + int i,mindex,m,nochk,homogen; struct order_spec ord1; VL fv,vv,vc; NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx; @@ -426,13 +522,17 @@ LIST *rp; if ( ord->id && NVars != ord->nv ) error("dp_f4_main : invalid order specification"); initd(ord); - for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { + for ( fd0 = 0, t = BDY(f), homogen = 1; t; t = NEXT(t) ) { NEXTNODE(fd0,fd); ptod(CO,vv,(P)BDY(t),(DP *)&BDY(fd)); + if ( homogen ) + homogen = dp_homogeneous(BDY(fd)); } if ( fd0 ) NEXT(fd) = 0; setup_arrays(fd0,0,&s); x = gb_f4(s); - reduceall(x,&xx); x = xx; + if ( !homogen ) { + reduceall(x,&xx); x = xx; + } for ( r0 = 0; x; x = NEXT(x) ) { NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]); dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r)); @@ -447,7 +547,7 @@ int m; struct order_spec *ord; LIST *rp; { - int i; + int i,homogen; struct order_spec ord1; VL fv,vv,vc; DP b,c,c1; @@ -460,8 +560,10 @@ LIST *rp; if ( ord->id && NVars != ord->nv ) error("dp_f4_mod_main : invalid order specification"); initd(ord); - for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { + for ( fd0 = 0, t = BDY(f), homogen = 1; t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&b); + if ( homogen ) + homogen = dp_homogeneous(b); _dp_mod(b,m,0,&c); _dp_monic(c,m,&c1); if ( c ) { @@ -471,7 +573,9 @@ LIST *rp; if ( fd0 ) NEXT(fd) = 0; setup_arrays(fd0,m,&s); x = gb_f4_mod(s,m); - reduceall_mod(x,m,&xx); x = xx; + if ( !homogen ) { + reduceall_mod(x,m,&xx); x = xx; + } for ( r0 = 0; x; x = NEXT(x) ) { NEXTNODE(r0,r); _dtop_mod(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r)); } @@ -600,6 +704,8 @@ NODE f; /* initial bases are monic */ +unsigned int **psca; + NODE gb_f4_mod(f,m) NODE f; int m; @@ -610,21 +716,29 @@ int m; DP_pairs d,dm,dr,t; DP h,nf,f1,f2,f21,f21r,sp,sp1,sd,sdm,tdp; MP mp,mp0; - NODE blist,bt,nt; + NODE blist,bt,nt,bt1,dt,rhtlist; DL *ht,*at,*st; - int **spmat,**redmat; - int *colstat,*w; + int **spmat; + CDP *redmat; + int *colstat,*w,*w1; int rank,nred,nsp,nonzero,spcol; - int *indred,*isred,*ri; + int *indred,*isred; + CDP ri; + int pscalen; struct oEGT tmp0,tmp1,tmp2,eg_split_symb,eg_split_elim1,eg_split_elim2; extern struct oEGT eg_symb,eg_elim1,eg_elim2; + /* initialize coeffcient array list of ps[] */ + pscalen = pslen; + psca = (unsigned int **)MALLOC(pscalen*sizeof(unsigned int *)); + 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); g = updbase(g,i); gall = append_one(gall,i); + dptoca(ps[i],&psca[i]); } if ( gall ) nv = ((DP)ps[(int)BDY(gall)])->nv; @@ -642,7 +756,7 @@ int m; s0 = symb_merge(s0,dp_dllist(sp),nv); } } - /* s0 : all the terms appeared in symbolic redunction */ + /* s0 : all the terms appeared in symbolic reduction */ for ( s = s0, nred = 0; s; s = NEXT(s) ) { for ( r = gall; r; r = NEXT(r) ) if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(s),nv) ) @@ -650,26 +764,19 @@ int m; if ( r ) { dltod(BDY(s),nv,&tdp); dp_subd(tdp,ps[(int)BDY(r)],&sd); - _dp_mod(sd,m,0,&sdm); - mulmd_dup(m,sdm,ps[(int)BDY(r)],&f2); - MKNODE(bt,f2,blist); blist = bt; - s = symb_merge(s,dp_dllist(f2),nv); + dt = mul_dllist(BDY(sd)->dl,ps[(int)BDY(r)]); + /* list of [t,f] */ + bt1 = mknode(2,BDY(sd)->dl,BDY(r)); + MKNODE(bt,bt1,blist); blist = bt; + symb_merge(s,dt,nv); 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++ ); @@ -682,21 +789,20 @@ int m; nsp = row-nred; /* reducer matrix */ - redmat = (int **)almat(nred,col); + /* indred : register the position of the head term */ + redmat = (CDP *)MALLOC(nred*sizeof(CDP)); 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); */ + _tf_to_vect_compress(BDY(r),at,&redmat[i]); + /* register the position of the head term */ - indred = (int *)MALLOC(nred*sizeof(int)); + indred = (int *)MALLOC_ATOMIC(nred*sizeof(int)); bzero(indred,nred*sizeof(int)); - isred = (int *)MALLOC(col*sizeof(int)); + isred = (int *)MALLOC_ATOMIC(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; + indred[i] = ri->body[0]; + isred[indred[i]] = 1; } spcol = col-nred; @@ -705,32 +811,57 @@ int m; for ( j = 0, k = 0; j < col; j++ ) if ( !isred[j] ) st[k++] = at[j]; + get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); + init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); + get_eg(&tmp1); /* 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++ ) { + spmat = (int **)MALLOC(nsp*sizeof(int *)); + w = (int *)MALLOC_ATOMIC(col*sizeof(int)); + + /* skip reducers in blist */ + for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ); + for ( i = 0; r; r = NEXT(r) ) { 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]; + reduce_sp_by_red_mod_compress(w,redmat,indred,nred,col,m); + for ( j = 0; j < col; j++ ) + if ( w[j] ) + break; + if ( j < col ) { + w1 = (int *)MALLOC_ATOMIC(spcol*sizeof(int)); + for ( j = 0, k = 0; j < col; j++ ) + if ( !isred[j] ) + w1[k++] = w[j]; + spmat[i] = w1; + i++; + } } + /* update nsp */ + nsp = i; + /* XXX free redmat explicitly */ + for ( k = 0; k < nred; k++ ) { + GC_free(BDY(redmat[k])); + GC_free(redmat[k]); + } + 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)); + bzero(colstat,spcol*sizeof(int)); for ( i = 0, nonzero=0; i < nsp; i++ ) for ( j = 0; j < spcol; j++ ) if ( spmat[i][j] ) nonzero++; - if ( DP_Print ) + if ( DP_Print && nsp ) 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); - + if ( nsp ) + rank = generic_gauss_elim_mod(spmat,nsp,spcol,m,colstat); + else + rank = 0; get_eg(&tmp1); add_eg(&eg_elim2,&tmp0,&tmp1); init_eg(&eg_split_elim2); add_eg(&eg_split_elim2,&tmp0,&tmp1); @@ -741,6 +872,10 @@ int m; print_eg("Elim2",&eg_split_elim2); fprintf(asir_out,"\n"); } + + if ( !rank ) + continue; + for ( j = 0, i = 0; j < spcol; j++ ) if ( colstat[j] ) { mp0 = 0; @@ -753,11 +888,22 @@ int m; NEXT(mp) = 0; MKDP(nv,mp0,nf); nf->sugar = dm->sugar; nh = newps_mod(nf,m); + if ( nh == pscalen ) { + psca = (unsigned int **) + REALLOC(psca,2*pscalen*sizeof(unsigned int *)); + pscalen *= 2; + } + dptoca(ps[nh],&psca[nh]); d = updpairs(d,g,nh); g = updbase(g,nh); gall = append_one(gall,nh); i++; } + + /* XXX free spmat[] explicitly */ + for ( j = 0; j < nsp; j++ ) { + GC_free(spmat[j]); + } } if ( DP_Print ) { print_eg("Symb",&eg_symb); @@ -895,7 +1041,11 @@ int m; int i; NODE s,s0,f0; +#if 1 f0 = f = NODE_sortb(f,1); +#else + f0 = f; +#endif psn = length(f); pslen = 2*psn; ps = (DP *)MALLOC(pslen*sizeof(DP)); psh = (DL *)MALLOC(pslen*sizeof(DL)); @@ -909,18 +1059,28 @@ int m; pss[i] = ps[i]->sugar; psc[i] = BDY(ps[i])->c; } - if ( GenTrace && (OXCheck >= 0) ) { + if ( GenTrace ) { Q q; STRING fname; LIST input; - NODE arg; + NODE arg,t,t1; Obj dmy; + + t = 0; + for ( i = psn-1; i >= 0; i-- ) { + MKNODE(t1,ps[i],t); + t = t1; + } + MKLIST(input,t); - STOQ(OXCheck,q); - MKSTR(fname,"register_input"); - MKLIST(input,f0); - arg = mknode(3,q,fname,input); - Pox_cmo_rpc(arg,&dmy); + if ( OXCheck >= 0 ) { + STOQ(OXCheck,q); + MKSTR(fname,"register_input"); + arg = mknode(3,q,fname,input); + Pox_cmo_rpc(arg,&dmy); + } else if ( OXCheck < 0 ) { + MKNODE(AllTraceList,input,0); + } } for ( s0 = 0, i = 0; i < psn; i++ ) { NEXTNODE(s0,s); BDY(s) = (pointer)i; @@ -948,6 +1108,8 @@ int m; else dp_ptozp(f,r); if ( GenTrace && TraceList ) { + /* adust the denominator according to the final + content reduction */ 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; @@ -1060,7 +1222,7 @@ NODE *h; MKLIST(hist,node); MKNODE(TraceList,hist,0); } - _dp_nf(top,ps[w[i]],ps,1,PtozpRA?DP_Multiple:0,&g); + _dp_nf(top,ps[w[i]],ps,1,&g); prim_part(g,0,&g1); get_eg(&tmp1); add_eg(&eg_ra,&tmp0,&tmp1); if ( DP_Print || DP_PrintShort ) { @@ -1155,7 +1317,11 @@ NODE subst; _dp_mod(a,m,subst,&psm[psn]); if ( GenTrace ) { NODE tn,tr,tr1; - LIST trace; + LIST trace,trace1; + NODE arg; + Q q1,q2; + STRING fname; + Obj dmy; /* reverse the TraceList */ tn = TraceList; @@ -1164,16 +1330,17 @@ NODE subst; } 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 if ( OXCheck < 0 ) { + STOQ(psn,q1); + tn = mknode(2,q1,trace); + MKLIST(trace1,tn); + MKNODE(tr,trace1,AllTraceList); + AllTraceList = tr; } else dp_save(psn,(Obj)trace,"t"); TraceList = 0; @@ -1405,7 +1572,10 @@ NODE subst; new_sugar = h->sugar; get_eg(&tnf0); t_0 = get_rtime(); - _dp_nf(gall,h,ps,!Top,DP_Multiple,&nf); + if ( PCoeffs || dp_fcoeffs ) + _dp_nf(gall,h,ps,!Top,&nf); + else + _dp_nf_z(gall,h,ps,!Top,DP_Multiple,&nf); if ( DP_Print ) fprintf(asir_out,"(%.3g)",get_rtime()-t_0); get_eg(&tnf1); add_eg(&eg_nf,&tnf0,&tnf1); @@ -1803,8 +1973,10 @@ NODE f; while ( d ) { l = d; d = NEXT(d); get_eg(&tmp0); - dp_load(l->dp1,&dp1); dp_load(l->dp2,&dp2); dp_sp(dp1,dp2,&h); - _dp_nf(gall,h,ps,1,0,&nf); + dp_load(l->dp1,&dp1); dp_load(l->dp2,&dp2); + dp_sp(dp1,dp2,&h); +/* fprintf(stderr,"{%d,%d}",l->dp1,l->dp2); */ + _dp_nf(gall,h,ps,1,&nf); get_eg(&tmp1); add_eg(&eg_gc,&tmp0,&tmp1); if ( DP_Print || DP_PrintShort ) { fprintf(asir_out,"."); fflush(asir_out); @@ -1830,7 +2002,7 @@ NODE f,x; } for ( ; f; f = NEXT(f) ) { get_eg(&tmp0); - _dp_nf(x,(DP)BDY(f),ps,1,0,&g); + _dp_nf(x,(DP)BDY(f),ps,1,&g); get_eg(&tmp1); add_eg(&eg_mc,&tmp0,&tmp1); if ( DP_Print ) { print_split_eg(&tmp0,&tmp1); fflush(asir_out); @@ -1914,6 +2086,7 @@ 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(DP_Print,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Print"); MKNODE(n1,name,n); n = n1; + STOQ(DP_PrintShort,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PrintShort"); MKNODE(n1,name,n); n = n1; STOQ(DP_NFStat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"NFStat"); 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; @@ -2006,17 +2179,95 @@ void print_stat() { * */ -#define SAFENM(q) ((q)?NM(q):0) - 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; +extern int mpi_mag; -void _dp_nf(b,g,ps,full,multiple,r) +void dp_mulc_d(p,c,r) +DP p; +P c; +DP *r; +{ + if ( Dist && BDY(Dist) + && HMAG(p) > mpi_mag + && p_mag((P)c) > mpi_mag ) { + if ( DP_NFStat ) fprintf(asir_out,"~"); + dp_imul_d(p,(Q)c,r); + } else { + if ( DP_NFStat ) fprintf(asir_out,"_"); + muldc(CO,p,c,r); + } +} + +void _dp_nf(b,g,ps,full,rp) NODE b; DP g; DP *ps; +int full; +DP *rp; +{ + DP u,p,d,s,t,mult; + P coef; + 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 ( dl_redble(BDY(g)->dl,psh[(int)BDY(l)]) ) { + dp_load((int)BDY(l),&p); + /* 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; + *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_nf_z(b,g,ps,full,multiple,r) +NODE b; +DP g; +DP *ps; int full,multiple; DP *r; { @@ -2029,11 +2280,9 @@ DP *r; int sugar,psugar; NODE dist; STRING imul; - int ndist; int kara_bit; - extern int mpi_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; + double t_0,t_00,tt,ttt,t_p,t_m,t_g,t_a; LIST hist; NODE node; Q rcred,mrcred; @@ -2042,14 +2291,10 @@ DP *r; *r = 0; return; } pz_t_e = pz_t_d = pz_t_d1 = pz_t_c = 0; - t_p = t_m = t_m1 = t_m2 = t_s = t_g = t_a = 0; + t_p = t_m = t_g = t_a = 0; denom = Denominator?Denominator:1; hmag = multiple*HMAG(g)/denom; - if ( Dist ) { - dist = BDY(Dist); - ndist = length(dist); - } sugar = g->sugar; dc = 0; dp = 0; rc = ONE; rp = g; @@ -2062,49 +2307,20 @@ DP *r; t_0 = get_rtime(); dp_load((int)BDY(l),&red); hr = (Q)BDY(rp)->c; hred = (Q)BDY(red)->c; - /* - * hr = HC(rp), hred = HC(red) - * cred = hr/GCD(hr,hred), cr = hred/GCD(hr,hred) - */ igcd_cofactor((Q)BDY(rp)->c,(Q)BDY(red)->c,&gcd,&cred,&cr); - tt = get_rtime()-t_0; t_p += tt; + tt = get_rtime(); t_p += tt-t_0; - t_0 = get_rtime(); dp_subd(rp,red,&shift); - - t_00 = get_rtime(); - if ( Dist && ndist - && HMAG(red) > mpi_mag - && p_mag((P)cr) > mpi_mag ) { - if ( DP_NFStat ) fprintf(asir_out,"~"); - dp_imul_d(rp,cr,&t); - } else { - if ( DP_NFStat ) fprintf(asir_out,"_"); - muldc(CO,rp,(P)cr,&t); - } - ttt = get_rtime()-t_00; t_m1 += ttt/dp_nt(rp); - - t_00 = get_rtime(); + dp_mulc_d(rp,cr,&t); chsgnp((P)cred,(P *)&mcred); - if ( Dist && ndist - && HMAG(red) > mpi_mag - && p_mag((P)mcred) > mpi_mag ) { - if ( DP_NFStat ) fprintf(asir_out,"="); - dp_imul_d(red,mcred,&t1); - } else { - if ( DP_NFStat ) fprintf(asir_out,"_"); - muldc(CO,red,(P)mcred,&t1); - } - ttt = get_rtime()-t_00; t_m2 += ttt/dp_nt(red); + dp_mulc_d(red,mcred,&t1); + muld(CO,shift,t1,&t1); + addd(CO,t,t1,&u); + t_m += get_rtime()-tt; - t_00 = get_rtime(); - muld(CO,shift,t1,&t2); - addd(CO,t,t2,&u); - tt = get_rtime(); t_m += tt-t_0; - ttt = get_rtime(); t_s += ttt-t_00; - 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); @@ -2114,6 +2330,7 @@ DP *r; muldc(CO,shift,(P)mrcred,(DP *)&ARG2(node)); MKLIST(hist,node); } + if ( !u ) { if ( dp ) dp->sugar = sugar; @@ -2130,37 +2347,29 @@ DP *r; if ( u ) { if ( multiple && HMAG(u) > hmag ) { t_0 = get_rtime(); - if ( Dist && HMAG(u) > mpi_mag ) { - if ( DP_NFStat ) - fprintf(asir_out,"D"); - dp_ptozp_d(dist,ndist,u,&t); - } else { - if ( DP_NFStat ) - fprintf(asir_out,"L"); - dp_ptozp_d(0,0,u,&t); - } - 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); + dp_ptozp_d(u,&rp); + tt = get_rtime(); t_g += tt-t_0; + + divsq((Q)BDY(u)->c,(Q)BDY(rp)->c,&cont); if ( !dp_fcoeffs && DP_NFStat ) { - fprintf(asir_out,"(%d)",p_mag((P)cont)*100/p_mag((P)BDY(u)->c)); + fprintf(asir_out, + "(%d)",p_mag((P)cont)*100/p_mag((P)BDY(u)->c)); fflush(asir_out); } - mulq(cr,dc,&dcq); - mulq(cont,rc,&rcq); + mulq(cr,dc,&dcq); mulq(cont,rc,&rcq); igcd_cofactor(dcq,rcq,&gcd,&dc,&rc); - tt = get_rtime()-t_0; t_a += tt; - rp = t; + t_a = get_rtime()-tt; + hmag = multiple*HMAG(rp)/denom; if ( GenTrace ) { 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; + t_0 = get_rtime(); + mulq(cr,dc,&dc); + t_a += get_rtime()-t_0; if ( GenTrace ) { ARG3(BDY(hist)) = (pointer)ONE; MKNODE(node,hist,TraceList); TraceList = node; @@ -2175,15 +2384,11 @@ DP *r; } else { t_0 = get_rtime(); mulq((Q)BDY(rp)->c,rc,&c); - igcd_cofactor(dc,c,&gcd,&dcq,&cq); - muldc(CO,dp,(P)dcq,&t1); - m = BDY(rp); NEWMP(mr); mr->dl = m->dl; mr->c = (P)cq; - NEXT(mr) = 0; MKDP(rp->nv,mr,t); t->sugar = mr->dl->td; - addd(CO,t,t1,&dp); - dc = gcd; - - dp_rest(rp,&t); rp = t; - tt = get_rtime()-t_0; t_a += tt; + igcd_cofactor(dc,c,&dc,&dcq,&cq); + muldc(CO,dp,(P)dcq,&t); + dp_hm(rp,&t1); BDY(t1)->c = (P)cq; addd(CO,t,t1,&dp); + dp_rest(rp,&rp); + t_a += get_rtime()-t_0; } } if ( GenTrace ) { @@ -2195,9 +2400,9 @@ DP *r; *r = dp; final: if ( DP_NFStat ) - fprintf(asir_out,"(%.3g %.3g %.3g %.3g %.3g %.3g %.3g %.3g %.3g %.3g %.3g)", - t_p,t_m,t_m1,t_m2,t_s, - t_g,t_a, + fprintf(asir_out, + "(%.3g %.3g %.3g %.3g %.3g %.3g %.3g %.3g)", + t_p,t_m,t_g,t_a, pz_t_e, pz_t_d, pz_t_d1, pz_t_c); } @@ -2218,7 +2423,6 @@ DP *rp; NODE tn,dist,n0,n1,n2; Obj dmy; STRING imul; - extern LIST Dist; if ( !p || !q ) { @@ -2275,5 +2479,23 @@ VECT *rp; MKVECT(r,n); *rp = r; for ( i = 0; i < n; i++ ) mulq((Q)BDY(w)[i],(Q)c,(Q *)&BDY(r)[i]); +} + +void dptoca(p,rp) +DP p; +unsigned int **rp; +{ + int i; + MP m; + unsigned int *r; + + if ( !p ) + *rp = 0; + else { + for ( m = BDY(p), i = 0; m; m = NEXT(m), i++ ); + *rp = r = (unsigned int *)MALLOC_ATOMIC(i*sizeof(unsigned int)); + for ( m = BDY(p), i = 0; m; m = NEXT(m), i++ ) + r[i] = ITOS(C(m)); + } }