=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.42 retrieving revision 1.54 diff -u -p -r1.42 -r1.54 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/08/21 08:20:06 1.42 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/08/31 07:42:23 1.54 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.41 2003/08/21 07:39:25 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.53 2003/08/29 07:37:30 noro Exp $ */ #include "ca.h" #include "inline.h" @@ -79,12 +79,25 @@ typedef struct oEPOS { int s; /* shift */ } *EPOS; -int (*nd_compare_function)(unsigned int *a1,unsigned int *a2); +typedef struct oBlockMask { + int n; + struct order_pair *order_pair; + unsigned int **mask; +} *BlockMask; +typedef struct oBaseSet { + int len; + NDV *ps; + unsigned int **bound; +} *BaseSet; + +int (*ndl_compare_function)(unsigned int *a1,unsigned int *a2); + static double nd_scale=2; static unsigned int **nd_bound; static struct order_spec *nd_ord; static EPOS nd_epos; +static BlockMask nd_blockmask; static int nd_nvar; static int nd_isrlex; static int nd_epw,nd_bpe,nd_wpd,nd_exporigin; @@ -96,7 +109,7 @@ static ND _nd_free_list; static ND_pairs _ndp_free_list; static NDV *nd_ps; -static NDV *nd_psq; +static NDV *nd_ps_trace; static RHist *nd_psh; static int nd_psn,nd_pslen; @@ -123,12 +136,21 @@ extern int Top,Reverse,dp_nelim; #define LCM(a) ((a)->lcm) #define GET_EXP(d,a) (((d)[nd_epos[a].i]>>nd_epos[a].s)&nd_mask0) #define PUT_EXP(r,a,e) ((r)[nd_epos[a].i] |= ((e)<TD(d2)?1:(TD(d1)0?TD_DL_COMPARE(d1,d2)\ + :(nd_dcomp==0?ndl_lex_compare(d1,d2)\ + :(nd_blockmask?ndl_block_compare(d1,d2)\ + :(*ndl_compare_function)(d1,d2)))) +#else +#define DL_COMPARE(d1,d2)\ +(nd_dcomp>0?TD_DL_COMPARE(d1,d2):(*ndl_compare_function)(d1,d2)) +#endif /* allocators */ #define NEWRHist(r) \ @@ -196,33 +218,32 @@ int crit_2( int dp1, int dp2 ); /* top level functions */ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp); -void nd_gr_trace(LIST f,LIST v,int m,int homo,struct order_spec *ord,LIST *rp); +void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp); NODE nd_gb(int m,int checkonly); NODE nd_gb_trace(int m); /* ndl functions */ int ndl_weight(unsigned int *d); +int ndl_weight_mask(unsigned int *d,int i); void ndl_dehomogenize(unsigned int *p); -void ndl_reconstruct(int obpe,unsigned int *d,unsigned int *r); +void ndl_reconstruct(int obpe,EPOS oepos,unsigned int *d,unsigned int *r); INLINE int ndl_reducible(unsigned int *d1,unsigned int *d2); INLINE int ndl_lex_compare(unsigned int *d1,unsigned int *d2); +INLINE int ndl_block_compare(unsigned int *d1,unsigned int *d2); INLINE int ndl_equal(unsigned int *d1,unsigned int *d2); INLINE void ndl_copy(unsigned int *d1,unsigned int *d2); INLINE void ndl_add(unsigned int *d1,unsigned int *d2,unsigned int *d); INLINE void ndl_sub(unsigned int *d1,unsigned int *d2,unsigned int *d); INLINE int ndl_hash_value(unsigned int *d); + +/* normal forms */ INLINE int nd_find_reducer(ND g); INLINE int nd_find_reducer_direct(ND g,NDV *ps,int len); +int nd_sp(int mod,int trace,ND_pairs p,ND *nf); +int nd_nf(int mod,ND g,NDV *ps,int full,ND *nf); +int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *nf); +int nd_nf_direct(int mod,ND g,BaseSet base,int full,ND *rp); -/* normal forms */ -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); - /* finalizers */ NODE nd_reducebase(NODE x); NODE nd_reduceall(int m,NODE f); @@ -234,7 +255,6 @@ void nd_free_private_storage(); void _NM_alloc(); void _ND_alloc(); void nd_free(ND p); -void nd_realloc(ND p,int obpe); void nd_free_redlist(); /* printing */ @@ -250,6 +270,8 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs ndp void nd_reconstruct_direct(int mod,NDV *ps,int len); void nd_setup(int mod,int trace,NODE f); void nd_setup_parameters(); +BlockMask nd_create_blockmask(struct order_spec *ord); +int nd_get_exporigin(struct order_spec *ord); /* ND functions */ int nd_check_candidate(NODE input,NODE cand); @@ -258,7 +280,7 @@ void nd_mul_c_q(ND p,Q mul); ND nd_remove_head(ND p); int nd_length(ND p); void nd_append_red(unsigned int *d,int i); -unsigned int *nd_compute_bound(ND p); +unsigned int *ndv_compute_bound(NDV p); unsigned int *dp_compute_bound(DP p); ND nd_copy(ND p); ND nd_add(int mod,ND p1,ND p2); @@ -268,9 +290,9 @@ INLINE int nd_length(ND p); /* NDV functions */ void ndv_mul_c(int mod,NDV p,int mul); void ndv_mul_c_q(NDV p,Q mul); -void ndv_realloc(NDV p,int obpe,int oadv); +void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos); ND ndv_mul_nm(int mod,NDV p,NM m0); -void ndv_dehomogenize(NDV p); +void ndv_dehomogenize(NDV p,struct order_spec *spec); void ndv_removecont(int mod,NDV p); void ndv_print(NDV p); void ndv_print_q(NDV p); @@ -411,31 +433,40 @@ void ndl_dehomogenize(unsigned int *d) unsigned int h; int i,bits; - if ( nd_isrlex ) { - if ( nd_bpe == 32 ) { - h = d[nd_exporigin]; - for ( i = nd_exporigin+1; i < nd_wpd; i++ ) - d[i-1] = d[i]; - d[i-1] = 0; - TD(d) -= h; + if ( nd_blockmask ) { + h = GET_EXP(d,nd_nvar-1); + XOR_EXP(d,nd_nvar-1,h); + TD(d) -= h; + d[nd_exporigin-1] -= h; + } else { + if ( nd_isrlex ) { + if ( nd_bpe == 32 ) { + h = d[nd_exporigin]; + for ( i = nd_exporigin+1; i < nd_wpd; i++ ) + d[i-1] = d[i]; + d[i-1] = 0; + TD(d) -= h; + } else { + bits = nd_epw*nd_bpe; + mask = bits==32?0xffffffff:((1<<(nd_epw*nd_bpe))-1); + h = (d[nd_exporigin]>>((nd_epw-1)*nd_bpe))&nd_mask0; + for ( i = nd_exporigin; i < nd_wpd; i++ ) + d[i] = ((d[i]<>((nd_epw-1)*nd_bpe))&nd_mask0):0); + TD(d) -= h; + } } else { - bits = nd_epw*nd_bpe; - mask = bits==32?0xffffffff:((1<<(nd_epw*nd_bpe))-1); - h = (d[nd_exporigin]>>((nd_epw-1)*nd_bpe))&nd_mask0; - for ( i = nd_exporigin; i < nd_wpd; i++ ) - d[i] = ((d[i]<>((nd_epw-1)*nd_bpe))&nd_mask0):0); + h = GET_EXP(d,nd_nvar-1); + XOR_EXP(d,nd_nvar-1,h); TD(d) -= h; } - } else - TD(d) -= ((d[(nd_nvar-1)/nd_epw+nd_exporigin]>> - ((nd_epw-((nd_nvar-1)%nd_epw)-1)*nd_bpe))&((1<n; + for ( j = 0; j < l; j++ ) + d[j+1] = ndl_weight_mask(d,j); + } } int ndl_weight(unsigned int *d) @@ -513,8 +549,23 @@ int ndl_weight(unsigned int *d) return t; } -INLINE int ndl_lex_compare(unsigned int *d1,unsigned int *d2) +int ndl_weight_mask(unsigned int *d,int index) { + unsigned int t,u; + unsigned int *mask; + int i,j; + + mask = nd_blockmask->mask[index]; + for ( t = 0, i = nd_exporigin; i < nd_wpd; i++ ) { + u = d[i]&mask[i]; + for ( j = 0; j < nd_epw; j++, u>>=nd_bpe ) + t += (u&nd_mask0); + } + return t; +} + +int ndl_lex_compare(unsigned int *d1,unsigned int *d2) +{ int i; d1 += nd_exporigin; @@ -527,6 +578,34 @@ INLINE int ndl_lex_compare(unsigned int *d1,unsigned i return 0; } +int ndl_block_compare(unsigned int *d1,unsigned int *d2) +{ + int i,l,j,ord_o,ord_l; + struct order_pair *op; + unsigned int t1,t2,m; + unsigned int *mask; + + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0; j < l; j++ ) { + mask = nd_blockmask->mask[j]; + ord_o = op[j].order; + if ( ord_o < 2 ) + if ( (t1=d1[j+1]) > (t2=d2[j+1]) ) return 1; + else if ( t1 < t2 ) return -1; + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + m = mask[i]; + t1 = d1[i]&m; + t2 = d2[i]&m; + if ( t1 > t2 ) + return !ord_o ? -1 : 1; + else if ( t1 < t2 ) + return !ord_o ? 1 : -1; + } + } + return 0; +} + INLINE int ndl_equal(unsigned int *d1,unsigned int *d2) { int i; @@ -562,6 +641,7 @@ INLINE void ndl_add(unsigned int *d1,unsigned int *d2, { int i; +#if 1 switch ( nd_wpd ) { case 2: TD(d) = TD(d1)+TD(d2); @@ -573,18 +653,19 @@ INLINE void ndl_add(unsigned int *d1,unsigned int *d2, d[2] = d1[2]+d2[2]; break; default: - for ( i = 0; i < nd_wpd; i++ ) - d[i] = d1[i]+d2[i]; + for ( i = 0; i < nd_wpd; i++ ) d[i] = d1[i]+d2[i]; break; } +#else + for ( i = 0; i < nd_wpd; i++ ) d[i] = d1[i]+d2[i]; +#endif } INLINE void ndl_sub(unsigned int *d1,unsigned int *d2,unsigned int *d) { int i; - for ( i = 0; i < nd_wpd; i++ ) - d[i] = d1[i]-d2[i]; + for ( i = 0; i < nd_wpd; i++ ) d[i] = d1[i]-d2[i]; } int ndl_disjoint(unsigned int *d1,unsigned int *d2) @@ -725,50 +806,51 @@ int ndl_check_bound2(int index,unsigned int *d2) int ndl_check_bound2_direct(unsigned int *d1,unsigned int *d2) { - unsigned int u1,u2; - int i,j,k; + unsigned int u2; + int i,j,ind,k; + ind = 0; switch ( nd_bpe ) { case 4: for ( i = nd_exporigin; i < nd_wpd; i++ ) { - u1 = d1[i]; u2 = d2[i]; - if ( ((u1>>28)&0xf)+((u2>>28)&0xf) >= 0x10 ) return 1; - if ( ((u1>>24)&0xf)+((u2>>24)&0xf) >= 0x10 ) return 1; - if ( ((u1>>20)&0xf)+((u2>>20)&0xf) >= 0x10 ) return 1; - if ( ((u1>>16)&0xf)+((u2>>16)&0xf) >= 0x10 ) return 1; - if ( ((u1>>12)&0xf)+((u2>>12)&0xf) >= 0x10 ) return 1; - if ( ((u1>>8)&0xf)+((u2>>8)&0xf) >= 0x10 ) return 1; - if ( ((u1>>4)&0xf)+((u2>>4)&0xf) >= 0x10 ) return 1; - if ( (u1&0xf)+(u2&0xf) >= 0x10 ) return 1; + u2 = d2[i]; + if ( d1[ind++]+((u2>>28)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+((u2>>24)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+((u2>>20)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+((u2>>16)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+((u2>>12)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+((u2>>8)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+((u2>>4)&0xf) >= 0x10 ) return 1; + if ( d1[ind++]+(u2&0xf) >= 0x10 ) return 1; } return 0; break; case 6: for ( i = nd_exporigin; i < nd_wpd; i++ ) { - u1 = d1[i]; u2 = d2[i]; - if ( ((u1>>24)&0x3f)+((u2>>24)&0x3f) >= 0x40 ) return 1; - if ( ((u1>>18)&0x3f)+((u2>>18)&0x3f) >= 0x40 ) return 1; - if ( ((u1>>12)&0x3f)+((u2>>12)&0x3f) >= 0x40 ) return 1; - if ( ((u1>>6)&0x3f)+((u2>>6)&0x3f) >= 0x40 ) return 1; - if ( (u1&0x3f)+(u2&0x3f) >= 0x40 ) return 1; + u2 = d2[i]; + if ( d1[ind++]+((u2>>24)&0x3f) >= 0x40 ) return 1; + if ( d1[ind++]+((u2>>18)&0x3f) >= 0x40 ) return 1; + if ( d1[ind++]+((u2>>12)&0x3f) >= 0x40 ) return 1; + if ( d1[ind++]+((u2>>6)&0x3f) >= 0x40 ) return 1; + if ( d1[ind++]+(u2&0x3f) >= 0x40 ) return 1; } return 0; break; case 8: for ( i = nd_exporigin; i < nd_wpd; i++ ) { - u1 = d1[i]; u2 = d2[i]; - if ( ((u1>>24)&0xff)+((u2>>24)&0xff) >= 0x100 ) return 1; - if ( ((u1>>16)&0xff)+((u2>>16)&0xff) >= 0x100 ) return 1; - if ( ((u1>>8)&0xff)+((u2>>8)&0xff) >= 0x100 ) return 1; - if ( (u1&0xff)+(u2&0xff) >= 0x100 ) return 1; + u2 = d2[i]; + if ( d1[ind++]+((u2>>24)&0xff) >= 0x100 ) return 1; + if ( d1[ind++]+((u2>>16)&0xff) >= 0x100 ) return 1; + if ( d1[ind++]+((u2>>8)&0xff) >= 0x100 ) return 1; + if ( d1[ind++]+(u2&0xff) >= 0x100 ) return 1; } return 0; break; case 16: for ( i = nd_exporigin; i < nd_wpd; i++ ) { - u1 = d1[i]; u2 = d2[i]; - if ( ((u1>>16)&0xffff)+((u2>>16)&0xffff) > 0x10000 ) return 1; - if ( (u2&0xffff)+(u2&0xffff) > 0x10000 ) return 1; + u2 = d2[i]; + if ( d1[ind++]+((u2>>16)&0xffff) > 0x10000 ) return 1; + if ( d1[ind++]+(u2&0xffff) > 0x10000 ) return 1; } return 0; break; @@ -779,11 +861,10 @@ int ndl_check_bound2_direct(unsigned int *d1,unsigned break; default: for ( i = nd_exporigin; i < nd_wpd; i++ ) { - u1 = d1[i]; u2 = d2[i]; + u2 = d2[i]; k = (nd_epw-1)*nd_bpe; for ( j = 0; j < nd_epw; j++, k -= nd_bpe ) - if ( ((u1>>k)&nd_mask0)+((u2>>k)&nd_mask0) > nd_mask0 ) - return 1; + if ( d1[ind++]+((u2>>k)&nd_mask0) > nd_mask0 ) return 1; } return 0; break; @@ -848,18 +929,14 @@ INLINE int nd_find_reducer_direct(ND g,NDV *ps,int len if ( Reverse ) for ( i = len-1; i >= 0; i-- ) { r = ps[i]; - if ( ndl_reducible(HDL(g),HDL(r)) ) { - nd_append_red(HDL(g),i); + if ( ndl_reducible(HDL(g),HDL(r)) ) return i; - } } else for ( i = 0; i < len; i++ ) { r = ps[i]; - if ( ndl_reducible(HDL(g),HDL(r)) ) { - nd_append_red(HDL(g),i); + if ( ndl_reducible(HDL(g),HDL(r)) ) return i; - } } return -1; } @@ -961,7 +1038,7 @@ ND nd_add_q(ND p1,ND p2) } /* ret=1 : success, ret=0 : overflow */ -int nd_nf(int mod,ND g,int full,ND *rp) +int nd_nf(int mod,ND g,NDV *ps,int full,ND *rp) { ND d; NM m,mrd,tail; @@ -991,12 +1068,11 @@ int nd_nf(int mod,ND g,int full,ND *rp) nd_free(g); nd_free(d); return 0; } + p = ps[index]; 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); nd_mul_c_q(g,cred); @@ -1029,7 +1105,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) return 1; } -int nd_nf_pbucket(int mod,ND g,int full,ND *rp) +int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *rp) { int hindex,index; NDV p; @@ -1072,12 +1148,11 @@ int nd_nf_pbucket(int mod,ND g,int full,ND *rp) *rp = 0; return 0; } + p = ps[index]; 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); @@ -1125,13 +1200,15 @@ int nd_nf_pbucket(int mod,ND g,int full,ND *rp) } } -int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full,ND *rp) +int nd_nf_direct(int mod,ND g,BaseSet base,int full,ND *rp) { ND d; NM m,mrd,tail; NM mul; - int n,sugar,psugar,sugar0,stat,index; + NDV *ps; + int n,sugar,psugar,sugar0,stat,index,len; int c,c1,c2; + unsigned int **bound; RHist h; NDV p,red; Q cg,cred,gcd; @@ -1149,6 +1226,9 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full hmag = 0; #endif + ps = base->ps; + bound = base->bound; + len = base->len; sugar0 = sugar = SG(g); n = NV(g); mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); @@ -1157,7 +1237,7 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full if ( index >= 0 ) { p = ps[index]; ndl_sub(HDL(g),HDL(p),DL(mul)); - if ( ndl_check_bound2_direct(HDL(p),DL(mul)) ) { + if ( ndl_check_bound2_direct(bound[index],DL(mul)) ) { nd_free(g); nd_free(d); return 0; } @@ -1197,124 +1277,36 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full 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)); - 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(DL(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; + NODE t,s; +#if 0 + for ( t = 0; cand; cand = NEXT(cand) ) { + MKNODE(s,BDY(cand),t); t = s; + } + cand = t; +#endif + nd_setup(0,0,cand); n = length(cand); /* membercheck : list is a subset of Id(cand) ? */ for ( t = input; t; t = NEXT(t) ) { +again: 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; + stat = nd_nf(0,d,nd_ps,0,&nf); + if ( !stat ) { + nd_reconstruct(0,0,0); + goto again; + } else if ( nf ) return 0; + printf("."); fflush(stdout); } + printf("\n"); /* gbcheck : cand is a GB of Id(cand) ? */ if ( !nd_gb(0,1) ) return 0; /* XXX */ @@ -1500,16 +1492,16 @@ again: sugar = SG(l); fprintf(asir_out,"%d",sugar); } - stat = nd_sp(m,l,&h); + stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; d = nd_reconstruct(m,0,d); goto again; } #if USE_GEOBUCKET - stat = m?nd_nf_pbucket(m,h,!Top,&nf):nd_nf(m,h,!Top,&nf); + stat = m?nd_nf_pbucket(m,h,nd_ps,!Top,&nf):nd_nf(m,h,nd_ps,!Top,&nf); #else - stat = nd_nf(m,h,!Top,&nf); + stat = nd_nf(m,h,nd_ps,!Top,&nf); #endif if ( !stat ) { NEXT(l) = d; d = l; @@ -1518,7 +1510,7 @@ again: } else if ( nf ) { if ( checkonly ) return 0; printf("+"); fflush(stdout); - nh = m?nd_newps(m,nf,0):nd_newps(m,0,nf); + nh = nd_newps(m,nf,0); d = update_pairs(d,g,nh); g = update_base(g,nh); FREENDP(l); @@ -1527,10 +1519,7 @@ again: FREENDP(l); } } - if ( m ) - for ( t = g; t; t = NEXT(t) ) BDY(t) = (pointer)nd_ps[(int)BDY(t)]; - else - for ( t = g; t; t = NEXT(t) ) BDY(t) = (pointer)nd_psq[(int)BDY(t)]; + for ( t = g; t; t = NEXT(t) ) BDY(t) = (pointer)nd_ps[(int)BDY(t)]; return g; } @@ -1555,16 +1544,16 @@ again: sugar = SG(l); fprintf(asir_out,"%d",sugar); } - stat = nd_sp(m,l,&h); + stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; d = nd_reconstruct(m,1,d); goto again; } #if USE_GEOBUCKET - stat = nd_nf_pbucket(m,h,!Top,&nf); + stat = nd_nf_pbucket(m,h,nd_ps,!Top,&nf); #else - stat = nd_nf(m,h,!Top,&nf); + stat = nd_nf(m,h,nd_ps,!Top,&nf); #endif if ( !stat ) { NEXT(l) = d; d = l; @@ -1572,8 +1561,8 @@ again: goto again; } else if ( nf ) { /* overflow does not occur */ - nd_sp(0,l,&h); - nd_nf(0,h,!Top,&nfq); + nd_sp(0,1,l,&h); + nd_nf(0,h,nd_ps_trace,!Top,&nfq); if ( nfq ) { printf("+"); fflush(stdout); nh = nd_newps(m,nf,nfq); @@ -1590,7 +1579,7 @@ again: FREENDP(l); } for ( t = g; t; t = NEXT(t) ) - BDY(t) = (pointer)nd_psq[(int)BDY(t)]; + BDY(t) = (pointer)nd_ps_trace[(int)BDY(t)]; return g; } @@ -1610,33 +1599,49 @@ NODE nd_reduceall(int m,NODE f) NDV *w,*ps; ND nf,g; NODE t,a0,a; + struct oBaseSet base; + unsigned int **bound; for ( n = 0, t = f; t; t = NEXT(t), n++ ); ps = (NDV *)ALLOCA(n*sizeof(NDV)); - for ( i = 0, t = f; i < n; i++, t = NEXT(t) ) - ps[i] = (NDV)BDY(t); + bound = (unsigned int **)ALLOCA(n*sizeof(unsigned int *)); + for ( i = 0, t = f; i < n; i++, t = NEXT(t) ) ps[i] = (NDV)BDY(t); qsort(ps,n,sizeof(NDV),(int (*)(const void *,const void *))ndv_compare); - w = (NDV *)ALLOCA((n-1)*sizeof(NDV)); - for ( i = 0; i < n; i++ ) { - for ( j = 0; j < i; j++ ) w[j] = (NDV)ps[j]; - for ( j = i+1; j < n; j++ ) w[j-1] = ps[j]; + for ( i = 0; i < n; i++ ) bound[i] = ndv_compute_bound(ps[i]); + base.ps = (NDV *)ALLOCA((n-1)*sizeof(NDV)); + base.bound = (unsigned int **)ALLOCA((n-1)*sizeof(unsigned int *)); + base.len = n-1; + i = 0; + while ( i < n ) { + for ( j = 0; j < i; j++ ) { + base.ps[j] = ps[j]; base.bound[j] = bound[j]; + } + for ( j = i+1; j < n; j++ ) { + base.ps[j-1] = ps[j]; base.bound[j-1] = bound[j]; + } g = ndvtond(m,ps[i]); - stat = nd_nf_direct(m,g,w,n-1,1,&nf); + stat = nd_nf_direct(m,g,&base,1,&nf); if ( !stat ) nd_reconstruct_direct(m,ps,n); else if ( !nf ) { printf("."); fflush(stdout); ndv_free(ps[i]); - for ( j = i+1; j < n; j++ ) ps[j-1] = ps[j]; + for ( j = i+1; j < n; j++ ) { + ps[j-1] = ps[j]; bound[j-1] = bound[j]; + } n--; + base.len = n-1; } else { printf("."); fflush(stdout); ndv_free(ps[i]); nd_removecont(m,nf); ps[i] = ndtondv(m,nf); + bound[i] = ndv_compute_bound(ps[i]); nd_free(nf); + i++; } } + printf("\n"); for ( a0 = 0, i = 0; i < n; i++ ) { NEXTNODE(a0,a); BDY(a) = (pointer)ps[i]; @@ -1887,34 +1892,31 @@ int nd_newps(int mod,ND a,ND aq) RHist r; NDV b; + if ( aq ) { + /* trace lifting */ + if ( !rem(NM(HCQ(aq)),mod) ) + return -1; + } if ( nd_psn == nd_pslen ) { nd_pslen *= 2; nd_ps = (NDV *)REALLOC((char *)nd_ps,nd_pslen*sizeof(NDV)); - nd_psq = (NDV *)REALLOC((char *)nd_psq,nd_pslen*sizeof(NDV)); + nd_ps_trace = (NDV *)REALLOC((char *)nd_ps_trace,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 ( a && aq ) { - /* trace lifting */ - if ( !rem(NM(HCQ(aq)),mod) ) return -1; - } NEWRHist(r); nd_psh[nd_psn] = r; + nd_removecont(mod,a); nd_ps[nd_psn] = ndtondv(mod,a); if ( aq ) { - nd_removecont(0,aq); - nd_psq[nd_psn] = ndtondv(0,aq); - nd_bound[nd_psn] = nd_compute_bound(aq); + nd_removecont(0,aq); nd_ps_trace[nd_psn] = ndtondv(0,aq); + nd_bound[nd_psn] = ndv_compute_bound(nd_ps_trace[nd_psn]); SG(r) = SG(aq); ndl_copy(HDL(aq),DL(r)); + nd_free(a); nd_free(aq); + } else { + nd_bound[nd_psn] = ndv_compute_bound(nd_ps[nd_psn]); + SG(r) = SG(a); ndl_copy(HDL(a),DL(r)); + nd_free(a); } - if ( a ) { - nd_removecont(mod,a); - nd_ps[nd_psn] = ndtondv(mod,a); - if ( !aq ) { - nd_bound[nd_psn] = nd_compute_bound(a); - SG(r) = SG(a); ndl_copy(HDL(a),DL(r)); - } - } - nd_free(a); nd_free(aq); return nd_psn++; } @@ -1930,7 +1932,7 @@ void nd_setup(int mod,int trace,NODE f) nd_psn = length(f); nd_pslen = 2*nd_psn; nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); - nd_psq = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); + nd_ps_trace = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); 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) ) { @@ -1956,13 +1958,10 @@ void nd_setup(int mod,int trace,NODE f) a = dptondv(mod,(DP)BDY(f)); ndv_removecont(mod,a); SG(r) = HTD(a); ndl_copy(HDL(a),DL(r)); + nd_ps[i] = a; if ( trace ) { - nd_ps[i] = a; a = dptondv(0,(DP)BDY(f)); ndv_removecont(0,a); - nd_psq[i] = a; - } else { - if ( mod ) nd_ps[i] = a; - else nd_psq[i] = a; + nd_ps_trace[i] = a; } nd_psh[i] = r; } @@ -1989,6 +1988,7 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord, x = nd_gb(m,0); fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n", nd_found,nd_notfirst,nd_create); + x = nd_reducebase(x); x = nd_reduceall(m,x); for ( r0 = 0, t = x; t; t = NEXT(t) ) { NEXTNODE(r0,r); @@ -2004,16 +2004,27 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord, MKLIST(*rp,r0); } -void nd_gr_trace(LIST f,LIST v,int m,int homo,struct order_spec *ord,LIST *rp) +void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp) { struct order_spec ord1; VL fv,vv,vc; NODE fd,fd0,in0,in,r,r0,t,s,cand; + int m,nocheck,nvar,mindex; DP a,b,c,h; P p; get_vars((Obj)f,&fv); pltovl(v,&vv); - nd_nvar = length(vv); + nvar = length(vv); + nocheck = 0; + mindex = 0; + + /* setup modulus */ + if ( trace < 0 ) { + trace = -trace; + nocheck = 1; + } + m = trace > 1 ? trace : get_lprime(mindex); + initd(ord); if ( homo ) { homogenize_order(ord,nd_nvar,&ord1); @@ -2026,9 +2037,6 @@ 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 { for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { ptod(CO,vv,(P)BDY(t),&c); @@ -2038,21 +2046,37 @@ 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 { + while ( 1 ) { + if ( homo ) { + nd_init_ord(&ord1); + initd(&ord1); + nd_nvar = nvar+1; + } else { + nd_init_ord(ord); + nd_nvar = nvar; + } nd_setup(m,1,fd0); cand = nd_gb_trace(m); - if ( !cand ) continue; + if ( !cand ) { + /* failure */ + if ( trace > 1 ) { + *rp = 0; return; + } else + m = get_lprime(++mindex); + continue; + } + if ( homo ) { /* dehomogenization */ for ( t = cand; t; t = NEXT(t) ) - ndv_dehomogenize((NDV)BDY(t)); - nd_nvar--; - nd_setup_parameters(); + ndv_dehomogenize((NDV)BDY(t),ord); + nd_nvar = nvar; initd(ord); - cand = nd_reducebase(cand); + nd_init_ord(ord); + nd_setup_parameters(); } + 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); @@ -2063,7 +2087,16 @@ void nd_gr_trace(LIST f,LIST v,int m,int homo,struct o } if ( r0 ) NEXT(r) = 0; cand = r0; - } while ( !nd_check_candidate(in0,cand) ); + if ( nocheck || nd_check_candidate(in0,cand) ) + /* success */ + break; + else if ( trace > 1 ) { + /* failure */ + *rp = 0; return; + } else + /* try the next modulus */ + m = get_lprime(++mindex); + } /* dp->p */ for ( r = cand; r; r = NEXT(r) ) { dtop(CO,vv,BDY(r),&p); @@ -2075,32 +2108,69 @@ void nd_gr_trace(LIST f,LIST v,int m,int homo,struct o void dltondl(int n,DL dl,unsigned int *r) { unsigned int *d; - int i; + int i,j,l,s,ord_l,ord_o; + struct order_pair *op; d = dl->d; for ( i = 0; i < nd_wpd; i++ ) r[i] = 0; - if ( nd_isrlex ) - for ( i = 0; i < n; i++ ) PUT_EXP(r,n-1-i,d[i]); - else - for ( i = 0; i < n; i++ ) PUT_EXP(r,i,d[i]); - TD(r) = ndl_weight(r); + if ( nd_blockmask ) { + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0, s = 0; j < l; j++ ) { + ord_o = op[j].order; + ord_l = op[j].length; + if ( !ord_o ) + for ( i = 0; i < ord_l; i++ ) + PUT_EXP(r,s+ord_l-i-1,d[s+i]); + else + for ( i = 0; i < ord_l; i++ ) + PUT_EXP(r,s+i,d[s+i]); + s += ord_l; + } + TD(r) = ndl_weight(r); + for ( j = 0; j < l; j++ ) + r[j+1] = ndl_weight_mask(r,j); + } else { + if ( nd_isrlex ) + for ( i = 0; i < n; i++ ) PUT_EXP(r,n-1-i,d[i]); + else + for ( i = 0; i < n; i++ ) PUT_EXP(r,i,d[i]); + TD(r) = ndl_weight(r); + } } DL ndltodl(int n,unsigned int *ndl) { DL dl; int *d; - int i; + int i,j,l,s,ord_l,ord_o; + struct order_pair *op; NEWDL(dl,n); dl->td = TD(ndl); d = dl->d; - if ( nd_isrlex ) - for ( i = 0; i < n; i++ ) - d[i] = GET_EXP(ndl,n-1-i); - else - for ( i = 0; i < n; i++ ) - d[i] = GET_EXP(ndl,i); + if ( nd_blockmask ) { + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0, s = 0; j < l; j++ ) { + ord_o = op[j].order; + ord_l = op[j].length; + if ( !ord_o ) + for ( i = 0; i < ord_l; i++ ) + d[s+i] = GET_EXP(ndl,s+ord_l-i-1); + else + for ( i = 0; i < ord_l; i++ ) + d[s+i] = GET_EXP(ndl,s+i); + s += ord_l; + } + } else { + if ( nd_isrlex ) + for ( i = 0; i < n; i++ ) + d[i] = GET_EXP(ndl,n-1-i); + else + for ( i = 0; i < n; i++ ) + d[i] = GET_EXP(ndl,i); + } return dl; } @@ -2153,14 +2223,30 @@ DP ndtodp(int mod,ND p) void ndl_print(unsigned int *dl) { int n; - int i; + int i,j,l,ord_o,ord_l,s,s0; + struct order_pair *op; n = nd_nvar; printf("<<"); - if ( nd_isrlex ) - for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,n-1-i)); - else - for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,i)); + if ( nd_blockmask ) { + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0, s = s0 = 0; j < l; j++ ) { + ord_o = op[j].order; + ord_l = op[j].length; + if ( !ord_o ) + for ( i = 0, s0 += ord_l; i < ord_l; i++, s++ ) + printf(s==n-1?"%d":"%d,",GET_EXP(dl,s0-i-1)); + else + for ( i = 0; i < ord_l; i++, s++ ) + printf(s==n-1?"%d":"%d,",GET_EXP(dl,s)); + } + } else { + if ( nd_isrlex ) + for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,n-1-i)); + else + for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,i)); + } printf(">>"); } @@ -2273,25 +2359,27 @@ void ndv_removecont(int mod,NDV p) } } -void ndv_dehomogenize(NDV p) +void ndv_dehomogenize(NDV p,struct order_spec *ord) { - int i,len,newnvar,newwpd,newadv; + int i,j,adj,len,newnvar,newwpd,newadv,newexporigin; Q *w; Q dvr,t; NMV m,r; - unsigned int *d; #define NEWADV(m) (m = (NMV)(((char *)m)+newadv)) len = p->len; newnvar = nd_nvar-1; - newwpd = newnvar/nd_epw+(newnvar%nd_epw?1:0)+nd_exporigin; + newexporigin = nd_get_exporigin(ord); + newwpd = newnvar/nd_epw+(newnvar%nd_epw?1:0)+newexporigin; for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) ndl_dehomogenize(DL(m)); if ( newwpd != nd_wpd ) { - d = (unsigned int *)ALLOCA(newwpd*sizeof(unsigned int)); newadv = sizeof(struct oNMV)+(newwpd-1)*sizeof(unsigned int); for ( m = r = BDY(p), i = 0; i < len; NMV_ADV(m), NEWADV(r), i++ ) { - CQ(r) = CQ(m); ndl_copy(DL(m),d); ndl_copy(d,DL(r)); + CQ(r) = CQ(m); + for ( j = 0; j < newexporigin; j++ ) DL(r)[j] = DL(m)[j]; + adj = nd_exporigin-newexporigin; + for ( ; j < newwpd; j++ ) DL(r)[j] = DL(m)[j+adj]; } } NV(p)--; @@ -2414,18 +2502,19 @@ unsigned int *dp_compute_bound(DP p) return t; } -unsigned int *nd_compute_bound(ND p) +unsigned int *ndv_compute_bound(NDV p) { unsigned int *d1,*d2,*t; - int i,l; - NM m; + int i,l,len; + NMV m; if ( !p ) return 0; d1 = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); d2 = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); - ndl_copy(HDL(p),d1); - for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { + len = LEN(p); + m = BDY(p); ndl_copy(DL(m),d1); NMV_ADV(m); + for ( i = 1; i < len; i++, NMV_ADV(m) ) { ndl_lcm(DL(m),d1,d2); t = d1; d1 = d2; d2 = t; } @@ -2436,24 +2525,33 @@ unsigned int *nd_compute_bound(ND p) return t; } -void nd_setup_parameters() { - int i; - - nd_epw = (sizeof(unsigned int)*8)/nd_bpe; - nd_wpd = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0); - switch ( nd_ord->id ) { +int nd_get_exporigin(struct order_spec *ord) +{ + switch ( ord->id ) { case 0: - nd_exporigin = 1; - break; + return 1; case 1: /* block order */ - nd_exporigin = nd_ord->ord.block.length; - break; + /* d[0]:weight d[1]:w0,...,d[nd_exporigin-1]:w(n-1) */ + return ord->ord.block.length+1; case 2: - error("nd_setup_parameters : matrix order is not supported yet."); - break; + error("nd_get_exporigin : matrix order is not supported yet."); } - nd_wpd += nd_exporigin; +} + +void nd_setup_parameters() { + int i,n,elen; + + nd_epw = (sizeof(unsigned int)*8)/nd_bpe; + elen = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0); + + nd_exporigin = nd_get_exporigin(nd_ord); + nd_wpd = nd_exporigin+elen; + nd_epos = (EPOS)MALLOC_ATOMIC(nd_nvar*sizeof(struct oEPOS)); + for ( i = 0; i < nd_nvar; i++ ) { + nd_epos[i].i = nd_exporigin + i/nd_epw; + nd_epos[i].s = (nd_epw-(i%nd_epw)-1)*nd_bpe; + } if ( nd_bpe < 32 ) { nd_mask0 = (1<= 0; i-- ) ndv_realloc(nd_ps[i],obpe,oadv); - if ( !mod || trace ) - for ( i = nd_psn-1; i >= 0; i-- ) ndv_realloc(nd_psq[i],obpe,oadv); + for ( i = nd_psn-1; i >= 0; i-- ) ndv_realloc(nd_ps[i],obpe,oadv,oepos); + if ( trace ) + for ( i = nd_psn-1; i >= 0; i-- ) + ndv_realloc(nd_ps_trace[i],obpe,oadv,oepos); s0 = 0; for ( t = d; t; t = NEXT(t) ) { NEXTND_pairs(s0,s); s->i1 = t->i1; s->i2 = t->i2; SG(s) = SG(t); - ndl_reconstruct(obpe,LCM(t),LCM(s)); + ndl_reconstruct(obpe,oepos,LCM(t),LCM(s)); } old_red = (RHist *)ALLOCA(REDTAB_LEN*sizeof(RHist)); @@ -2521,7 +2616,7 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) NEWRHist(mr); mr->index = r->index; SG(mr) = SG(r); - ndl_reconstruct(obpe,DL(r),DL(mr)); + ndl_reconstruct(obpe,oepos,DL(r),DL(mr)); h = ndl_hash_value(DL(mr)); NEXT(mr) = nd_red[h]; nd_red[h] = mr; @@ -2530,7 +2625,7 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) old_red = 0; for ( i = 0; i < nd_psn; i++ ) { NEWRHist(r); SG(r) = SG(nd_psh[i]); - ndl_reconstruct(obpe,DL(nd_psh[i]),DL(r)); + ndl_reconstruct(obpe,oepos,DL(nd_psh[i]),DL(r)); nd_psh[i] = r; } if ( s0 ) NEXT(s) = 0; @@ -2543,14 +2638,17 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) void nd_reconstruct_direct(int mod,NDV *ps,int len) { int i,obpe,oadv,h; + unsigned int **bound; NM prev_nm_free_list; RHist mr0,mr; RHist r; RHist *old_red; ND_pairs s0,s,t,prev_ndp_free_list; + EPOS oepos; obpe = nd_bpe; oadv = nmv_adv; + oepos = nd_epos; if ( obpe < 4 ) nd_bpe = 4; else if ( obpe < 6 ) nd_bpe = 6; else if ( obpe < 8 ) nd_bpe = 8; @@ -2562,66 +2660,55 @@ void nd_reconstruct_direct(int mod,NDV *ps,int len) prev_nm_free_list = _nm_free_list; prev_ndp_free_list = _ndp_free_list; _nm_free_list = 0; _ndp_free_list = 0; - for ( i = len-1; i >= 0; i-- ) ndv_realloc(ps[i],obpe,oadv); - old_red = (RHist *)ALLOCA(REDTAB_LEN*sizeof(RHist)); - for ( i = 0; i < REDTAB_LEN; i++ ) { - old_red[i] = nd_red[i]; - nd_red[i] = 0; - } - for ( i = 0; i < REDTAB_LEN; i++ ) - for ( r = old_red[i]; r; r = NEXT(r) ) { - NEWRHist(mr); - mr->index = r->index; - SG(mr) = SG(r); - ndl_reconstruct(obpe,DL(r),DL(mr)); - h = ndl_hash_value(DL(mr)); - NEXT(mr) = nd_red[h]; - nd_red[h] = mr; - } - for ( i = 0; i < REDTAB_LEN; i++ ) old_red[i] = 0; - old_red = 0; + for ( i = len-1; i >= 0; i-- ) ndv_realloc(ps[i],obpe,oadv,oepos); prev_nm_free_list = 0; prev_ndp_free_list = 0; GC_gcollect(); } -void ndl_reconstruct(int obpe,unsigned int *d,unsigned int *r) +void ndl_reconstruct(int obpe,EPOS oepos,unsigned int *d,unsigned int *r) { - int n,i,ei,oepw,cepw,cbpe; + int n,i,ei,oepw,omask0,j,s,ord_l,ord_o,l; + struct order_pair *op; +#define GET_EXP_OLD(d,a) (((d)[oepos[a].i]>>oepos[a].s)&omask0) +#define PUT_EXP_OLD(r,a,e) ((r)[oepos[a].i] |= ((e)<>((oepw-((n-1-i)%oepw)-1)*obpe)) - &((1<n; + op = nd_blockmask->order_pair; + for ( i = 1; i < nd_exporigin; i++ ) + r[i] = d[i]; + for ( j = 0, s = 0; j < l; j++ ) { + ord_o = op[j].order; + ord_l = op[j].length; + if ( !ord_o ) + for ( i = 0; i < ord_l; i++ ) { + ei = GET_EXP_OLD(d,s+ord_l-i-1); + PUT_EXP(r,s+ord_l-i-1,ei); + } + else + for ( i = 0; i < ord_l; i++ ) { + ei = GET_EXP_OLD(d,s+i); + PUT_EXP(r,s+i,ei); + } + s += ord_l; } - else - for ( i = 0; i < n; i++ ) { - ei = (d[i/oepw+nd_exporigin]>>((oepw-(i%oepw)-1)*obpe)) - &((1<i1]; p2 = nd_ps[p->i2]; + if ( trace ) { + p1 = nd_ps_trace[p->i1]; p2 = nd_ps_trace[p->i2]; } else { - p1 = nd_psq[p->i1]; p2 = nd_psq[p->i2]; + p1 = nd_ps[p->i1]; p2 = nd_ps[p->i2]; } lcm = LCM(p); NEWNM(m); @@ -2743,7 +2830,7 @@ ND ndv_mul_nm(int mod,NDV p,NM m0) } } -void ndv_realloc(NDV p,int obpe,int oadv) +void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos) { NMV m,mr,mr0,t; int len,i,k; @@ -2760,7 +2847,7 @@ void ndv_realloc(NDV p,int obpe,int oadv) for ( i = 0; i < len; i++, NMV_OPREV(m), NMV_PREV(mr) ) { CQ(t) = CQ(m); for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0; - ndl_reconstruct(obpe,DL(m),DL(t)); + ndl_reconstruct(obpe,oepos,DL(m),DL(t)); CQ(mr) = CQ(t); ndl_copy(DL(t),DL(mr)); } @@ -2816,15 +2903,17 @@ NDV dptondv(int mod,DP p) DP q; int l,i,n; - if ( !p ) return 0; - for ( t = BDY(p), l = 0; t; t = NEXT(t), l++ ); if ( mod ) { _dp_mod(p,mod,0,&q); p = q; + } + if ( !p ) return 0; + for ( t = BDY(p), l = 0; t; t = NEXT(t), l++ ); + if ( mod ) m0 = m = (NMV)MALLOC_ATOMIC(l*nmv_adv); - } else + else m0 = m = (NMV)MALLOC(l*nmv_adv); n = NV(p); - for ( t = BDY(p), i = 0; i < l; i++, t = NEXT(t), NMV_ADV(m) ) { + for ( t = BDY(p); t; t = NEXT(t), NMV_ADV(m) ) { if ( mod ) CM(m) = ITOS(C(t)); else CQ(m) = (Q)C(t); dltondl(n,DL(t),DL(m)); @@ -2914,28 +3003,62 @@ NODE nd_reducebase(NODE x) return x; } +/* XXX incomplete */ + void nd_init_ord(struct order_spec *ord) { - if ( ord->id ) - error("nd_gr : unsupported order"); - nd_dcomp = 0; - switch ( ord->ord.simple ) { + switch ( ord->id ) { case 0: - nd_dcomp = 1; - nd_isrlex = 1; + switch ( ord->ord.simple ) { + case 0: + nd_dcomp = 1; + nd_isrlex = 1; + break; + case 1: + nd_dcomp = 1; + nd_isrlex = 0; + break; + case 2: + nd_dcomp = 0; + nd_isrlex = 0; + ndl_compare_function = ndl_lex_compare; + break; + default: + error("nd_gr : unsupported order"); + } break; case 1: - nd_dcomp = 1; + /* XXX */ + nd_dcomp = -1; nd_isrlex = 0; + ndl_compare_function = ndl_block_compare; break; - case 9: - /* td1->td->rlex */ - nd_dcomp = -dp_nelim; - nd_isrlex = 1; + case 2: + error("nd_init_ord : matrix order is not supported yet."); break; - default: - error("nd_gr : unsupported order"); } nd_ord = ord; } +BlockMask nd_create_blockmask(struct order_spec *ord) +{ + int n,i,j,s,l; + unsigned int *t; + BlockMask bm; + + if ( !ord->id ) + return 0; + n = ord->ord.block.length; + bm = (BlockMask)MALLOC(sizeof(struct oBlockMask)); + bm->n = n; + bm->order_pair = ord->ord.block.order_pair; + bm->mask = (unsigned int **)MALLOC(n*sizeof(unsigned int *)); + for ( i = 0, s = 0; i < n; i++ ) { + bm->mask[i] = t + = (unsigned int *)MALLOC_ATOMIC(nd_wpd*sizeof(unsigned int)); + for ( j = 0; j < nd_wpd; j++ ) t[j] = 0; + l = bm->order_pair[i].length; + for ( j = 0; j < l; j++, s++ ) PUT_EXP(t,s,nd_mask0); + } + return bm; +}