=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.24 retrieving revision 1.33 diff -u -p -r1.24 -r1.33 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/08/05 08:06:21 1.24 +++ 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.23 2003/08/05 05:01:18 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" @@ -11,6 +11,8 @@ #define INLINE #endif +#define USE_GEOBUCKET 1 + #define REDTAB_LEN 32003 typedef struct oPGeoBucket { @@ -21,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 { @@ -64,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; @@ -78,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; @@ -88,8 +94,7 @@ int nd_red_len; int nd_found,nd_create,nd_notfirst; int nm_adv; int nmv_adv; -int nmv_len; -NDV ndv_red; +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,15 +142,26 @@ 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); void ndv_removecont(int mod,NDV p); void ndv_dehomogenize(NDV p); void ndv_mul_c_q(NDV p,Q mul); 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); +void free_pbucket(PGeoBucket b); +void mulq_pbucket(PGeoBucket g,Q c); +PGeoBucket create_pbucket(); +ND nd_remove_head(ND p); void GC_gcollect(); NODE append_one(NODE,int); +NODE nd_reducebase(NODE x); void removecont_array(Q *c,int n); ND_pairs crit_B( ND_pairs d, int s ); @@ -150,7 +179,7 @@ ND_pairs crit_F( ND_pairs d1 ); ND_pairs crit_M( ND_pairs d1 ); ND_pairs nd_newpairs( NODE g, int t ); ND_pairs update_pairs( ND_pairs d, NODE /* of index */ g, int t); -NODE nd_gb(int m); +NODE nd_gb(int m,int checkonly); NODE nd_gb_trace(int m); void nd_free_private_storage(); void _NM_alloc(); @@ -165,9 +194,14 @@ 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); +int nd_gbcheck(int m,NODE f); +int nd_membercheck(int m,NODE f); void nd_free(ND p); void ndv_free(NDV p); void ndl_print(unsigned int *dl); @@ -193,12 +227,9 @@ void ndl_dup(int obpe,unsigned int *d,unsigned int *r) #define NEWNDV(d) ((d)=(NDV)MALLOC(sizeof(struct oNDV))) #define MKNDV(n,m,l,d) NEWNDV(d); NV(d)=(n); BDY(d)=(m); LEN(d) = l; void ndv_mul_c(int mod,NDV p,int mul); -ND ndv_add(int mod,ND p1,NDV p2); -ND ndv_add_q(ND p1,NDV p2); NDV ndtondv(int mod,ND p); ND ndvtond(int mod,NDV p); -void ndv_mul_nm(int mod,NDV pv,NM m,NDV r); -ND ndv_mul_nm_create(int mod,NDV p,NM m0); +ND ndv_mul_nm(int mod,NDV p,NM m0); void ndv_realloc(NDV p,int obpe,int oadv); NDV dptondv(int,DP); DP ndvtodp(int,NDV); @@ -248,7 +279,7 @@ void _NDP_alloc() } } -INLINE nd_length(ND p) +INLINE int nd_length(ND p) { NM m; int i; @@ -331,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++ ) @@ -341,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; } @@ -748,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]; @@ -772,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-- ) { @@ -797,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; @@ -805,14 +837,12 @@ ND nd_add(int mod,ND p1,ND p2) return p2; else if ( !p2 ) return p1; + 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; @@ -820,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); @@ -849,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; } @@ -856,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; @@ -866,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); @@ -907,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 1 /* ret=1 : success, ret=0 : overflow */ int nd_nf(int mod,ND g,int full,ND *rp) { @@ -920,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; @@ -961,9 +992,8 @@ int nd_nf(int mod,ND g,int full,ND *rp) chsgnq(cg,&CQ(mul)); nd_mul_c_q(d,cred); nd_mul_c_q(g,cred); } - ndv_mul_nm(mod,p,mul,ndv_red); - g = ndv_add(mod,g,ndv_red); - sugar = MAX(sugar,SG(ndv_red)); + 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; @@ -976,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); } } @@ -994,6 +1026,110 @@ afo: return 1; } +int nd_nf_pbucket(int mod,ND g,int full,ND *rp) +{ + int hindex,index; + NDV p; + ND u,d,red; + NODE l; + NM mul,m,mrd,tail; + int sugar,psugar,n,h_reducible; + PGeoBucket bucket; + int c,c1,c2; + Q cg,cred,gcd,zzz; + RHist h; + double hmag,gmag; + + if ( !g ) { + *rp = 0; + return 1; + } + sugar = SG(g); + n = NV(g); + if ( !mod ) + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + bucket = create_pbucket(); + add_pbucket(mod,bucket,g); + d = 0; + mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); + while ( 1 ) { + hindex = mod?head_pbucket(mod,bucket):head_pbucket_q(bucket); + if ( hindex < 0 ) { + if ( d ) + SG(d) = sugar; + *rp = d; + return 1; + } + g = bucket->body[hindex]; + index = nd_find_reducer(g); + if ( index >= 0 ) { + h = nd_psh[index]; + ndl_sub(HDL(g),DL(h),DL(mul)); + TD(mul) = HTD(g)-TD(h); + if ( ndl_check_bound2(index,DL(mul)) ) { + nd_free(d); + free_pbucket(bucket); + *rp = 0; + return 0; + } + if ( mod ) { + p = nd_ps[index]; + c1 = invm(HCM(p),mod); c2 = mod-HCM(g); + DMAR(c1,c2,0,mod,c); CM(mul) = c; + } else { + p = nd_psq[index]; + igcd_cofactor(HCQ(g),HCQ(p),&gcd,&cg,&cred); + chsgnq(cg,&CQ(mul)); + nd_mul_c_q(d,cred); + mulq_pbucket(bucket,cred); + g = bucket->body[hindex]; + gmag = (double)p_mag((P)HCQ(g)); + } + red = ndv_mul_nm(mod,p,mul); + bucket->body[hindex] = nd_remove_head(g); + red = nd_remove_head(red); + add_pbucket(mod,bucket,red); + sugar = MAX(sugar,SG(p)+TD(mul)); + if ( !mod && hmag && (gmag > hmag) ) { + g = normalize_pbucket(mod,bucket); + if ( !g ) { + if ( d ) + SG(d) = sugar; + *rp = d; + return 1; + } + nd_removecont2(d,g); + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + add_pbucket(mod,bucket,g); + } + } else if ( !full ) { + g = normalize_pbucket(mod,bucket); + if ( g ) + SG(g) = sugar; + *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; + } + bucket->body[hindex] = g; + NEXT(m) = 0; + if ( d ) { + NEXT(tail)=m; + tail=m; + LEN(d)++; + } else { + MKND(n,m,1,d); + tail = BDY(d); + } + } + } +} + int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full,ND *rp) { ND d; @@ -1039,9 +1175,8 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full chsgnq(cg,&CQ(mul)); nd_mul_c_q(d,cred); nd_mul_c_q(g,cred); } - ndv_mul_nm(mod,p,mul,ndv_red); - g = ndv_add(mod,g,ndv_red); - sugar = MAX(sugar,SG(ndv_red)); + 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; @@ -1053,14 +1188,16 @@ 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; } if ( d ) { NEXT(tail)=m; tail=m; + LEN(d)++; } else { - MKND(n,m,d); + MKND(n,m,1,d); tail = BDY(d); } } @@ -1070,8 +1207,141 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full *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,tail; + int sugar,psugar,n,h_reducible; + PGeoBucket bucket; + int c,c1,c2; + Q cg,cred,gcd,zzz; + RHist h; + double hmag,gmag; + + if ( !g ) { + *rp = 0; + return 1; + } + sugar = SG(g); + n = NV(g); +#if 0 + if ( !mod ) + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; #else + /* XXX */ + hmag = 0; +#endif + bucket = create_pbucket(); + add_pbucket(mod,bucket,g); + d = 0; + mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); + while ( 1 ) { + hindex = mod?head_pbucket(mod,bucket):head_pbucket_q(bucket); + if ( hindex < 0 ) { + if ( d ) + SG(d) = sugar; + *rp = d; + return 1; + } + g = bucket->body[hindex]; + 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(d); + free_pbucket(bucket); + *rp = 0; + 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); + mulq_pbucket(bucket,cred); + g = bucket->body[hindex]; + gmag = (double)p_mag((P)HCQ(g)); + } + red = ndv_mul_nm(mod,p,mul); + bucket->body[hindex] = nd_remove_head(g); + red = nd_remove_head(red); + add_pbucket(mod,bucket,red); + sugar = MAX(sugar,SG(p)+TD(mul)); + if ( !mod && hmag && (gmag > hmag) ) { + g = normalize_pbucket(mod,bucket); + if ( !g ) { + if ( d ) + SG(d) = sugar; + *rp = d; + return 1; + } + nd_removecont2(d,g); + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + add_pbucket(mod,bucket,g); + } + } else if ( !full ) { + g = normalize_pbucket(mod,bucket); + if ( g ) + SG(g) = sugar; + *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; + } + bucket->body[hindex] = g; + NEXT(m) = 0; + if ( d ) { + NEXT(tail)=m; + tail=m; + LEN(d)++; + } else { + MKND(n,m,1,d); + tail = BDY(d); + } + } + } +} +/* input : list of DP, cand : list of DP */ + +int nd_check_candidate(NODE input,NODE cand) +{ + int n,i,stat; + ND nf,d; + NODE t; + + nd_setup(0,cand); + n = length(cand); + + /* membercheck : list is a subset of Id(cand) ? */ + for ( t = input; t; t = NEXT(t) ) { + d = dptond(0,(DP)BDY(t)); + stat = nd_nf_direct(0,d,nd_psq,n,0,&nf); + if ( !stat ) + nd_reconstruct_direct(0,nd_psq,n); + else if ( nf ) + return 0; + } + /* gbcheck : cand is a GB of Id(cand) ? */ + if ( !nd_gb(0,1) ) + return 0; + /* XXX */ + return 1; +} + ND nd_remove_head(ND p) { NM m; @@ -1080,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; } @@ -1095,22 +1367,44 @@ PGeoBucket create_pbucket() return g; } +void free_pbucket(PGeoBucket b) { + int i; + + for ( i = 0; i <= b->m; i++ ) + if ( b->body[i] ) { + nd_free(b->body[i]); + b->body[i] = 0; + } + GC_free(b); +} + void add_pbucket(int mod,PGeoBucket g,ND d) { - int l,k,m; + int l,i,k,m; - l = nd_length(d); - for ( k = 0, m = 1; l > m; k++, m <<= 2 ); - /* 4^(k-1) < l <= 4^k */ + 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) > 1<<(2*k); k++ ) { + for ( ; d && LEN(d) > m; k++, m <<= 1 ) { g->body[k] = 0; - d = nd_add(int mod,g->body[k+1],d); + d = nd_add(mod,g->body[k+1],d); } g->body[k] = d; g->m = MAX(g->m,k); } +void mulq_pbucket(PGeoBucket g,Q c) +{ + int k; + + for ( k = 0; k <= g->m; k++ ) + nd_mul_c_q(g->body[k],c); +} + +/* XXX not completed */ int head_pbucket(int mod,PGeoBucket g) { int j,i,c,k,nv,sum; @@ -1131,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; @@ -1164,73 +1453,71 @@ int head_pbucket(int mod,PGeoBucket g) } } -ND normalize_pbucket(PGeoBucket g) +int head_pbucket_q(PGeoBucket g) { + int j,i,c,k,nv; + Q sum,t; + unsigned int *di,*dj; + ND gi,gj; + + k = g->m; + while ( 1 ) { + j = -1; + for ( i = 0; i <= k; i++ ) { + if ( !(gi = g->body[i]) ) + continue; + if ( j < 0 ) { + j = i; + gj = g->body[j]; + dj = HDL(gj); + sum = HCQ(gj); + } else { + di = HDL(gi); + nv = NV(gi); + c = NM_COMPARE(BDY(gi),BDY(gj)); + if ( c > 0 ) { + if ( sum ) + HCQ(gj) = sum; + else + g->body[j] = nd_remove_head(gj); + j = i; + gj = g->body[j]; + dj = HDL(gj); + sum = HCQ(gj); + } else if ( c == 0 ) { + addq(sum,HCQ(gi),&t); + sum = t; + g->body[i] = nd_remove_head(gi); + } + } + } + if ( j < 0 ) + return -1; + else if ( sum ) { + HCQ(gj) = sum; + return j; + } else + g->body[j] = nd_remove_head(gj); + } +} + +ND normalize_pbucket(int mod,PGeoBucket g) +{ int i; ND r,t; r = 0; - for ( i = 0; i <= g->m; i++ ) + for ( i = 0; i <= g->m; i++ ) { r = nd_add(mod,r,g->body[i]); + g->body[i] = 0; + } + g->m = -1; return r; } -ND nd_nf(ND g,int full) -{ - ND u,p,d,red; - NODE l; - NM m,mrd; - int sugar,psugar,n,h_reducible,h; - PGeoBucket bucket; +/* return value = 0 => input is not a GB */ - if ( !g ) { - return 0; - } - sugar = SG(g); - n = NV(g); - bucket = create_pbucket(); - add_pbucket(bucket,g); - d = 0; - while ( 1 ) { - h = head_pbucket(bucket); - if ( h < 0 ) { - if ( d ) - SG(d) = sugar; - return d; - } - g = bucket->body[h]; - red = nd_find_reducer(g); - if ( red ) { - bucket->body[h] = nd_remove_head(g); - red = nd_remove_head(red); - add_pbucket(bucket,red); - sugar = MAX(sugar,SG(red)); - } else if ( !full ) { - g = normalize_pbucket(bucket); - if ( g ) - SG(g) = sugar; - return g; - } else { - m = BDY(g); - if ( NEXT(m) ) { - BDY(g) = NEXT(m); NEXT(m) = 0; - } else { - FREEND(g); g = 0; - } - bucket->body[h] = g; - NEXT(m) = 0; - if ( d ) { - for ( mrd = BDY(d); NEXT(mrd); mrd = NEXT(mrd) ); - NEXT(mrd) = m; - } else { - MKND(n,m,d); - } - } - } -} -#endif - -NODE nd_gb(int m) +NODE nd_gb(int m,int checkonly) { int i,nh,sugar,stat; NODE r,g,t; @@ -1257,12 +1544,13 @@ 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); goto again; } else if ( nf ) { + if ( checkonly ) return 0; printf("+"); fflush(stdout); nh = nd_newps(m,nf); d = update_pairs(d,g,nh); @@ -1309,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); @@ -1321,6 +1609,8 @@ again: if ( nfq ) { printf("+"); fflush(stdout); nh = nd_newps_trace(m,nf,nfq); + /* failure; m|HC(nfq) */ + if ( nf < 0 ) return 0; d = update_pairs(d,g,nh); g = update_base(g,nh); } else { @@ -1338,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) @@ -1628,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); @@ -1684,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)); @@ -1701,12 +1960,7 @@ 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); - if ( len > nmv_len ) { - nmv_len = 2*len; - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); - } return nd_psn++; } @@ -1718,13 +1972,13 @@ 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)); nd_bound = (unsigned int **) REALLOC((char *)nd_bound,nd_pslen*sizeof(unsigned int *)); } + if ( !rem(NM(HCQ(nfq)),mod) ) return -1; nd_removecont(mod,nf); nd_ps[nd_psn] = ndtondv(mod,nf); @@ -1734,15 +1988,7 @@ 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); - if ( len > nmv_len ) { - nmv_len = 2*len; - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); - } return nd_psn++; } @@ -1757,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)); @@ -1799,12 +2044,6 @@ void nd_setup(int mod,NODE f) nd_psq[i] = a; nd_psh[i] = r; } - nmv_len = 16*len; - NEWNDV(ndv_red); - if ( mod ) - BDY(ndv_red) = (NMV)MALLOC_ATOMIC(nmv_len*nmv_adv); - else - BDY(ndv_red) = (NMV)MALLOC(nmv_len*nmv_adv); } void nd_setup_trace(int mod,NODE f) @@ -1818,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)); @@ -1856,9 +2094,6 @@ void nd_setup_trace(int mod,NODE f) SG(r) = HTD(a); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); nd_psh[i] = r; } - nmv_len = 16*len; - NEWNDV(ndv_red); - BDY(ndv_red) = (NMV)MALLOC(nmv_len*nmv_adv); } void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp) @@ -1870,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); @@ -1889,7 +2114,9 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord, } if ( fd0 ) NEXT(fd) = 0; nd_setup(m,fd0); - x = nd_gb(m); + x = nd_gb(m,0); + fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n", + nd_found,nd_notfirst,nd_create); x = nd_reduceall(m,x); for ( r0 = 0, t = x; t; t = NEXT(t) ) { NEXTNODE(r0,r); @@ -1903,46 +2130,34 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord, } if ( r0 ) NEXT(r) = 0; MKLIST(*rp,r0); - fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n", - nd_found,nd_notfirst,nd_create); } void nd_gr_trace(LIST f,LIST v,int m,int homo,struct order_spec *ord,LIST *rp) { struct order_spec ord1; VL fv,vv,vc; - NODE fd,fd0,r,r0,t,x,s,xx,t0; + NODE fd,fd0,in0,in,r,r0,t,s,cand; DP a,b,c,h; - NDV *w; - int len,i,j; + P p; 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, t = BDY(f); t; t = NEXT(t) ) { + for ( fd0 = 0, in0 = 0, t = BDY(f); t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&c); if ( c ) { dp_homo(c,&h); NEXTNODE(fd0,fd); BDY(fd) = (pointer)h; + NEXTNODE(in0,in); BDY(in) = (pointer)c; } } 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 ) { @@ -1950,49 +2165,39 @@ 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); } - /* setup over GF(m) */ - nd_setup_trace(m,fd0); - x = nd_gb_trace(m); - if ( homo ) { - /* dehomogenization */ - for ( t = x; t; t = NEXT(t) ) - ndv_dehomogenize((NDV)BDY(t)); - nd_nvar--; - nd_setup_parameters(); + do { + nd_setup_trace(m,fd0); + cand = nd_gb_trace(m); + if ( !cand ) continue; + if ( homo ) { + /* dehomogenization */ + for ( t = cand; t; t = NEXT(t) ) + ndv_dehomogenize((NDV)BDY(t)); + nd_nvar--; + nd_setup_parameters(); + initd(ord); + cand = nd_reducebase(cand); + } + fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n", + nd_found,nd_notfirst,nd_create); + cand = nd_reduceall(0,cand); initd(ord); - len = length(x); - w = (NDV *)ALLOCA(len*sizeof(NDV)); - for ( i = 0, t = x; i < len; i++, t = NEXT(t) ) - w[i] = BDY(t); - for ( i = 0; i < len; i++ ) { - for ( j = 0; j < i; j++ ) { - if ( w[i] && w[j] ) - if ( ndl_reducible(HDL(w[i]),HDL(w[j])) ) - w[i] = 0; - else if ( ndl_reducible(HDL(w[j]),HDL(w[i])) ) - w[j] = 0; - } + for ( r0 = 0; cand; cand = NEXT(cand) ) { + NEXTNODE(r0,r); + BDY(r) = (pointer)ndvtodp(0,(NDV)BDY(cand)); } - for ( i = len-1, t0 = 0; i >= 0; i-- ) { - if ( w[i] ) { - NEXTNODE(t0,t); - BDY(t) = (pointer)w[i]; - } - } - NEXT(t) = 0; - x = t0; + if ( r0 ) NEXT(r) = 0; + cand = r0; + } while ( !nd_check_candidate(in0,cand) ); + /* dp->p */ + for ( r = cand; r; r = NEXT(r) ) { + dtop(CO,vv,BDY(r),&p); + BDY(r) = (pointer)p; } - fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n", - nd_found,nd_notfirst,nd_create); - x = nd_reduceall(0,x); - for ( r0 = 0; x; x = NEXT(x) ) { - NEXTNODE(r0,r); - a = ndvtodp(0,(NDV)BDY(x)); - dtop(CO,vv,a,(P *)&BDY(r)); - } - if ( r0 ) NEXT(r) = 0; - MKLIST(*rp,r0); + MKLIST(*rp,cand); } void dltondl(int n,DL dl,unsigned int *r) @@ -2002,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 @@ -2019,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)) @@ -2472,7 +2676,6 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) if ( s0 ) NEXT(s) = 0; prev_nm_free_list = 0; prev_ndp_free_list = 0; - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); GC_gcollect(); return s0; } @@ -2508,9 +2711,19 @@ 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; - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); GC_gcollect(); } @@ -2524,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<i1,DL(m)) ) return 0; - t1 = ndv_mul_nm_create(mod,p1,m); + t1 = ndv_mul_nm(mod,p1,m); if ( mod ) CM(m) = mod-HCM(p1); else @@ -2608,9 +2821,9 @@ int nd_sp(int mod,ND_pairs p,ND *rp) nd_free(t1); return 0; } - ndv_mul_nm(mod,p2,m,ndv_red); + t2 = ndv_mul_nm(mod,p2,m); + *rp = nd_add(mod,t1,t2); FREENM(m); - *rp = ndv_add(mod,t1,ndv_red); return 1; } @@ -2643,41 +2856,8 @@ void ndv_mul_c_q(NDV p,Q mul) } } -void ndv_mul_nm(int mod,NDV p,NM m0,NDV r) +ND ndv_mul_nm(int mod,NDV p,NM m0) { - NMV m,mr,mr0; - unsigned int *d,*dt,*dm; - int c,n,td,i,c1,c2,len; - Q q; - - if ( !p ) - /* XXX */ - LEN(r) = 0; - else { - n = NV(p); m = BDY(p); len = LEN(p); - d = DL(m0); td = TD(m0); - mr = BDY(r); - if ( mod ) { - c = CM(m0); - for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) { - c1 = CM(m); DMAR(c1,c,0,mod,c2); CM(mr) = c2; - TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr)); - } - } else { - q = CQ(m0); - for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) { - mulq(CQ(m),q,&CQ(mr)); - TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr)); - } - } - NV(r) = NV(p); - LEN(r) = LEN(p); - SG(r) = SG(p) + td; - } -} - -ND ndv_mul_nm_create(int mod,NDV p,NM m0) -{ NM mr,mr0; NMV m; unsigned int *d,*dt,*dm; @@ -2712,164 +2892,12 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0) } } NEXT(mr) = 0; - MKND(NV(p),mr0,r); + MKND(NV(p),mr0,len,r); SG(r) = SG(p) + td; return r; } } -ND ndv_add(int mod,ND p1,NDV p2) -{ - register NM prev,cur,new; - int c,c1,c2,t,td,td2,mul,len,i; - NM head; - unsigned int *d; - NMV m2; - Q q; - - if ( !p1 ) - return 0; - else if ( !mod ) - return ndv_add_q(p1,p2); - else { - prev = 0; head = cur = BDY(p1); - NEWNM(new); len = LEN(p2); - for ( m2 = BDY(p2), i = 0; cur && i < len; ) { - 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 = CM(m2)+CM(cur)-mod; - if ( t < 0 ) t += mod; - if ( t ) CM(cur) = t; - else if ( !prev ) { - head = NEXT(cur); FREENM(cur); cur = head; - } else { - NEXT(prev) = NEXT(cur); FREENM(cur); cur = NEXT(prev); - } - NMV_ADV(m2); i++; - break; - case 1: - prev = cur; cur = NEXT(cur); - break; - case -1: - ndl_copy(DL(m2),DL(new)); - CQ(new) = CQ(m2); - if ( !prev ) { - /* cur = head */ - prev = new; NEXT(prev) = head; head = prev; - } else { - NEXT(prev) = new; NEXT(new) = cur; prev = new; - } - NEWNM(new); NMV_ADV(m2); i++; - break; - } - } - for ( ; i < len; i++, NMV_ADV(m2) ) { - td2 = TD(new) = TD(m2); CQ(new) = CQ(m2); ndl_copy(DL(m2),DL(new)); - if ( !prev ) { - prev = new; NEXT(prev) = 0; head = prev; - } else { - NEXT(prev) = new; NEXT(new) = 0; prev = new; - } - NEWNM(new); - } - FREENM(new); - if ( head ) { - BDY(p1) = head; SG(p1) = MAX(SG(p1),SG(p2)); - return p1; - } else { - FREEND(p1); - return 0; - } - - } -} - -ND ndv_add_q(ND p1,NDV p2) -{ - register NM prev,cur,new; - int c,c1,c2,t,td,td2,mul,len,i; - NM head; - unsigned int *d; - NMV m2; - Q q; - - if ( !p1 ) - return 0; - else { - prev = 0; head = cur = BDY(p1); - NEWNM(new); len = LEN(p2); - for ( m2 = BDY(p2), i = 0; cur && i < len; ) { - 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: - addq(CQ(cur),CQ(m2),&q); - if ( q ) - CQ(cur) = q; - else if ( !prev ) { - head = NEXT(cur); FREENM(cur); cur = head; - } else { - NEXT(prev) = NEXT(cur); FREENM(cur); cur = NEXT(prev); - } - NMV_ADV(m2); i++; - break; - case 1: - prev = cur; cur = NEXT(cur); - break; - case -1: - ndl_copy(DL(m2),DL(new)); - CQ(new) = CQ(m2); - if ( !prev ) { - /* cur = head */ - prev = new; NEXT(prev) = head; head = prev; - } else { - NEXT(prev) = new; NEXT(new) = cur; prev = new; - } - NEWNM(new); NMV_ADV(m2); i++; - break; - } - } - for ( ; i < len; i++, NMV_ADV(m2) ) { - td2 = TD(new) = TD(m2); CQ(new) = CQ(m2); ndl_copy(DL(m2),DL(new)); - if ( !prev ) { - prev = new; NEXT(prev) = 0; head = prev; - } else { - NEXT(prev) = new; NEXT(new) = 0; prev = new; - } - NEWNM(new); - } - FREENM(new); - if ( head ) { - BDY(p1) = head; SG(p1) = MAX(SG(p1),SG(p2)); - return p1; - } else { - FREEND(p1); - return 0; - } - - } -} - void ndv_realloc(NDV p,int obpe,int oadv) { NMV m,mr,mr0,t; @@ -2909,7 +2937,7 @@ NDV ndtondv(int mod,ND p) if ( !p ) return 0; - len = nd_length(p); + len = LEN(p); if ( mod ) m0 = m = (NMV)MALLOC_ATOMIC(len*nmv_adv); else @@ -2942,7 +2970,7 @@ ND ndvtond(int mod,NDV p) CQ(m) = CQ(t); } NEXT(m) = 0; - MKND(NV(p),m0,d); + MKND(NV(p),m0,len,d); SG(d) = SG(p); return d; } @@ -3038,3 +3066,58 @@ void ndv_print_q(NDV p) printf("\n"); } } + +int nd_equal(ND a,ND b) +{ + NM ma,mb; + + if ( (!a && b)||(a&& !b)||(NV(a) != NV(b))||(SG(a) != SG(b)) ) return 0; + for ( ma = BDY(a), mb = BDY(b); ma && mb; ma = NEXT(ma), mb = NEXT(mb) ) { + if ( (TD(ma) != TD(mb)) || !ndl_equal(DL(ma),DL(mb)) ) return 0; + } + if ( !ma && !mb ) return 1; + else return 0; +} + +NODE nd_reducebase(NODE x) +{ + int len,i,j; + NDV *w; + NODE t,t0; + + len = length(x); + w = (NDV *)ALLOCA(len*sizeof(NDV)); + for ( i = 0, t = x; i < len; i++, t = NEXT(t) ) w[i] = BDY(t); + for ( i = 0; i < len; i++ ) { + for ( j = 0; j < i; j++ ) { + if ( w[i] && w[j] ) + if ( ndl_reducible(HDL(w[i]),HDL(w[j])) ) w[i] = 0; + else if ( ndl_reducible(HDL(w[j]),HDL(w[i])) ) w[j] = 0; + } + } + for ( i = len-1, t0 = 0; i >= 0; i-- ) { + if ( w[i] ) { NEXTNODE(t0,t); BDY(t) = (pointer)w[i]; } + } + NEXT(t) = 0; x = t0; + return x; +} + +void nd_init_ord(struct order_spec *ord) +{ + if ( ord->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"); + } +} +