=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.29 retrieving revision 1.33 diff -u -p -r1.29 -r1.33 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/08/11 07:37:08 1.29 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/08/19 05:29:11 1.33 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.28 2003/08/11 06:58:01 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.32 2003/08/19 04:38:09 noro Exp $ */ #include "ca.h" #include "inline.h" @@ -23,14 +23,15 @@ typedef struct oPGeoBucket { typedef struct oND { struct oNM *body; int nv; + int len; int sugar; } *ND; typedef struct oNDV { struct oNMV *body; int nv; - int sugar; int len; + int sugar; } *NDV; typedef struct oNM { @@ -66,10 +67,14 @@ typedef struct oND_pairs { unsigned int lcm[1]; } *ND_pairs; +int (*nm_compare_function)(NM a,NM b); +int (*nmv_compare_function)(NMV a,NMV b); +int (*ndp_compare_function)(ND_pairs a,ND_pairs b); + double nd_scale=2; static unsigned int **nd_bound; int nd_nvar; -int is_rlex; +int nd_isrlex; int nd_epw,nd_bpe,nd_wpd; unsigned int nd_mask[32]; unsigned int nd_mask0,nd_mask1; @@ -80,7 +85,6 @@ ND_pairs _ndp_free_list; static NDV *nd_ps; static NDV *nd_psq; -int *nd_psl; RHist *nd_psh; int nd_psn,nd_pslen; @@ -90,6 +94,7 @@ int nd_red_len; int nd_found,nd_create,nd_notfirst; int nm_adv; int nmv_adv; +int nd_degcompat; extern int Top,Reverse; @@ -103,13 +108,26 @@ extern int Top,Reverse; #define TD(a) ((a)->td) #define SG(a) ((a)->sugar) #define LEN(a) ((a)->len) +#define LCM(a) ((a)->lcm) +#define NM_COMPARE(m1,m2)\ +(nd_degcompat?(TD(m1)>TD(m2)?1\ + :(TD(m1)TD(m2)?1\ + :(TD(m1)TD(m2)?1\ + :(TD(m1)nv=(n); BDY(d)=(m) +#define MKND(n,m,len,d) if(!_nd_free_list)_ND_alloc(); (d)=_nd_free_list; _nd_free_list = (ND)BDY(_nd_free_list); NV(d)=(n); LEN(d)=(len); BDY(d)=(m) #define NEXTRHist(r,c) \ if(!(r)){NEWRHist(r);(c)=(r);}else{NEWRHist(NEXT(c));(c)=NEXT(c);} @@ -124,6 +142,7 @@ if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);} #define NEXTND_pairs(r,c) \ if(!(r)){NEWND_pairs(r);(c)=(r);}else{NEWND_pairs(NEXT(c));(c)=NEXT(c);} +void nd_init_ord(struct order_spec *spec); int nd_check_candidate(NODE input,NODE cand); void nd_removecont(int mod,ND p); void nd_removecont2(ND p1,ND p2); @@ -134,7 +153,7 @@ void nd_mul_c_q(ND p,Q mul); ND normalize_pbucket(int mod,PGeoBucket g); int head_pbucket(int mod,PGeoBucket g); int head_pbucket_q(PGeoBucket g); -void add_pbucket(int mod,PGeoBucket g,ND d,int l); +void add_pbucket(int mod,PGeoBucket g,ND d); void free_pbucket(PGeoBucket b); void mulq_pbucket(PGeoBucket g,Q c); PGeoBucket create_pbucket(); @@ -175,6 +194,9 @@ int nd_sp(int mod,ND_pairs p,ND *nf); int nd_find_reducer(ND g); int nd_find_reducer_direct(ND g,NDV *ps,int len); int nd_nf(int mod,ND g,int full,ND *nf); +int nd_nf_pbucket(int mod,ND g,int full,ND *nf); +int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full,ND *rp); +int nd_nf_direct_pbucket(int mod,ND g,NDV *ps,int len,int full,ND *rp); ND nd_reduce(ND p1,ND p2); ND nd_reduce_special(ND p1,ND p2); NODE nd_reduceall(int m,NODE f); @@ -257,7 +279,7 @@ void _NDP_alloc() } } -INLINE nd_length(ND p) +INLINE int nd_length(ND p) { NM m; int i; @@ -340,9 +362,9 @@ int ndl_dehomogenize(unsigned int *d) { unsigned int mask; unsigned int h; - int i; + int i,bits; - if ( is_rlex ) { + if ( nd_isrlex ) { if ( nd_bpe == 32 ) { h = d[0]; for ( i = 1; i < nd_wpd; i++ ) @@ -350,7 +372,8 @@ int ndl_dehomogenize(unsigned int *d) d[i-1] = 0; return h; } else { - mask = (1<<(nd_epw*nd_bpe))-1; + bits = nd_epw*nd_bpe; + mask = bits==32?0xffffffff:((1<<(nd_epw*nd_bpe))-1); h = (d[0]>>((nd_epw-1)*nd_bpe))&nd_mask0; for ( i = 0; i < nd_wpd; i++ ) d[i] = ((d[i]< *d2 ) - return is_rlex ? -1 : 1; + return nd_isrlex ? -1 : 1; else if ( *d1 < *d2 ) - return is_rlex ? 1 : -1; + return nd_isrlex ? 1 : -1; return 0; } @@ -757,7 +780,6 @@ INLINE int nd_find_reducer(ND g) return r->index; } } - if ( Reverse ) for ( i = nd_psn-1; i >= 0; i-- ) { r = nd_psh[i]; @@ -781,8 +803,9 @@ INLINE int nd_find_reducer(ND g) INLINE int nd_find_reducer_direct(ND g,NDV *ps,int len) { - int i; NDV r; + RHist s; + int d,k,i; if ( Reverse ) for ( i = len-1; i >= 0; i-- ) { @@ -806,7 +829,7 @@ INLINE int nd_find_reducer_direct(ND g,NDV *ps,int len ND nd_add(int mod,ND p1,ND p2) { int n,c; - int t; + int t,can; ND r; NM m1,m2,mr0,mr,s; @@ -817,13 +840,9 @@ ND nd_add(int mod,ND p1,ND p2) else if ( !mod ) return nd_add_q(p1,p2); else { + can = 0; for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { - if ( TD(m1) > TD(m2) ) - c = 1; - else if ( TD(m1) < TD(m2) ) - c = -1; - else - c = ndl_compare(DL(m1),DL(m2)); + c = NM_COMPARE(m1,m2); switch ( c ) { case 0: t = ((CM(m1))+(CM(m2))) - mod; @@ -831,8 +850,10 @@ ND nd_add(int mod,ND p1,ND p2) t += mod; s = m1; m1 = NEXT(m1); if ( t ) { + can++; NEXTNM2(mr0,mr,s); CM(mr) = (t); } else { + can += 2; FREENM(s); } s = m2; m2 = NEXT(m2); FREENM(s); @@ -860,6 +881,7 @@ ND nd_add(int mod,ND p1,ND p2) NEXT(mr) = 0; BDY(p1) = mr0; SG(p1) = MAX(SG(p1),SG(p2)); + LEN(p1) = LEN(p1)+LEN(p2)-can; FREEND(p2); return p1; } @@ -867,7 +889,7 @@ ND nd_add(int mod,ND p1,ND p2) ND nd_add_q(ND p1,ND p2) { - int n,c; + int n,c,can; ND r; NM m1,m2,mr0,mr,s; Q t; @@ -877,20 +899,18 @@ ND nd_add_q(ND p1,ND p2) else if ( !p2 ) return p1; else { + can = 0; for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { - if ( TD(m1) > TD(m2) ) - c = 1; - else if ( TD(m1) < TD(m2) ) - c = -1; - else - c = ndl_compare(DL(m1),DL(m2)); + c = NM_COMPARE(m1,m2); switch ( c ) { case 0: addq(CQ(m1),CQ(m2),&t); s = m1; m1 = NEXT(m1); if ( t ) { + can++; NEXTNM2(mr0,mr,s); CQ(mr) = (t); } else { + can += 2; FREENM(s); } s = m2; m2 = NEXT(m2); FREENM(s); @@ -918,12 +938,12 @@ ND nd_add_q(ND p1,ND p2) NEXT(mr) = 0; BDY(p1) = mr0; SG(p1) = MAX(SG(p1),SG(p2)); + LEN(p1) = LEN(p1)+LEN(p2)-can; FREEND(p2); return p1; } } -#if !USE_GEOBUCKET /* ret=1 : success, ret=0 : overflow */ int nd_nf(int mod,ND g,int full,ND *rp) { @@ -931,7 +951,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) NM m,mrd,tail; NM mul; int n,sugar,psugar,sugar0,stat,index; - int c,c1,c2; + int c,c1,c2,dummy; RHist h; NDV p,red; Q cg,cred,gcd; @@ -986,14 +1006,16 @@ afo: m = BDY(g); if ( NEXT(m) ) { BDY(g) = NEXT(m); NEXT(m) = 0; + LEN(g)--; } else { FREEND(g); g = 0; } if ( d ) { NEXT(tail)=m; tail=m; + LEN(d)++; } else { - MKND(n,m,d); + MKND(n,m,1,d); tail = BDY(d); } } @@ -1004,89 +1026,13 @@ afo: return 1; } -int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full,ND *rp) +int nd_nf_pbucket(int mod,ND g,int full,ND *rp) { - ND d; - NM m,mrd,tail; - NM mul; - int n,sugar,psugar,sugar0,stat,index; - int c,c1,c2; - RHist h; - NDV p,red; - Q cg,cred,gcd; - double hmag; - - if ( !g ) { - *rp = 0; - return 1; - } -#if 0 - if ( !mod ) - hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; -#else - /* XXX */ - hmag = 0; -#endif - - 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_direct(g,ps,len); - if ( index >= 0 ) { - p = ps[index]; - ndl_sub(HDL(g),HDL(p),DL(mul)); - TD(mul) = HTD(g)-HTD(p); - if ( ndl_check_bound2_direct(HDL(p),DL(mul)) ) { - nd_free(g); nd_free(d); - return 0; - } - if ( mod ) { - c1 = invm(HCM(p),mod); c2 = mod-HCM(g); - DMAR(c1,c2,0,mod,c); CM(mul) = c; - } else { - igcd_cofactor(HCQ(g),HCQ(p),&gcd,&cg,&cred); - chsgnq(cg,&CQ(mul)); - nd_mul_c_q(d,cred); nd_mul_c_q(g,cred); - } - g = nd_add(mod,g,ndv_mul_nm(mod,p,mul)); - sugar = MAX(sugar,SG(p)+TD(mul)); - if ( !mod && hmag && g && ((double)(p_mag((P)HCQ(g))) > hmag) ) { - nd_removecont2(d,g); - hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; - } - } else if ( !full ) { - *rp = g; - return 1; - } else { - m = BDY(g); - if ( NEXT(m) ) { - BDY(g) = NEXT(m); NEXT(m) = 0; - } else { - FREEND(g); g = 0; - } - if ( d ) { - NEXT(tail)=m; - tail=m; - } else { - MKND(n,m,d); - tail = BDY(d); - } - } - } - if ( d ) - SG(d) = sugar; - *rp = d; - return 1; -} -#else -int nd_nf(int mod,ND g,int full,ND *rp) -{ int hindex,index; NDV p; ND u,d,red; NODE l; - NM mul,m,mrd; + NM mul,m,mrd,tail; int sugar,psugar,n,h_reducible; PGeoBucket bucket; int c,c1,c2; @@ -1103,7 +1049,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) if ( !mod ) hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; bucket = create_pbucket(); - add_pbucket(mod,bucket,g,nd_length(g)); + add_pbucket(mod,bucket,g); d = 0; mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); while ( 1 ) { @@ -1142,7 +1088,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) red = ndv_mul_nm(mod,p,mul); bucket->body[hindex] = nd_remove_head(g); red = nd_remove_head(red); - add_pbucket(mod,bucket,red,LEN(p)-1); + add_pbucket(mod,bucket,red); sugar = MAX(sugar,SG(p)+TD(mul)); if ( !mod && hmag && (gmag > hmag) ) { g = normalize_pbucket(mod,bucket); @@ -1154,7 +1100,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) } nd_removecont2(d,g); hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; - add_pbucket(mod,bucket,g,nd_length(g)-1); + add_pbucket(mod,bucket,g); } } else if ( !full ) { g = normalize_pbucket(mod,bucket); @@ -1166,16 +1112,19 @@ int nd_nf(int mod,ND g,int full,ND *rp) m = BDY(g); if ( NEXT(m) ) { BDY(g) = NEXT(m); NEXT(m) = 0; + LEN(g)--; } else { FREEND(g); g = 0; } bucket->body[hindex] = g; NEXT(m) = 0; if ( d ) { - for ( mrd = BDY(d); NEXT(mrd); mrd = NEXT(mrd) ); - NEXT(mrd) = m; + NEXT(tail)=m; + tail=m; + LEN(d)++; } else { - MKND(n,m,d); + MKND(n,m,1,d); + tail = BDY(d); } } } @@ -1183,11 +1132,89 @@ int nd_nf(int mod,ND g,int full,ND *rp) int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full,ND *rp) { + ND d; + NM m,mrd,tail; + NM mul; + int n,sugar,psugar,sugar0,stat,index; + int c,c1,c2; + RHist h; + NDV p,red; + Q cg,cred,gcd; + double hmag; + + if ( !g ) { + *rp = 0; + return 1; + } +#if 0 + if ( !mod ) + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; +#else + /* XXX */ + hmag = 0; +#endif + + 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_direct(g,ps,len); + if ( index >= 0 ) { + p = ps[index]; + ndl_sub(HDL(g),HDL(p),DL(mul)); + TD(mul) = HTD(g)-HTD(p); + if ( ndl_check_bound2_direct(HDL(p),DL(mul)) ) { + nd_free(g); nd_free(d); + return 0; + } + if ( mod ) { + c1 = invm(HCM(p),mod); c2 = mod-HCM(g); + DMAR(c1,c2,0,mod,c); CM(mul) = c; + } else { + igcd_cofactor(HCQ(g),HCQ(p),&gcd,&cg,&cred); + chsgnq(cg,&CQ(mul)); + nd_mul_c_q(d,cred); nd_mul_c_q(g,cred); + } + g = nd_add(mod,g,ndv_mul_nm(mod,p,mul)); + sugar = MAX(sugar,SG(p)+TD(mul)); + if ( !mod && hmag && g && ((double)(p_mag((P)HCQ(g))) > hmag) ) { + nd_removecont2(d,g); + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + } + } else if ( !full ) { + *rp = g; + return 1; + } else { + m = BDY(g); + if ( NEXT(m) ) { + BDY(g) = NEXT(m); NEXT(m) = 0; + LEN(g)--; + } else { + FREEND(g); g = 0; + } + if ( d ) { + NEXT(tail)=m; + tail=m; + LEN(d)++; + } else { + MKND(n,m,1,d); + tail = BDY(d); + } + } + } + if ( d ) + SG(d) = sugar; + *rp = d; + return 1; +} + +int nd_nf_direct_pbucket(int mod,ND g,NDV *ps,int len,int full,ND *rp) +{ int hindex,index; NDV p; ND u,d,red; NODE l; - NM mul,m,mrd; + NM mul,m,mrd,tail; int sugar,psugar,n,h_reducible; PGeoBucket bucket; int c,c1,c2; @@ -1209,7 +1236,7 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full hmag = 0; #endif bucket = create_pbucket(); - add_pbucket(mod,bucket,g,nd_length(g)); + add_pbucket(mod,bucket,g); d = 0; mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); while ( 1 ) { @@ -1246,7 +1273,7 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full red = ndv_mul_nm(mod,p,mul); bucket->body[hindex] = nd_remove_head(g); red = nd_remove_head(red); - add_pbucket(mod,bucket,red,LEN(p)-1); + add_pbucket(mod,bucket,red); sugar = MAX(sugar,SG(p)+TD(mul)); if ( !mod && hmag && (gmag > hmag) ) { g = normalize_pbucket(mod,bucket); @@ -1258,7 +1285,7 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full } nd_removecont2(d,g); hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; - add_pbucket(mod,bucket,g,nd_length(g)-1); + add_pbucket(mod,bucket,g); } } else if ( !full ) { g = normalize_pbucket(mod,bucket); @@ -1270,21 +1297,23 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full m = BDY(g); if ( NEXT(m) ) { BDY(g) = NEXT(m); NEXT(m) = 0; + LEN(g)--; } else { FREEND(g); g = 0; } bucket->body[hindex] = g; NEXT(m) = 0; if ( d ) { - for ( mrd = BDY(d); NEXT(mrd); mrd = NEXT(mrd) ); - NEXT(mrd) = m; + NEXT(tail)=m; + tail=m; + LEN(d)++; } else { - MKND(n,m,d); + MKND(n,m,1,d); + tail = BDY(d); } } } } -#endif /* input : list of DP, cand : list of DP */ @@ -1295,6 +1324,7 @@ int nd_check_candidate(NODE input,NODE cand) NODE t; nd_setup(0,cand); + n = length(cand); /* membercheck : list is a subset of Id(cand) ? */ for ( t = input; t; t = NEXT(t) ) { @@ -1320,8 +1350,10 @@ ND nd_remove_head(ND p) if ( !NEXT(m) ) { FREEND(p); p = 0; - } else + } else { BDY(p) = NEXT(m); + LEN(p)--; + } FREENM(m); return p; } @@ -1346,14 +1378,17 @@ void free_pbucket(PGeoBucket b) { GC_free(b); } -void add_pbucket(int mod,PGeoBucket g,ND d,int l) +void add_pbucket(int mod,PGeoBucket g,ND d) { - int k,m; + int l,i,k,m; + if ( !d ) + return; + l = LEN(d); for ( k = 0, m = 1; l > m; k++, m <<= 1 ); /* 2^(k-1) < l <= 2^k (=m) */ d = nd_add(mod,g->body[k],d); - for ( ; d && nd_length(d) > m; k++, m <<= 1 ) { + for ( ; d && LEN(d) > m; k++, m <<= 1 ) { g->body[k] = 0; d = nd_add(mod,g->body[k+1],d); } @@ -1390,12 +1425,7 @@ int head_pbucket(int mod,PGeoBucket g) } else { di = HDL(gi); nv = NV(gi); - if ( HTD(gi) > HTD(gj) ) - c = 1; - else if ( HTD(gi) < HTD(gj) ) - c = -1; - else - c = ndl_compare(di,dj); + c = NM_COMPARE(BDY(gi),BDY(gj)); if ( c > 0 ) { if ( sum ) HCM(gj) = sum; @@ -1444,12 +1474,7 @@ int head_pbucket_q(PGeoBucket g) } else { di = HDL(gi); nv = NV(gi); - if ( HTD(gi) > HTD(gj) ) - c = 1; - else if ( HTD(gi) < HTD(gj) ) - c = -1; - else - c = ndl_compare(di,dj); + c = NM_COMPARE(BDY(gi),BDY(gj)); if ( c > 0 ) { if ( sum ) HCQ(gj) = sum; @@ -1519,7 +1544,7 @@ again: d = nd_reconstruct(m,0,d); goto again; } - stat = nd_nf(m,h,!Top,&nf); + stat = m?nd_nf_pbucket(m,h,!Top,&nf):nd_nf(m,h,!Top,&nf); if ( !stat ) { NEXT(l) = d; d = l; d = nd_reconstruct(m,0,d); @@ -1572,7 +1597,7 @@ again: d = nd_reconstruct(m,1,d); goto again; } - stat = nd_nf(m,h,!Top,&nf); + stat = nd_nf_pbucket(m,h,!Top,&nf); if ( !stat ) { NEXT(l) = d; d = l; d = nd_reconstruct(m,1,d); @@ -1603,17 +1628,12 @@ again: int ndv_compare(NDV *p1,NDV *p2) { - int td1,td2; - - td1 = HTD(*p1); td2 = HTD(*p2); - if ( td1 > td2 ) return 1; - else if ( td1 < td2 ) return -1; - else return ndl_compare(HDL(*p1),HDL(*p2)); + return NMV_COMPARE(BDY(*p1),BDY(*p2)); } int ndv_compare_rev(NDV *p1,NDV *p2) { - return -ndv_compare(p1,p2); + return -NMV_COMPARE(BDY(*p1),BDY(*p2)); } NODE nd_reduceall(int m,NODE f) @@ -1893,45 +1913,20 @@ ND_pairs nd_minp( ND_pairs d, ND_pairs *prest ) { ND_pairs m,ml,p,l; unsigned int *lcm; - int s,td,len,tlen,c; + int s,td,len,tlen,c,c1; if ( !(p = NEXT(m = d)) ) { *prest = p; NEXT(m) = 0; return m; } - lcm = m->lcm; 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 (SG(p) < s) - goto find; - else if ( SG(p) == s ) { - if ( TD(p) < td ) - goto find; - else if ( TD(p) == td ) { - c = ndl_compare(p->lcm,lcm); - if ( c < 0 ) - goto find; -#if 0 - else if ( c == 0 ) { - tlen = nd_psl[p->i1]+nd_psl[p->i2]; - if ( tlen < len ) - goto find; - } -#endif - } + for ( ml = 0, l = m; p; p = NEXT(l = p) ) + if ( (SG(p) < s) || ((SG(p) == s) && (NDP_COMPARE(p,m) < 0)) ) { + ml = l; + m = p; + s = SG(m); } - continue; -find: - ml = l; - m = p; - lcm = m->lcm; - s = SG(m); - td = TD(m); - len = tlen; - } if ( !ml ) *prest = NEXT(m); else { NEXT(ml) = NEXT(m); @@ -1949,7 +1944,6 @@ int nd_newps(int mod,ND a) if ( nd_psn == nd_pslen ) { nd_pslen *= 2; - nd_psl = (int *)REALLOC((char *)nd_psl,nd_pslen*sizeof(int)); nd_ps = (NDV *)REALLOC((char *)nd_ps,nd_pslen*sizeof(NDV)); nd_psq = (NDV *)REALLOC((char *)nd_psq,nd_pslen*sizeof(NDV)); nd_psh = (RHist *)REALLOC((char *)nd_psh,nd_pslen*sizeof(RHist)); @@ -1966,7 +1960,6 @@ int nd_newps(int mod,ND a) nd_ps[nd_psn] = b; else nd_psq[nd_psn] = b; - nd_psl[nd_psn] = len; nd_free(a); return nd_psn++; } @@ -1979,7 +1972,6 @@ int nd_newps_trace(int mod,ND nf,ND nfq) if ( nd_psn == nd_pslen ) { nd_pslen *= 2; - nd_psl = (int *)REALLOC((char *)nd_psl,nd_pslen*sizeof(int)); nd_ps = (NDV *)REALLOC((char *)nd_ps,nd_pslen*sizeof(NDV)); nd_psq = (NDV *)REALLOC((char *)nd_psq,nd_pslen*sizeof(NDV)); nd_psh = (RHist *)REALLOC((char *)nd_psh,nd_pslen*sizeof(RHist)); @@ -1996,10 +1988,6 @@ int nd_newps_trace(int mod,ND nf,ND nfq) nd_bound[nd_psn] = nd_compute_bound(nfq); NEWRHist(r); SG(r) = SG(nf); TD(r) = HTD(nf); ndl_copy(HDL(nf),DL(r)); nd_psh[nd_psn] = r; - - len = LEN(nd_psq[nd_psn]); - nd_psl[nd_psn] = len; - nd_free(nf); nd_free(nfq); return nd_psn++; } @@ -2015,7 +2003,6 @@ void nd_setup(int mod,NODE f) nd_found = 0; nd_notfirst = 0; nd_create = 0; nd_psn = length(f); nd_pslen = 2*nd_psn; - nd_psl = (int *)MALLOC(nd_pslen*sizeof(int)); nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); nd_psq = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); nd_psh = (RHist *)MALLOC(nd_pslen*sizeof(RHist)); @@ -2070,7 +2057,6 @@ void nd_setup_trace(int mod,NODE f) nd_found = 0; nd_notfirst = 0; nd_create = 0; nd_psn = length(f); nd_pslen = 2*nd_psn; - nd_psl = (int *)MALLOC(nd_pslen*sizeof(int)); nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); nd_psq = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); nd_psh = (RHist *)MALLOC(nd_pslen*sizeof(RHist)); @@ -2119,18 +2105,8 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord, get_vars((Obj)f,&fv); pltovl(v,&vv); nd_nvar = length(vv); - if ( ord->id ) - error("nd_gr : unsupported order"); - switch ( ord->ord.simple ) { - case 0: - is_rlex = 1; - break; - case 1: - is_rlex = 0; - break; - default: - error("nd_gr : unsupported order"); - } + nd_init_ord(ord); + /* XXX for DP */ initd(ord); for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&b); @@ -2166,16 +2142,9 @@ void nd_gr_trace(LIST f,LIST v,int m,int homo,struct o get_vars((Obj)f,&fv); pltovl(v,&vv); nd_nvar = length(vv); - if ( ord->id ) - error("nd_gr : unsupported order"); initd(ord); if ( homo ) { homogenize_order(ord,nd_nvar,&ord1); - switch ( ord1.ord.simple ) { - case 0: is_rlex = 1; break; - case 1: is_rlex = 0; break; - default: error("nd_gr : unsupported order"); - } for ( fd0 = 0, in0 = 0, t = BDY(f); t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&c); if ( c ) { @@ -2185,14 +2154,10 @@ void nd_gr_trace(LIST f,LIST v,int m,int homo,struct o } if ( fd0 ) NEXT(fd) = 0; if ( in0 ) NEXT(in) = 0; + nd_init_ord(&ord1); initd(&ord1); nd_nvar++; } else { - switch ( ord->ord.simple ) { - case 0: is_rlex = 1; break; - case 1: is_rlex = 0; break; - default: error("nd_gr : unsupported order"); - } for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&c); if ( c ) { @@ -2201,6 +2166,7 @@ void nd_gr_trace(LIST f,LIST v,int m,int homo,struct o } if ( fd0 ) NEXT(fd) = 0; in0 = fd0; + nd_init_ord(ord); } do { nd_setup_trace(m,fd0); @@ -2241,7 +2207,7 @@ void dltondl(int n,DL dl,unsigned int *r) d = dl->d; bzero(r,nd_wpd*sizeof(unsigned int)); - if ( is_rlex ) + if ( nd_isrlex ) for ( i = 0; i < n; i++ ) r[(n-1-i)/nd_epw] |= (d[i]<<((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)); else @@ -2258,7 +2224,7 @@ DL ndltodl(int n,int td,unsigned int *ndl) NEWDL(dl,n); TD(dl) = td; d = dl->d; - if ( is_rlex ) + if ( nd_isrlex ) for ( i = 0; i < n; i++ ) d[i] = (ndl[(n-1-i)/nd_epw]>>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) &((1<>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) @@ -2746,6 +2711,17 @@ void nd_reconstruct_direct(int mod,NDV *ps,int len) if ( mod != 0 ) for ( i = len-1; i >= 0; i-- ) ndv_realloc(ps[i],obpe,oadv); + for ( i = 0; i < REDTAB_LEN; i++ ) { + for ( mr0 = 0, r = nd_red[i]; r; r = NEXT(r) ) { + NEXTRHist(mr0,mr); + mr->index = r->index; + SG(mr) = SG(r); + TD(mr) = TD(r); + ndl_dup(obpe,DL(r),DL(mr)); + } + if ( mr0 ) NEXT(mr) = 0; + nd_red[i] = mr0; + } prev_nm_free_list = 0; prev_ndp_free_list = 0; GC_gcollect(); @@ -2761,7 +2737,7 @@ void ndl_dup(int obpe,unsigned int *d,unsigned int *r) cbpe = nd_bpe; for ( i = 0; i < nd_wpd; i++ ) r[i] = 0; - if ( is_rlex ) + if ( nd_isrlex ) for ( i = 0; i < n; i++ ) { ei = (d[(n-1-i)/oepw]>>((oepw-((n-1-i)%oepw)-1)*obpe)) &((1<id ) + error("nd_gr : unsupported order"); + nd_degcompat = 0; + switch ( ord->ord.simple ) { + case 0: + nd_degcompat = 1; + nd_isrlex = 1; + break; + case 1: + nd_degcompat = 1; + nd_isrlex = 0; + break; + default: + error("nd_gr : unsupported order"); + } +} +