=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.31 retrieving revision 1.35 diff -u -p -r1.31 -r1.35 --- OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/17 02:47:07 1.31 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2001/09/18 00:56:05 1.35 @@ -45,7 +45,7 @@ * 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.30 2001/09/17 01:18:34 noro Exp $ + * $OpenXM$ */ #include "ca.h" #include "parse.h" @@ -60,9 +60,6 @@ #define INLINE #endif -#define ITOS(p) (((unsigned int)(p))&0x7fffffff) -#define STOI(i) ((P)((unsigned int)(i)|0x80000000)) - #define NEXTVL(r,c) \ if(!(r)){NEWVL(r);(c)=(r);}else{NEWVL(NEXT(c));(c)=NEXT(c);} @@ -93,6 +90,7 @@ 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 *); @@ -227,31 +225,6 @@ int *b; } } -/* create compressed poly */ - -void _dpmod_to_vect_compress(f,at,b) -DP f; -DL *at; -CDP *b; -{ - int i,j,nv,len; - MP m; - CDP r; - - 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_ATOMIC(sizeof(struct oCM)*len); - - 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); - } - *b = r; -} - /* [t,findex] -> tf -> compressed vector */ void _tf_to_vect_compress(tf,at,b) @@ -272,44 +245,21 @@ CDP *b; for ( m = BDY(f), len = 0; m; m = NEXT(m), len++ ); r = (CDP)MALLOC(sizeof(struct oCDP)); r->len = len; - r->body = (CM)MALLOC_ATOMIC(sizeof(struct oCM)*len); + r->psindex = (int)BDY(NEXT(tf)); + r->body = (unsigned int *)MALLOC_ATOMIC(sizeof(unsigned int)*len); - NEWDL(s,nv); + NEWDL_NOINIT(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].index = i; - r->body[j].c = ITOS(m->c); + 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; @@ -356,7 +306,7 @@ DP f; mp0 = 0; for ( m = BDY(f); m; m = NEXT(m) ) { NEXTNODE(mp0,mp); - NEWDL(t,nv); + NEWDL_NOINIT(t,nv); d1 = m->dl; t->td = d->td+d1->td; for ( i = 0; i < nv; i++ ) @@ -619,6 +569,7 @@ LIST *rp; } if ( fd0 ) NEXT(fd) = 0; setup_arrays(fd0,m,&s); + init_stat(); x = gb_f4_mod(s,m); if ( !homogen ) { reduceall_mod(x,m,&xx); x = xx; @@ -628,6 +579,7 @@ LIST *rp; } if ( r0 ) NEXT(r) = 0; MKLIST(*rp,r0); + print_stat(); } NODE gb_f4(f) @@ -751,6 +703,8 @@ NODE f; /* initial bases are monic */ +unsigned int **psca; + NODE gb_f4_mod(f,m) NODE f; int m; @@ -766,18 +720,24 @@ int m; 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; @@ -795,6 +755,8 @@ int m; s0 = symb_merge(s0,dp_dllist(sp),nv); } } + if ( DP_Print ) + fprintf(asir_out,"initial spmat : %d x %d ",length(blist),length(s0)); /* s0 : all the terms appeared in symbolic reduction */ for ( s = s0, nred = 0; s; s = NEXT(s) ) { for ( r = gall; r; r = NEXT(r) ) @@ -811,6 +773,8 @@ int m; nred++; } } + 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 */ @@ -832,8 +796,7 @@ int m; redmat = (CDP *)MALLOC(nred*sizeof(CDP)); for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ ) _tf_to_vect_compress(BDY(r),at,&redmat[i]); - /* XXX */ -/* reduce_reducers_mod(redmat,nred,col,m); */ + /* register the position of the head term */ indred = (int *)MALLOC_ATOMIC(nred*sizeof(int)); bzero(indred,nred*sizeof(int)); @@ -841,7 +804,7 @@ int m; 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; } @@ -878,6 +841,7 @@ int m; } } /* update nsp */ + nsp0 = nsp; nsp = i; /* XXX free redmat explicitly */ @@ -913,6 +877,9 @@ int m; fprintf(asir_out,"\n"); } + NZR += rank; + ZR += nsp0-rank; + if ( !rank ) continue; @@ -928,6 +895,12 @@ 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); @@ -2196,7 +2169,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() { @@ -2513,5 +2486,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)); + } }