=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.12 retrieving revision 1.15 diff -u -p -r1.12 -r1.15 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/07/26 03:10:03 1.12 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/07/31 01:02:39 1.15 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.11 2003/07/26 01:00:32 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.14 2003/07/30 07:57:45 noro Exp $ */ #include "ca.h" #include "inline.h" @@ -35,17 +35,30 @@ typedef struct oNDV { typedef struct oNM { struct oNM *next; + union { + int m; + Q z; + } c; int td; - int c; unsigned int dl[1]; } *NM; typedef struct oNMV { + union { + int m; + Q z; + } c; int td; - int c; unsigned int dl[1]; } *NMV; +typedef struct oRHist { + struct oRHist *next; + int index; + int td; + unsigned int dl[1]; +} *RHist; + typedef struct oND_pairs { struct oND_pairs *next; int i1,i2; @@ -62,26 +75,37 @@ unsigned int nd_mask0,nd_mask1; NM _nm_free_list; ND _nd_free_list; ND_pairs _ndp_free_list; -NM *nd_red; +RHist *nd_red; int nd_red_len; extern int Top,Reverse; int nd_psn,nd_pslen; int nd_found,nd_create,nd_notfirst; int *nd_psl; -NM *nd_psh; +RHist *nd_psh; +int nm_adv; +#define NM_ADV(m) (m = (NM)(((char *)m)+nm_adv)) void GC_gcollect(); NODE append_one(NODE,int); #define HTD(d) ((d)->body->td) #define HDL(d) ((d)->body->dl) -#define HC(d) ((d)->body->c) +#define HCM(d) ((d)->body->c.m) +#define CM(a) ((a)->c.m) +#define DL(a) ((a)->dl) +#define TD(a) ((a)->td) +#define SG(a) ((a)->sugar) +#define LEN(a) ((a)->len) +#define NEWRHist(r) \ +((r)=(RHist)MALLOC(sizeof(struct oRHist)+(nd_wpd-1)*sizeof(unsigned int))) #define NEWND_pairs(m) if(!_ndp_free_list)_NDP_alloc(); (m)=_ndp_free_list; _ndp_free_list = NEXT(_ndp_free_list) #define NEWNM(m) if(!_nm_free_list)_NM_alloc(); (m)=_nm_free_list; _nm_free_list = NEXT(_nm_free_list) #define MKND(n,m,d) if(!_nd_free_list)_ND_alloc(); (d)=_nd_free_list; _nd_free_list = (ND)BDY(_nd_free_list); (d)->nv=(n); BDY(d)=(m) +#define NEXTRHist(r,c) \ +if(!(r)){NEWRHist(r);(c)=(r);}else{NEWRHist(NEXT(c));(c)=NEXT(c);} #define NEXTNM(r,c) \ if(!(r)){NEWNM(r);(c)=(r);}else{NEWNM(NEXT(c));(c)=NEXT(c);} #define NEXTNM2(r,c,s) \ @@ -141,7 +165,7 @@ static NDV *nd_ps; #define NMV_ADV(m) (m = (NMV)(((char *)m)+nmv_adv)) #define NEWNDV(d) ((d)=(NDV)MALLOC(sizeof(struct oNDV))) -#define MKNDV(n,m,l,d) NEWNDV(d); (d)->nv=(n); BDY(d)=(m); (d)->len = l; +#define MKNDV(n,m,l,d) NEWNDV(d); NV(d)=(n); BDY(d)=(m); LEN(d) = l; int nmv_adv; int nmv_len; @@ -166,7 +190,7 @@ void nd_free_private_storage() _nd_free_list = 0; _nm_free_list = 0; _ndp_free_list = 0; - bzero(nd_red,sizeof(REDTAB_LEN*sizeof(NM))); + bzero(nd_red,sizeof(REDTAB_LEN*sizeof(RHist))); GC_gcollect(); } @@ -524,8 +548,8 @@ ND nd_reduce(ND p1,ND p2) if ( !p1 ) return 0; else { - c2 = invm(HC(p2),nd_mod); - c1 = nd_mod-HC(p1); + c2 = invm(HCM(p2),nd_mod); + c1 = nd_mod-HCM(p1); DMAR(c1,c2,0,nd_mod,mul); td = HTD(p1)-HTD(p2); d = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); @@ -533,12 +557,12 @@ ND nd_reduce(ND p1,ND p2) prev = 0; head = cur = BDY(p1); NEWNM(new); for ( m2 = BDY(p2); m2; ) { - td2 = new->td = m2->td+td; - ndl_add(m2->dl,d,new->dl); + td2 = TD(new) = TD(m2)+td; + ndl_add(DL(m2),d,DL(new)); if ( !cur ) { - c1 = C(m2); + c1 = CM(m2); DMAR(c1,mul,0,nd_mod,c2); - C(new) = c2; + CM(new) = c2; if ( !prev ) { prev = new; NEXT(prev) = 0; @@ -552,19 +576,19 @@ ND nd_reduce(ND p1,ND p2) NEWNM(new); continue; } - if ( cur->td > td2 ) + if ( TD(cur) > td2 ) c = 1; - else if ( cur->td < td2 ) + else if ( TD(cur) < td2 ) c = -1; else - c = ndl_compare(cur->dl,new->dl); + c = ndl_compare(DL(cur),DL(new)); switch ( c ) { case 0: - c2 = C(m2); - c1 = C(cur); + c2 = CM(m2); + c1 = CM(cur); DMAR(c2,mul,c1,nd_mod,t); if ( t ) - C(cur) = t; + CM(cur) = t; else if ( !prev ) { head = NEXT(cur); FREENM(cur); @@ -584,15 +608,15 @@ ND nd_reduce(ND p1,ND p2) if ( !prev ) { /* cur = head */ prev = new; - c2 = C(m2); + c2 = CM(m2); DMAR(c2,mul,0,nd_mod,c1); - C(prev) = c1; + CM(prev) = c1; NEXT(prev) = head; head = prev; } else { - c2 = C(m2); + c2 = CM(m2); DMAR(c2,mul,0,nd_mod,c1); - C(new) = c1; + CM(new) = c1; NEXT(prev) = new; NEXT(new) = cur; prev = new; @@ -605,7 +629,7 @@ ND nd_reduce(ND p1,ND p2) FREENM(new); if ( head ) { BDY(p1) = head; - p1->sugar = MAX(p1->sugar,p2->sugar+td); + SG(p1) = MAX(SG(p1),SG(p2)+td); return p1; } else { FREEND(p1); @@ -625,18 +649,18 @@ ND nd_reduce_special(ND p1,ND p2) if ( !p1 ) return 0; else { - c2 = invm(HC(p2),nd_mod); - c1 = nd_mod-HC(p1); + c2 = invm(HCM(p2),nd_mod); + c1 = nd_mod-HCM(p1); DMAR(c1,c2,0,nd_mod,mul); prev = 0; head = cur = BDY(p1); NEWNM(new); for ( m2 = BDY(p2); m2; ) { - td2 = new->td = m2->td; + td2 = TD(new) = TD(m2); if ( !cur ) { - c1 = C(m2); + c1 = CM(m2); DMAR(c1,mul,0,nd_mod,c2); - C(new) = c2; - bcopy(m2->dl,new->dl,nd_wpd*sizeof(unsigned int)); + CM(new) = c2; + bcopy(DL(m2),DL(new),nd_wpd*sizeof(unsigned int)); if ( !prev ) { prev = new; NEXT(prev) = 0; @@ -650,19 +674,19 @@ ND nd_reduce_special(ND p1,ND p2) NEWNM(new); continue; } - if ( cur->td > td2 ) + if ( TD(cur) > td2 ) c = 1; - else if ( cur->td < td2 ) + else if ( TD(cur) < td2 ) c = -1; else - c = ndl_compare(cur->dl,m2->dl); + c = ndl_compare(DL(cur),DL(m2)); switch ( c ) { case 0: - c2 = C(m2); - c1 = C(cur); + c2 = CM(m2); + c1 = CM(cur); DMAR(c2,mul,c1,nd_mod,t); if ( t ) - C(cur) = t; + CM(cur) = t; else if ( !prev ) { head = NEXT(cur); FREENM(cur); @@ -679,19 +703,19 @@ ND nd_reduce_special(ND p1,ND p2) cur = NEXT(cur); break; case -1: - bcopy(m2->dl,new->dl,nd_wpd*sizeof(unsigned int)); + bcopy(DL(m2),DL(new),nd_wpd*sizeof(unsigned int)); if ( !prev ) { /* cur = head */ prev = new; - c2 = C(m2); + c2 = CM(m2); DMAR(c2,mul,0,nd_mod,c1); - C(prev) = c1; + CM(prev) = c1; NEXT(prev) = head; head = prev; } else { - c2 = C(m2); + c2 = CM(m2); DMAR(c2,mul,0,nd_mod,c1); - C(new) = c1; + CM(new) = c1; NEXT(prev) = new; NEXT(new) = cur; prev = new; @@ -704,7 +728,7 @@ ND nd_reduce_special(ND p1,ND p2) FREENM(new); if ( head ) { BDY(p1) = head; - p1->sugar = MAX(p1->sugar,p2->sugar+td); + SG(p1)= MAX(SG(p1),SG(p2)+td); return p1; } else { FREEND(p1); @@ -796,26 +820,36 @@ INLINE int ndl_hash_value(int td,unsigned int *d) INLINE int nd_find_reducer(ND g) { - NM m; + RHist r; int d,k,i; d = ndl_hash_value(HTD(g),HDL(g)); - for ( m = nd_red[d], k = 0; m; m = NEXT(m), k++ ) { - if ( HTD(g) == m->td && ndl_equal(HDL(g),m->dl) ) { + for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) { + if ( HTD(g) == TD(r) && ndl_equal(HDL(g),DL(r)) ) { if ( k > 0 ) nd_notfirst++; nd_found++; - return m->c; + return r->index; } } - for ( i = 0; i < nd_psn; i++ ) { - m = nd_psh[i]; - if ( HTD(g) >= m->td && ndl_reducible(HDL(g),m->dl) ) { - nd_create++; - nd_append_red(HDL(g),HTD(g),i); - return i; + if ( Reverse ) + for ( i = nd_psn-1; i >= 0; i-- ) { + r = nd_psh[i]; + if ( HTD(g) >= TD(r) && ndl_reducible(HDL(g),DL(r)) ) { + nd_create++; + nd_append_red(HDL(g),HTD(g),i); + return i; + } } - } + else + for ( i = 0; i < nd_psn; i++ ) { + r = nd_psh[i]; + if ( HTD(g) >= TD(r) && ndl_reducible(HDL(g),DL(r)) ) { + nd_create++; + nd_append_red(HDL(g),HTD(g),i); + return i; + } + } return -1; } @@ -832,20 +866,20 @@ ND nd_add(ND p1,ND p2) return p1; else { for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { - if ( m1->td > m2->td ) + if ( TD(m1) > TD(m2) ) c = 1; - else if ( m1->td < m2->td ) + else if ( TD(m1) < TD(m2) ) c = -1; else - c = ndl_compare(m1->dl,m2->dl); + c = ndl_compare(DL(m1),DL(m2)); switch ( c ) { case 0: - t = ((C(m1))+(C(m2))) - nd_mod; + t = ((CM(m1))+(CM(m2))) - nd_mod; if ( t < 0 ) t += nd_mod; s = m1; m1 = NEXT(m1); if ( t ) { - NEXTNM2(mr0,mr,s); C(mr) = (t); + NEXTNM2(mr0,mr,s); CM(mr) = (t); } else { FREENM(s); } @@ -873,7 +907,7 @@ ND nd_add(ND p1,ND p2) else NEXT(mr) = 0; BDY(p1) = mr0; - p1->sugar = MAX(p1->sugar,p2->sugar); + SG(p1) = MAX(SG(p1),SG(p2)); FREEND(p2); return p1; } @@ -898,34 +932,34 @@ int nd_nf(ND g,int full,ND *rp) *rp = 0; return 1; } - sugar0 = sugar = g->sugar; + sugar0 = sugar = SG(g); n = NV(g); mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); for ( d = 0; g; ) { index = nd_find_reducer(g); if ( index >= 0 ) { p = nd_ps[index]; - ndl_sub(HDL(g),HDL(p),mul->dl); - mul->td = HTD(g)-HTD(p); + ndl_sub(HDL(g),HDL(p),DL(mul)); + TD(mul) = HTD(g)-HTD(p); #if 0 - if ( d && (p->sugar+mul->td) > sugar ) { + if ( d && (SG(p)+TD(mul)) > sugar ) { goto afo; } #endif - if ( ndl_check_bound2(index,mul->dl) ) { + if ( ndl_check_bound2(index,DL(mul)) ) { nd_free(g); nd_free(d); return 0; } - c1 = invm(HC(p),nd_mod); c2 = nd_mod-HC(g); - DMAR(c1,c2,0,nd_mod,c); C(mul) = c; + c1 = invm(HCM(p),nd_mod); c2 = nd_mod-HCM(g); + DMAR(c1,c2,0,nd_mod,c); CM(mul) = c; #if USE_NDV ndv_mul_nm(nd_ps[index],mul,ndv_red); g = ndv_add(g,ndv_red); - sugar = MAX(sugar,ndv_red->sugar); + sugar = MAX(sugar,SG(ndv_red)); #else red = nd_mul_ind_nm(index,mul); g = nd_add(g,red); - sugar = MAX(sugar,red->sugar); + sugar = MAX(sugar,SG(red)); #endif } else if ( !full ) { *rp = g; @@ -948,7 +982,7 @@ afo: } } if ( d ) - d->sugar = sugar; + SG(d) = sugar; *rp = d; return 1; } @@ -1009,7 +1043,7 @@ int head_pbucket(PGeoBucket g) j = i; gj = g->body[j]; dj = HDL(gj); - sum = HC(gj); + sum = HCM(gj); } else { di = HDL(gi); nv = NV(gi); @@ -1021,15 +1055,15 @@ int head_pbucket(PGeoBucket g) c = ndl_compare(di,dj); if ( c > 0 ) { if ( sum ) - HC(gj) = sum; + HCM(gj) = sum; else g->body[j] = nd_remove_head(gj); j = i; gj = g->body[j]; dj = HDL(gj); - sum = HC(gj); + sum = HCM(gj); } else if ( c == 0 ) { - sum = sum+HC(gi)-nd_mod; + sum = sum+HCM(gi)-nd_mod; if ( sum < 0 ) sum += nd_mod; g->body[i] = nd_remove_head(gi); @@ -1039,7 +1073,7 @@ int head_pbucket(PGeoBucket g) if ( j < 0 ) return -1; else if ( sum ) { - HC(gj) = sum; + HCM(gj) = sum; return j; } else g->body[j] = nd_remove_head(gj); @@ -1068,8 +1102,8 @@ ND nd_nf(ND g,int full) if ( !g ) { return 0; } - sugar = g->sugar; - n = g->nv; + sugar = SG(g); + n = NV(g); bucket = create_pbucket(); add_pbucket(bucket,g); d = 0; @@ -1077,7 +1111,7 @@ ND nd_nf(ND g,int full) h = head_pbucket(bucket); if ( h < 0 ) { if ( d ) - d->sugar = sugar; + SG(d) = sugar; return d; } g = bucket->body[h]; @@ -1086,11 +1120,11 @@ ND nd_nf(ND g,int full) bucket->body[h] = nd_remove_head(g); red = nd_remove_head(red); add_pbucket(bucket,red); - sugar = MAX(sugar,red->sugar); + sugar = MAX(sugar,SG(red)); } else if ( !full ) { g = normalize_pbucket(bucket); if ( g ) - g->sugar = sugar; + SG(g) = sugar; return g; } else { m = BDY(g); @@ -1130,8 +1164,8 @@ NODE nd_gb(NODE f) while ( d ) { again: l = nd_minp(d,&d); - if ( l->sugar != sugar ) { - sugar = l->sugar; + if ( SG(l) != sugar ) { + sugar = SG(l); fprintf(asir_out,"%d",sugar); } stat = nd_sp(l,&h); @@ -1204,15 +1238,15 @@ ND_pairs nd_newpairs( NODE g, int t ) dl = HDL(nd_ps[t]); td = HTD(nd_ps[t]); - ts = nd_ps[t]->sugar - td; + ts = SG(nd_ps[t]) - td; for ( r0 = 0, h = g; h; h = NEXT(h) ) { NEXTND_pairs(r0,r); r->i1 = (int)BDY(h); r->i2 = t; ndl_lcm(HDL(nd_ps[r->i1]),dl,r->lcm); - r->td = ndl_td(r->lcm); - s = nd_ps[r->i1]->sugar-HTD(nd_ps[r->i1]); - r->sugar = MAX(s,ts) + r->td; + TD(r) = ndl_td(r->lcm); + s = SG(nd_ps[r->i1])-HTD(nd_ps[r->i1]); + SG(r) = MAX(s,ts) + TD(r); } NEXT(r) = 0; return r0; @@ -1261,11 +1295,11 @@ ND_pairs crit_M( ND_pairs d1 ) return e; } id = e->lcm; - itd = e->td; + itd = TD(e); for ( d3 = 0; d2; d2 = p ) { p = NEXT(d2), jd = d2->lcm; - jtd = d2->td; + jtd = TD(d2); if ( jtd == itd ) if ( id == jd ); else if ( ndl_reducible(jd,id) ) continue; @@ -1302,7 +1336,7 @@ ND_pairs crit_F( ND_pairs d1 ) for ( head = last = 0, p = d1; NEXT(p); ) { r = w = equivalent_pairs(p,&rest); - s = r->sugar; + s = SG(r); w = NEXT(w); while ( w ) { if ( crit_2(w->i1,w->i2) ) { @@ -1314,10 +1348,10 @@ ND_pairs crit_F( ND_pairs d1 ) FREENDP(remove); } break; - } else if ( w->sugar < s ) { + } else if ( SG(w) < s ) { FREENDP(r); r = w; - s = r->sugar; + s = SG(r); w = NEXT(w); } else { remove = w; @@ -1349,12 +1383,12 @@ static ND_pairs equivalent_pairs( ND_pairs d1, ND_pair w = d1; d = w->lcm; - td = w->td; + td = TD(w); s = NEXT(w); NEXT(w) = 0; for ( r = 0; s; s = p ) { p = NEXT(s); - if ( td == s->td && ndl_equal(d,s->lcm) ) { + if ( td == TD(s) && ndl_equal(d,s->lcm) ) { NEXT(s) = w; w = s; } else { @@ -1401,16 +1435,16 @@ ND_pairs nd_minp( ND_pairs d, ND_pairs *prest ) return m; } lcm = m->lcm; - s = m->sugar; - td = m->td; + s = SG(m); + td = TD(m); len = nd_psl[m->i1]+nd_psl[m->i2]; for ( ml = 0, l = m; p; p = NEXT(l = p) ) { - if (p->sugar < s) + if (SG(p) < s) goto find; - else if ( p->sugar == s ) { - if ( p->td < td ) + else if ( SG(p) == s ) { + if ( TD(p) < td ) goto find; - else if ( p->td == td ) { + else if ( TD(p) == td ) { c = ndl_compare(p->lcm,lcm); if ( c < 0 ) goto find; @@ -1428,8 +1462,8 @@ find: ml = l; m = p; lcm = m->lcm; - s = m->sugar; - td = m->td; + s = SG(m); + td = TD(m); len = tlen; } if ( !ml ) *prest = NEXT(m); @@ -1444,7 +1478,7 @@ find: int nd_newps(ND a) { int len; - NM m; + RHist r; if ( nd_psn == nd_pslen ) { nd_pslen *= 2; @@ -1454,16 +1488,17 @@ int nd_newps(ND a) #else nd_ps = (ND *)REALLOC((char *)nd_ps,nd_pslen*sizeof(ND)); #endif - nd_psh = (NM *)REALLOC((char *)nd_psh,nd_pslen*sizeof(NM)); + nd_psh = (RHist *)REALLOC((char *)nd_psh,nd_pslen*sizeof(RHist)); nd_bound = (unsigned int **) REALLOC((char *)nd_bound,nd_pslen*sizeof(unsigned int *)); } nd_monic(a); nd_bound[nd_psn] = nd_compute_bound(a); - NEWNM(m); m->td = HTD(a); ndl_copy(HDL(a),m->dl); nd_psh[nd_psn] = m; + NEWRHist(r); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); nd_psh[nd_psn] = r; #if USE_NDV nd_ps[nd_psn]= ndtondv(a); - nd_psl[nd_psn] = len = nd_ps[nd_psn]->len; + nd_free(a); + nd_psl[nd_psn] = len = LEN(nd_ps[nd_psn]); if ( len > nmv_len ) { nmv_len = 2*len; BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); @@ -1480,7 +1515,7 @@ NODE nd_setup(NODE f) int i,j,td,len,max; NODE s,s0,f0; unsigned int *d; - NM m; + RHist r; nd_found = 0; nd_notfirst = 0; nd_create = 0; @@ -1491,7 +1526,7 @@ NODE nd_setup(NODE f) #else nd_ps = (ND *)MALLOC(nd_pslen*sizeof(ND)); #endif - nd_psh = (NM *)MALLOC(nd_pslen*sizeof(NM)); + nd_psh = (RHist *)MALLOC(nd_pslen*sizeof(RHist)); nd_bound = (unsigned int **)MALLOC(nd_pslen*sizeof(unsigned int *)); for ( max = 0, i = 0, s = f; i < nd_psn; i++, s = NEXT(s) ) { nd_bound[i] = d = dp_compute_bound((DP)BDY(s)); @@ -1499,8 +1534,8 @@ NODE nd_setup(NODE f) max = MAX(d[j],max); } if ( !nd_red ) - nd_red = (NM *)MALLOC(REDTAB_LEN*sizeof(NM)); - bzero(nd_red,REDTAB_LEN*sizeof(NM)); + nd_red = (RHist *)MALLOC(REDTAB_LEN*sizeof(RHist)); + bzero(nd_red,REDTAB_LEN*sizeof(RHist)); if ( max < 2 ) nd_bpe = 2; @@ -1514,22 +1549,22 @@ NODE nd_setup(NODE f) nd_bpe = 16; else nd_bpe = 32; - + nd_setup_parameters(); nd_free_private_storage(); len = 0; for ( i = 0; i < nd_psn; i++, f = NEXT(f) ) { #if USE_NDV nd_ps[i] = dptondv((DP)BDY(f)); - ndv_mul_c(nd_ps[i],invm(HC(nd_ps[i]),nd_mod)); - len = MAX(len,nd_ps[i]->len); + ndv_mul_c(nd_ps[i],invm(HCM(nd_ps[i]),nd_mod)); + len = MAX(len,LEN(nd_ps[i])); #else nd_ps[i] = dptond((DP)BDY(f)); nd_mul_c(nd_ps[i],1); nd_psl[i] = nd_length(nd_ps[i]); #endif - NEWNM(m); m->td = HTD(nd_ps[i]); ndl_copy(HDL(nd_ps[i]),m->dl); - nd_psh[i] = m; + NEWRHist(r); TD(r) = HTD(nd_ps[i]); ndl_copy(HDL(nd_ps[i]),DL(r)); + nd_psh[i] = r; } #if USE_NDV nmv_len = 16*len; @@ -1616,7 +1651,7 @@ DL ndltodl(int n,int td,unsigned int *ndl) int i; NEWDL(dl,n); - dl->td = td; + TD(dl) = td; d = dl->d; if ( is_rlex ) for ( i = 0; i < n; i++ ) @@ -1642,14 +1677,14 @@ ND dptond(DP p) m0 = 0; for ( t = BDY(p); t; t = NEXT(t) ) { NEXTNM(m0,m); - m->c = ITOS(t->c); - m->td = t->dl->td; - dltondl(n,t->dl,m->dl); + CM(m) = ITOS(C(t)); + TD(m) = TD(DL(t)); + dltondl(n,DL(t),DL(m)); } NEXT(m) = 0; MKND(n,m0,d); - d->nv = n; - d->sugar = p->sugar; + NV(d) = n; + SG(d) = SG(p); return d; } @@ -1666,12 +1701,12 @@ DP ndtodp(ND p) m0 = 0; for ( t = BDY(p); t; t = NEXT(t) ) { NEXTMP(m0,m); - m->c = STOI(t->c); - m->dl = ndltodl(n,t->td,t->dl); + C(m) = STOI(CM(t)); + DL(m) = ndltodl(n,TD(t),DL(t)); } NEXT(m) = 0; MKDP(n,m0,d); - d->sugar = p->sugar; + SG(d) = SG(p); return d; } @@ -1703,8 +1738,8 @@ void nd_print(ND p) printf("0\n"); else { for ( m = BDY(p); m; m = NEXT(m) ) { - printf("+%d*",m->c); - ndl_print(m->dl); + printf("+%d*",CM(m)); + ndl_print(DL(m)); } printf("\n"); } @@ -1725,7 +1760,7 @@ void nd_monic(ND p) if ( !p ) return; else - nd_mul_c(p,invm(HC(p),nd_mod)); + nd_mul_c(p,invm(HCM(p),nd_mod)); } void nd_mul_c(ND p,int mul) @@ -1736,9 +1771,9 @@ void nd_mul_c(ND p,int mul) if ( !p ) return; for ( m = BDY(p); m; m = NEXT(m) ) { - c1 = C(m); + c1 = CM(m); DMAR(c1,mul,0,nd_mod,c); - C(m) = c; + CM(m) = c; } } @@ -1759,14 +1794,14 @@ void nd_free(ND p) void nd_append_red(unsigned int *d,int td,int i) { - NM m,m0; + RHist m,m0; int h; - NEWNM(m); + NEWRHist(m); h = ndl_hash_value(td,d); - m->c = i; - m->td = td; - ndl_copy(d,m->dl); + m->index = i; + TD(m) = td; + ndl_copy(d,DL(m)); NEXT(m) = nd_red[h]; nd_red[h] = m; } @@ -1782,14 +1817,14 @@ unsigned int *dp_compute_bound(DP p) d1 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int)); d2 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int)); m = BDY(p); - bcopy(m->dl->d,d1,nd_nvar*sizeof(unsigned int)); + bcopy(DL(m)->d,d1,nd_nvar*sizeof(unsigned int)); for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { - d = m->dl->d; + d = DL(m)->d; for ( i = 0; i < nd_nvar; i++ ) d2[i] = d[i] > d1[i] ? d[i] : d1[i]; t = d1; d1 = d2; d2 = t; } - l = nd_nvar+31; + l = (nd_nvar+31); t = (unsigned int *)MALLOC_ATOMIC(l*sizeof(unsigned int)); bzero(t,l*sizeof(unsigned int)); bcopy(d1,t,nd_nvar*sizeof(unsigned int)); @@ -1808,7 +1843,7 @@ unsigned int *nd_compute_bound(ND p) d2 = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); bcopy(HDL(p),d1,nd_wpd*sizeof(unsigned int)); for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { - ndl_lcm(m->dl,d1,d2); + ndl_lcm(DL(m),d1,d2); t = d1; d1 = d2; d2 = t; } l = nd_nvar+31; @@ -1835,6 +1870,7 @@ void nd_setup_parameters() { nd_mask[nd_epw-i-1] = (nd_mask0<<(i*nd_bpe)); nd_mask1 |= (1<<(nd_bpe-1))<<(i*nd_bpe); } + nm_adv = sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int); #if USE_NDV nmv_adv = sizeof(struct oNMV)+(nd_wpd-1)*sizeof(unsigned int); #endif @@ -1843,9 +1879,11 @@ void nd_setup_parameters() { ND_pairs nd_reconstruct(ND_pairs d) { int i,obpe,oadv; - NM prev_nm_free_list,mr0,mr,m; + NM prev_nm_free_list; + RHist mr0,mr; + RHist r; ND_pairs s0,s,t,prev_ndp_free_list; - + obpe = nd_bpe; #if USE_NDV oadv = nmv_adv; @@ -1868,7 +1906,7 @@ ND_pairs nd_reconstruct(ND_pairs d) prev_ndp_free_list = _ndp_free_list; _nm_free_list = 0; _ndp_free_list = 0; - for ( i = 0; i < nd_psn; i++ ) { + for ( i = nd_psn-1; i >= 0; i-- ) { #if USE_NDV ndv_realloc(nd_ps[i],obpe,oadv); #else @@ -1880,23 +1918,23 @@ ND_pairs nd_reconstruct(ND_pairs d) NEXTND_pairs(s0,s); s->i1 = t->i1; s->i2 = t->i2; - s->td = t->td; - s->sugar = t->sugar; + TD(s) = TD(t); + SG(s) = SG(t); ndl_dup(obpe,t->lcm,s->lcm); } for ( i = 0; i < REDTAB_LEN; i++ ) { - for ( mr0 = 0, m = nd_red[i]; m; m = NEXT(m) ) { - NEXTNM(mr0,mr); - mr->c = m->c; - mr->td = m->td; - ndl_dup(obpe,m->dl,mr->dl); + for ( mr0 = 0, r = nd_red[i]; r; r = NEXT(r) ) { + NEXTRHist(mr0,r); + mr->index = r->index; + TD(mr) = TD(r); + ndl_dup(obpe,DL(r),DL(mr)); } if ( mr0 ) NEXT(mr) = 0; nd_red[i] = mr0; } for ( i = 0; i < nd_psn; i++ ) { - NEWNM(m); m->td = nd_psh[i]->td; ndl_dup(obpe,nd_psh[i]->dl,m->dl); - nd_psh[i] = m; + NEWRHist(r); TD(r) = TD(nd_psh[i]); ndl_dup(obpe,DL(nd_psh[i]),DL(r)); + nd_psh[i] = r; } if ( s0 ) NEXT(s) = 0; prev_nm_free_list = 0; @@ -1916,6 +1954,8 @@ void ndl_dup(int obpe,unsigned int *d,unsigned int *r) oepw = (sizeof(unsigned int)*8)/obpe; cepw = nd_epw; cbpe = nd_bpe; + for ( i = 0; i < nd_wpd; i++ ) + r[i] = 0; if ( is_rlex ) for ( i = 0; i < n; i++ ) { ei = (d[(n-1-i)/oepw]>>((oepw-((n-1-i)%oepw)-1)*obpe)) @@ -1938,9 +1978,9 @@ void nd_realloc(ND p,int obpe) m = BDY(p); for ( mr0 = 0; m; m = NEXT(m) ) { NEXTNM(mr0,mr); - C(mr) = C(m); - mr->td = m->td; - ndl_dup(obpe,m->dl,mr->dl); + CM(mr) = CM(m); + TD(mr) = TD(m); + ndl_dup(obpe,DL(m),DL(mr)); } NEXT(mr) = 0; BDY(p) = mr0; @@ -1959,13 +1999,13 @@ ND nd_copy(ND p) s = sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int); for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { NEXTNM(mr0,mr); - C(mr) = C(m); - mr->td = m->td; - ndl_copy(m->dl,mr->dl); + CM(mr) = CM(m); + TD(mr) = TD(m); + ndl_copy(DL(m),DL(mr)); } NEXT(mr) = 0; MKND(NV(p),mr0,r); - r->sugar = p->sugar; + SG(r) = SG(p); return r; } } @@ -1982,14 +2022,14 @@ int nd_sp(ND_pairs p,ND *rp) p1 = nd_ps[p->i1]; p2 = nd_ps[p->i2]; lcm = p->lcm; - td = p->td; + td = TD(p); NEWNM(m); - C(m) = HC(p2); m->td = td-HTD(p1); ndl_sub(lcm,HDL(p1),m->dl); - if ( ndl_check_bound2(p->i1,m->dl) ) + CM(m) = HCM(p2); TD(m) = td-HTD(p1); ndl_sub(lcm,HDL(p1),DL(m)); + if ( ndl_check_bound2(p->i1,DL(m)) ) return 0; t1 = ndv_mul_nm_create(p1,m); - C(m) = nd_mod-HC(p1); m->td = td-HTD(p2); ndl_sub(lcm,HDL(p2),m->dl); - if ( ndl_check_bound2(p->i2,m->dl) ) { + CM(m) = nd_mod-HCM(p1); TD(m) = td-HTD(p2); ndl_sub(lcm,HDL(p2),DL(m)); + if ( ndl_check_bound2(p->i2,DL(m)) ) { nd_free(t1); return 0; } @@ -2006,11 +2046,11 @@ void ndv_mul_c(NDV p,int mul) if ( !p ) return; - len = p->len; + len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { - c1 = C(m); + c1 = CM(m); DMAR(c1,mul,0,nd_mod,c); - C(m) = c; + CM(m) = c; } } @@ -2022,18 +2062,18 @@ void ndv_mul_nm(NDV p,NM m0,NDV r) if ( !p ) /* XXX */ - r->len = 0; + LEN(r) = 0; else { - n = NV(p); m = BDY(p); len = p->len; - d = m0->dl; td = m0->td; c = C(m0); + n = NV(p); m = BDY(p); len = LEN(p); + d = DL(m0); td = TD(m0); c = CM(m0); mr = BDY(r); for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); C(mr) = c2; - mr->td = m->td+td; ndl_add(m->dl,d,mr->dl); + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); CM(mr) = c2; + TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr)); } NV(r) = NV(p); - r->len = p->len; - r->sugar = p->sugar + td; + LEN(r) = LEN(p); + SG(r) = SG(p) + td; } } @@ -2049,20 +2089,20 @@ ND ndv_mul_nm_create(NDV p,NM m0) return 0; else { n = NV(p); m = BDY(p); - d = m0->dl; td = m0->td; c = C(m0); - len = p->len; + d = DL(m0); td = TD(m0); c = CM(m0); + len = LEN(p); mr0 = 0; for ( i = 0; i < len; i++, NMV_ADV(m) ) { NEXTNM(mr0,mr); - c1 = C(m); + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); - C(mr) = c2; - mr->td = m->td+td; - ndl_add(m->dl,d,mr->dl); + CM(mr) = c2; + TD(mr) = TD(m)+td; + ndl_add(DL(m),d,DL(mr)); } NEXT(mr) = 0; MKND(NV(p),mr0,r); - r->sugar = p->sugar + td; + SG(r) = SG(p) + td; return r; } } @@ -2079,17 +2119,24 @@ ND ndv_add(ND p1,NDV p2) return 0; else { prev = 0; head = cur = BDY(p1); - NEWNM(new); len = p2->len; + NEWNM(new); len = LEN(p2); for ( m2 = BDY(p2), i = 0; cur && i < len; ) { - td2 = new->td = m2->td; - if ( cur->td > td2 ) c = 1; - else if ( cur->td < td2 ) c = -1; - else c = ndl_compare(cur->dl,m2->dl); + td2 = TD(new) = TD(m2); + if ( TD(cur) > td2 ) { + prev = cur; cur = NEXT(cur); + continue; + } else if ( TD(cur) < td2 ) c = -1; + else if ( nd_wpd == 1 ) { + if ( DL(cur)[0] > DL(m2)[0] ) c = is_rlex ? -1 : 1; + else if ( DL(cur)[0] < DL(m2)[0] ) c = is_rlex ? 1 : -1; + else c = 0; + } + else c = ndl_compare(DL(cur),DL(m2)); switch ( c ) { case 0: - t = C(m2)+C(cur)-nd_mod; + t = CM(m2)+CM(cur)-nd_mod; if ( t < 0 ) t += nd_mod; - if ( t ) C(cur) = t; + if ( t ) CM(cur) = t; else if ( !prev ) { head = NEXT(cur); FREENM(cur); cur = head; } else { @@ -2101,8 +2148,8 @@ ND ndv_add(ND p1,NDV p2) prev = cur; cur = NEXT(cur); break; case -1: - ndl_copy(m2->dl,new->dl); - C(new) = C(m2); + ndl_copy(DL(m2),DL(new)); + CM(new) = CM(m2); if ( !prev ) { /* cur = head */ prev = new; NEXT(prev) = head; head = prev; @@ -2114,7 +2161,7 @@ ND ndv_add(ND p1,NDV p2) } } for ( ; i < len; i++, NMV_ADV(m2) ) { - td2 = new->td = m2->td; C(new) = C(m2); ndl_copy(m2->dl,new->dl); + td2 = TD(new) = TD(m2); CM(new) = CM(m2); ndl_copy(DL(m2),DL(new)); if ( !prev ) { prev = new; NEXT(prev) = 0; head = prev; } else { @@ -2124,7 +2171,7 @@ ND ndv_add(ND p1,NDV p2) } FREENM(new); if ( head ) { - BDY(p1) = head; p1->sugar = MAX(p1->sugar,p2->sugar); + BDY(p1) = head; SG(p1) = MAX(SG(p1),SG(p2)); return p1; } else { FREEND(p1); @@ -2136,19 +2183,29 @@ ND ndv_add(ND p1,NDV p2) void ndv_realloc(NDV p,int obpe,int oadv) { - NMV m,mr,mr0; - int len,i; + NMV m,mr,mr0,t; + int len,i,k; -#define NMV_OADV(m) (m = (NMV)(((char *)m)+oadv)) +#define NMV_OPREV(m) (m = (NMV)(((char *)m)-oadv)) +#define NMV_PREV(m) (m = (NMV)(((char *)m)-nmv_adv)) if ( p ) { - m = BDY(p); len = p->len; - mr0 = mr = (NMV)MALLOC_ATOMIC(len*nmv_adv); - bzero(mr0,len*nmv_adv); - for ( i = 0; i < len; i++, NMV_OADV(m), NMV_ADV(mr) ) { - C(mr) = C(m); - mr->td = m->td; - ndl_dup(obpe,m->dl,mr->dl); + m = BDY(p); len = LEN(p); + if ( nmv_adv > oadv ) + mr0 = (NMV)REALLOC(BDY(p),len*nmv_adv); + else + mr0 = BDY(p); + m = (NMV)((char *)mr0+(len-1)*oadv); + mr = (NMV)((char *)mr0+(len-1)*nmv_adv); + t = (NMV)ALLOCA(nmv_adv); + for ( i = 0; i < len; i++, NMV_OPREV(m), NMV_PREV(mr) ) { + CM(t) = CM(m); + TD(t) = TD(m); + for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0; + ndl_dup(obpe,DL(m),DL(t)); + CM(mr) = CM(t); + TD(mr) = TD(t); + ndl_copy(DL(t),DL(mr)); } BDY(p) = mr0; } @@ -2166,12 +2223,12 @@ NDV ndtondv(ND p) len = nd_length(p); m0 = m = (NMV)MALLOC_ATOMIC(len*nmv_adv); for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, NMV_ADV(m) ) { - m->td = t->td; - ndl_copy(t->dl,m->dl); - m->c = t->c; + TD(m) = TD(t); + ndl_copy(DL(t),DL(m)); + CM(m) = CM(t); } MKNDV(NV(p),m0,len,d); - d->sugar = p->sugar; + SG(d) = SG(p); return d; } @@ -2188,12 +2245,12 @@ NDV dptondv(DP p) m0 = m = (NMV)MALLOC_ATOMIC(l*nmv_adv); n = NV(p); for ( t = BDY(p), i = 0; i < l; i++, t = NEXT(t), NMV_ADV(m) ) { - m->c = ITOS(t->c); - m->td = t->dl->td; - dltondl(n,t->dl,m->dl); + CM(m) = ITOS(C(t)); + TD(m) = TD(DL(t)); + dltondl(n,DL(t),DL(m)); } MKNDV(n,m0,l,d); - d->sugar = p->sugar; + SG(d) = SG(p); return d; } @@ -2207,16 +2264,16 @@ DP ndvtodp(NDV p) if ( !p ) return 0; m0 = 0; - len = p->len; + len = LEN(p); n = NV(p); for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) { NEXTMP(m0,m); - m->c = STOI(t->c); - m->dl = ndltodl(n,t->td,t->dl); + C(m) = STOI(CM(t)); + DL(m) = ndltodl(n,TD(t),DL(t)); } NEXT(m) = 0; MKDP(NV(p),m0,d); - d->sugar = p->sugar; + SG(d) = SG(p); return d; } @@ -2228,10 +2285,10 @@ void ndv_print(NDV p) if ( !p ) printf("0\n"); else { - len = p->len; + len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { - printf("+%d*",m->c); - ndl_print(m->dl); + printf("+%d*",CM(m)); + ndl_print(DL(m)); } printf("\n"); } @@ -2248,14 +2305,14 @@ int nd_sp(ND_pairs p,ND *rp) p1 = nd_ps[p->i1]; p2 = nd_ps[p->i2]; lcm = p->lcm; - td = p->td; + td = TD(p); NEWNM(m); - C(m) = HC(p2); m->td = td-HTD(p1); ndl_sub(lcm,HDL(p1),m->dl); - if ( ndl_check_bound2(p->i1,m->dl) ) + CM(m) = HCM(p2); TD(m) = td-HTD(p1); ndl_sub(lcm,HDL(p1),DL(m)); + if ( ndl_check_bound2(p->i1,DL(m)) ) return 0; t1 = nd_mul_ind_nm(p->i1,m); - C(m) = nd_mod-HC(p1); m->td = td-HTD(p2); ndl_sub(lcm,HDL(p2),m->dl); - if ( ndl_check_bound2(p->i2,m->dl) ) { + CM(m) = nd_mod-HCM(p1); TD(m) = td-HTD(p2); ndl_sub(lcm,HDL(p2),DL(m)); + if ( ndl_check_bound2(p->i2,DL(m)) ) { nd_free(t1); return 0; } @@ -2277,19 +2334,19 @@ ND nd_mul_nm(ND p,NM m0) return 0; else { n = NV(p); m = BDY(p); - d = m0->dl; td = m0->td; c = C(m0); + d = DL(m0); td = TD(m0); c = CM(m0); mr0 = 0; for ( ; m; m = NEXT(m) ) { NEXTNM(mr0,mr); - c1 = C(m); + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); - C(mr) = c2; - mr->td = m->td+td; - ndl_add(m->dl,d,mr->dl); + CM(mr) = c2; + TD(mr) = TD(m)+td; + ndl_add(DL(m),d,DL(mr)); } NEXT(mr) = 0; MKND(NV(p),mr0,r); - r->sugar = p->sugar + td; + SG(r) = SG(p) + td; return r; } } @@ -2306,11 +2363,11 @@ ND nd_mul_ind_nm(int index,NM m0) p = nd_ps[index]; len = nd_psl[index]; n = NV(p); m = BDY(p); - d = m0->dl; td = m0->td; c = C(m0); + d = DL(m0); td = TD(m0); c = CM(m0); NEWNM(mr0); - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); C(mr0) = c2; - mr0->td = m->td+td; ndl_add(m->dl,d,mr0->dl); + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); CM(mr0) = c2; + TD(mr0) = TD(m)+td; ndl_add(DL(m),d,DL(mr0)); prev = mr0; m = NEXT(m); len--; @@ -2318,28 +2375,28 @@ ND nd_mul_ind_nm(int index,NM m0) case 1: d0 = d[0]; while ( len-- ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); - NEWNM(new); C(new) = c2; - new->td = m->td+td; new->dl[0] = m->dl[0]+d0; + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); + NEWNM(new); CM(new) = c2; + TD(new) = TD(m)+td; DL(new)[0] = DL(m)[0]+d0; m = NEXT(m); NEXT(prev) = new; prev = new; } break; case 2: d0 = d[0]; d1 = d[1]; while ( len-- ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); - NEWNM(new); C(new) = c2; - new->td = m->td+td; - new->dl[0] = m->dl[0]+d0; - new->dl[1] = m->dl[1]+d1; + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); + NEWNM(new); CM(new) = c2; + TD(new) = TD(m)+td; + DL(new)[0] = DL(m)[0]+d0; + DL(new)[1] = DL(m)[1]+d1; m = NEXT(m); NEXT(prev) = new; prev = new; } break; default: while ( len-- ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); - NEWNM(new); C(new) = c2; - new->td = m->td+td; ndl_add(m->dl,d,new->dl); + c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); + NEWNM(new); CM(new) = c2; + TD(new) = TD(m)+td; ndl_add(DL(m),d,DL(new)); m = NEXT(m); NEXT(prev) = new; prev = new; } break; @@ -2347,7 +2404,7 @@ ND nd_mul_ind_nm(int index,NM m0) NEXT(prev) = 0; MKND(NV(p),mr0,r); - r->sugar = p->sugar + td; + SG(r) = SG(p) + td; return r; } #endif