=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.26 retrieving revision 1.36 diff -u -p -r1.26 -r1.36 --- OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/11 01:30:31 1.26 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2001/10/01 01:58:02 1.36 @@ -45,15 +45,20 @@ * 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.25 2001/09/10 05:55:14 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.35 2001/09/18 00:56:05 noro Exp $ */ #include "ca.h" #include "parse.h" #include "base.h" #include "ox.h" -#define ITOS(p) (((unsigned int)(p))&0x7fffffff) -#define STOI(i) ((P)((unsigned int)(i)|0x80000000)) +#if defined(__GNUC__) +#define INLINE inline +#elif defined(VISUAL) +#define INLINE __inline +#else +#define INLINE +#endif #define NEXTVL(r,c) \ if(!(r)){NEWVL(r);(c)=(r);}else{NEWVL(NEXT(c));(c)=NEXT(c);} @@ -85,6 +90,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); @@ -112,6 +120,7 @@ NODE gbd(NODE,int,NODE,NODE); NODE gb(NODE,int,NODE); NODE gb_f4(NODE); NODE gb_f4_mod(NODE,int); +NODE gb_f4_mod_old(NODE,int); DP_pairs minp(DP_pairs, DP_pairs *); void minsugar(DP_pairs,DP_pairs *,DP_pairs *); NODE append_one(NODE,int); @@ -182,7 +191,7 @@ int doing_f4; NODE TraceList; NODE AllTraceList; -int eqdl(nv,dl1,dl2) +INLINE int eqdl(nv,dl1,dl2) int nv; DL dl1,dl2; { @@ -217,54 +226,41 @@ int *b; } } -/* create compressed poly */ +/* [t,findex] -> tf -> compressed vector */ -void _dpmod_to_vect_compress(f,at,b) -DP f; +void _tf_to_vect_compress(tf,at,b) +NODE tf; DL *at; CDP *b; { - int i,j,nv,len; + 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->body = (CM)MALLOC(sizeof(struct oCM)*len); + r->psindex = (int)BDY(NEXT(tf)); + r->body = (unsigned int *)MALLOC_ATOMIC(sizeof(unsigned int)*len); + NEWDL_NOINIT(s,nv); for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) { - for ( ; !eqdl(nv,m->dl,at[i]); i++ ); - r->body[j].index = i; - r->body[j].c = ITOS(m->c); + 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; } -/* dense vector -> CDP */ -void compress_vect(a,n,rp) -int *a; -int n; -CDP *rp; -{ - int i,j,nz; - CDP r; - - for ( i = 0, nz = 0; i < n; i++ ) - if ( a[i] ) nz++; - *rp = r = (CDP)MALLOC(sizeof(struct oCDP)); - r->len = nz; - r->body = (CM)MALLOC(sizeof(struct oCM)*nz); - for ( i = 0, j = 0; i < n; i++ ) { - if ( a[i] ) { - r->body[j].index = i; - r->body[j].c = ITOS(a[i]); - j++; - } - } -} - void dp_to_vect(f,at,b) DP f; DL *at; @@ -296,6 +292,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_NOINIT(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; { @@ -486,7 +508,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; @@ -498,13 +520,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)); @@ -519,7 +545,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; @@ -532,8 +558,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 ) { @@ -542,13 +570,20 @@ 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; + init_stat(); + if ( do_weyl ) + x = gb_f4_mod_old(s,m); + else + x = gb_f4_mod(s,m); + 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)); } if ( r0 ) NEXT(r) = 0; MKLIST(*rp,r0); + print_stat(); } NODE gb_f4(f) @@ -672,6 +707,8 @@ NODE f; /* initial bases are monic */ +unsigned int **psca; + NODE gb_f4_mod(f,m) NODE f; int m; @@ -682,23 +719,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; CDP *redmat; int *colstat,*w,*w1; - int rank,nred,nsp,nonzero,spcol; + int rank,nred,nsp,nsp0,nonzero,spcol; 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; @@ -711,61 +754,41 @@ int m; /* asph : sum of all head terms of spoly */ for ( t = dm; t; t = NEXT(t) ) { _dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp); +/* fprintf(stderr,"splen=%d-",dp_nt(sp)); */ if ( sp ) { MKNODE(bt,sp,blist); blist = bt; s0 = symb_merge(s0,dp_dllist(sp),nv); +/* fprintf(stderr,"%d-",length(s0)); */ } } + if ( DP_Print ) + fprintf(asir_out,"initial spmat : %d x %d ",length(blist),length(s0)); /* s0 : all the terms appeared in symbolic reduction */ -#if 0 for ( s = s0, nred = 0; s; s = NEXT(s) ) { - for ( j = psn-1; j >= 0; j-- ) - if ( _dl_redble(BDY(ps[j])->dl,BDY(s),nv) ) - break; - if ( j >= 0 ) { - dltod(BDY(s),nv,&tdp); - dp_subd(tdp,ps[j],&sd); - for ( k = 0, i = 0; k < nv; k++ ) - if ( BDY(sd)->dl->d[k] ) - i++; - fprintf(stderr,"%c ",i<=1 ? 'o' : 'x'); - _dp_mod(sd,m,0,&sdm); - mulmd_dup(m,sdm,ps[j],&f2); - MKNODE(bt,f2,blist); blist = bt; - s = symb_merge(s,dp_dllist(f2),nv); - nred++; - } - } -#else - 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) ) break; 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)]); +/* fprintf(stderr,"[%d]",length(dt)); */ + /* list of [t,f] */ + bt1 = mknode(2,BDY(sd)->dl,BDY(r)); + MKNODE(bt,bt1,blist); blist = bt; + symb_merge(s,dt,nv); +/* fprintf(stderr,"%d-",length(s)); */ nred++; } } -#endif - fprintf(stderr,"\n"); - - get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1); - init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1); +/* fprintf(stderr,"\n"); */ + if ( DP_Print ) + fprintf(asir_out,"number of reducers : %d\n",nred); /* 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++ ); @@ -779,29 +802,20 @@ int m; /* reducer matrix */ /* indred : register the position of the head term */ -#if 0 - reduce_reducers_mod_compress(blist,nred,at,col,m,&redmat,&indred); - isred = (int *)MALLOC(col*sizeof(int)); - bzero(isred,col*sizeof(int)); - for ( i = 0; i < nred; i++ ) - isred[indred[i]] = 1; -#else redmat = (CDP *)MALLOC(nred*sizeof(CDP)); for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ) - _dpmod_to_vect_compress(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]; - indred[i] = ri->body[0].index; + indred[i] = ri->body[0]; isred[indred[i]] = 1; } -#endif spcol = col-nred; /* head terms not in ht */ @@ -809,11 +823,13 @@ 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 = (int **)MALLOC(nsp*sizeof(int *)); - w = (int *)MALLOC(col*sizeof(int)); + w = (int *)MALLOC_ATOMIC(col*sizeof(int)); /* skip reducers in blist */ for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ); @@ -834,8 +850,15 @@ int m; } } /* update nsp */ + nsp0 = 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); @@ -863,6 +886,9 @@ int m; fprintf(asir_out,"\n"); } + NZR += rank; + ZR += nsp0-rank; + if ( !rank ) continue; @@ -878,11 +904,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); @@ -893,6 +930,176 @@ int m; return g; } +NODE gb_f4_mod_old(f,m) +NODE f; +int m; +{ + int i,j,k,nh,row,col,nv; + NODE r,g,gall; + NODE s,s0; + 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; + 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_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); + } + if ( gall ) + nv = ((DP)ps[(int)BDY(gall)])->nv; + while ( d ) { + get_eg(&tmp0); + minsugar(d,&dm,&dr); d = dr; + if ( DP_Print ) + fprintf(asir_out,"sugar=%d\n",dm->sugar); + blist = 0; s0 = 0; + /* asph : sum of all head terms of spoly */ + for ( t = dm; t; t = NEXT(t) ) { + _dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp); + if ( sp ) { + MKNODE(bt,sp,blist); blist = bt; + s0 = symb_merge(s0,dp_dllist(sp),nv); + } + } + /* s0 : all the terms appeared in symbolic redunction */ + 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) ) + break; + 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); + 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); + + /* 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 ( DP_Print && nsp ) + fprintf(asir_out,"spmat : %d x %d (nonzero=%f%%)...", + nsp,spcol,((double)nonzero*100)/(nsp*spcol)); + 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); + + if ( DP_Print ) { + fprintf(asir_out,"done rank = %d\n",rank,row,col); + print_eg("Symb",&eg_split_symb); + print_eg("Elim1",&eg_split_elim1); + print_eg("Elim2",&eg_split_elim2); + fprintf(asir_out,"\n"); + } + for ( j = 0, i = 0; j < spcol; j++ ) + if ( colstat[j] ) { + 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 ( DP_Print ) { + print_eg("Symb",&eg_symb); + print_eg("Elim1",&eg_elim1); + print_eg("Elim2",&eg_elim2); + fflush(asir_out); + } + return g; +} + int DPPlength(n) DP_pairs n; { @@ -2141,7 +2348,7 @@ void init_stat() { init_eg(&eg_nf); init_eg(&eg_nfm); init_eg(&eg_znfm); init_eg(&eg_pz); init_eg(&eg_np); init_eg(&eg_ra); init_eg(&eg_mc); init_eg(&eg_gc); - ZR = NZR = TP = NBP = NFP = NDP = 0; + ZR = NZR = TP = NMP = NBP = NFP = NDP = 0; } void print_stat() { @@ -2458,5 +2665,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)); + } }