=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.27 retrieving revision 1.30 diff -u -p -r1.27 -r1.30 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/08/10 01:31:24 1.27 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/08/12 09:07:19 1.30 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.26 2003/08/07 09:47:08 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.29 2003/08/11 07:37:08 noro Exp $ */ #include "ca.h" #include "inline.h" @@ -11,11 +11,14 @@ #define INLINE #endif +#define USE_GEOBUCKET 1 + #define REDTAB_LEN 32003 typedef struct oPGeoBucket { int m; struct oND *body[32]; + int len[32]; } *PGeoBucket; typedef struct oND { @@ -165,14 +168,17 @@ void _NM_alloc(); void _ND_alloc(); int ndl_td(unsigned int *d); int ndl_dehomogenize(unsigned int *p); -ND nd_add(int mod,ND p1,ND p2); -ND nd_add_q(ND p1,ND p2); +ND nd_add(int mod,ND p1,ND p2,int *cancel); +ND nd_add_q(ND p1,ND p2,int *cancel); ND nd_mul_nm(int mod,ND p,NM m0); ND nd_mul_ind_nm(int mod,int index,NM m0); 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); @@ -255,7 +261,7 @@ void _NDP_alloc() } } -INLINE nd_length(ND p) +INLINE int nd_length(ND p) { NM m; int i; @@ -755,7 +761,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]; @@ -801,20 +806,23 @@ INLINE int nd_find_reducer_direct(ND g,NDV *ps,int len return -1; } -ND nd_add(int mod,ND p1,ND p2) +ND nd_add(int mod,ND p1,ND p2,int *cancel) { int n,c; - int t; + int t,can; ND r; NM m1,m2,mr0,mr,s; - if ( !p1 ) + if ( !p1 ) { + *cancel = 0; return p2; - else if ( !p2 ) + } else if ( !p2 ) { + *cancel = 0; return p1; - else if ( !mod ) - return nd_add_q(p1,p2); + } else if ( !mod ) + return nd_add_q(p1,p2,cancel); else { + can = 0; for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { if ( TD(m1) > TD(m2) ) c = 1; @@ -829,8 +837,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); @@ -843,6 +853,7 @@ ND nd_add(int mod,ND p1,ND p2) break; } } + *cancel = can; if ( !mr0 ) if ( m1 ) mr0 = m1; @@ -863,18 +874,21 @@ ND nd_add(int mod,ND p1,ND p2) } } -ND nd_add_q(ND p1,ND p2) +ND nd_add_q(ND p1,ND p2,int *cancel) { - int n,c; + int n,c,can; ND r; NM m1,m2,mr0,mr,s; Q t; - if ( !p1 ) + if ( !p1 ) { + *cancel = 0; return p2; - else if ( !p2 ) + } else if ( !p2 ) { + *cancel = 0; return p1; - else { + } else { + can = 0; for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { if ( TD(m1) > TD(m2) ) c = 1; @@ -887,8 +901,10 @@ ND nd_add_q(ND p1,ND p2) 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); @@ -901,6 +917,7 @@ ND nd_add_q(ND p1,ND p2) break; } } + *cancel = can; if ( !mr0 ) if ( m1 ) mr0 = m1; @@ -921,7 +938,6 @@ ND nd_add_q(ND p1,ND p2) } } -#if 1 /* ret=1 : success, ret=0 : overflow */ int nd_nf(int mod,ND g,int full,ND *rp) { @@ -929,7 +945,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; @@ -970,7 +986,7 @@ 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); } - g = nd_add(mod,g,ndv_mul_nm(mod,p,mul)); + g = nd_add(mod,g,ndv_mul_nm(mod,p,mul),&dummy); sugar = MAX(sugar,SG(p)+TD(mul)); if ( !mod && hmag && g && ((double)(p_mag((P)HCQ(g))) > hmag) ) { nd_removecont2(d,g); @@ -1001,8 +1017,8 @@ afo: *rp = d; return 1; } -#else -int nd_nf(int mod,ND g,int full,ND *rp) + +int nd_nf_pbucket(int mod,ND g,int full,ND *rp) { int hindex,index; NDV p; @@ -1014,6 +1030,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) int c,c1,c2; Q cg,cred,gcd,zzz; RHist h; + double hmag,gmag; if ( !g ) { *rp = 0; @@ -1021,6 +1038,8 @@ int nd_nf(int mod,ND g,int full,ND *rp) } 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,nd_length(g)); d = 0; @@ -1056,12 +1075,26 @@ int nd_nf(int mod,ND g,int full,ND *rp) 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); + bucket->len[hindex]--; red = nd_remove_head(red); add_pbucket(mod,bucket,red,LEN(p)-1); 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,nd_length(g)-1); + } } else if ( !full ) { g = normalize_pbucket(mod,bucket); if ( g ) @@ -1076,6 +1109,7 @@ int nd_nf(int mod,ND g,int full,ND *rp) FREEND(g); g = 0; } bucket->body[hindex] = g; + bucket->len[hindex]--; NEXT(m) = 0; if ( d ) { for ( mrd = BDY(d); NEXT(mrd); mrd = NEXT(mrd) ); @@ -1086,41 +1120,14 @@ int nd_nf(int mod,ND g,int full,ND *rp) } } } -#endif -/* 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); - - /* 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; -} - 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; + int c,c1,c2,dummy; RHist h; NDV p,red; Q cg,cred,gcd; @@ -1159,7 +1166,7 @@ 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); } - g = nd_add(mod,g,ndv_mul_nm(mod,p,mul)); + g = nd_add(mod,g,ndv_mul_nm(mod,p,mul),&dummy); sugar = MAX(sugar,SG(p)+TD(mul)); if ( !mod && hmag && g && ((double)(p_mag((P)HCQ(g))) > hmag) ) { nd_removecont2(d,g); @@ -1190,6 +1197,138 @@ 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; + 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,nd_length(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); + bucket->len[hindex]--; + red = nd_remove_head(red); + add_pbucket(mod,bucket,red,LEN(p)-1); + 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,nd_length(g)-1); + } + } 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; + } else { + FREEND(g); g = 0; + } + bucket->body[hindex] = g; + bucket->len[hindex]--; + NEXT(m) = 0; + if ( d ) { + for ( mrd = BDY(d); NEXT(mrd); mrd = NEXT(mrd) ); + NEXT(mrd) = m; + } else { + MKND(n,m,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); + + /* 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; @@ -1220,22 +1359,27 @@ void free_pbucket(PGeoBucket b) { if ( b->body[i] ) { nd_free(b->body[i]); b->body[i] = 0; + b->len[i] = 0; } GC_free(b); } void add_pbucket(int mod,PGeoBucket g,ND d,int l) { - int k,m; + int i,k,m,cancel; - for ( k = 0, m = 1; l > m; k++, m <<= 2 ); - /* 4^(k-1) < l <= 4^k */ - d = nd_add(mod,g->body[k],d); - for ( ; d && nd_length(d) > 1<<(2*k); k++ ) { + 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,&cancel); + l = g->len[k]+l-cancel; + for ( ; d && l > m; k++, m <<= 1 ) { g->body[k] = 0; - d = nd_add(mod,g->body[k+1],d); + g->len[k] = 0; + d = nd_add(mod,g->body[k+1],d,&cancel); + l = g->len[k+1]+l-cancel; } g->body[k] = d; + g->len[k] = l; g->m = MAX(g->m,k); } @@ -1277,8 +1421,10 @@ int head_pbucket(int mod,PGeoBucket g) if ( c > 0 ) { if ( sum ) HCM(gj) = sum; - else + else { g->body[j] = nd_remove_head(gj); + g->len[j]--; + } j = i; gj = g->body[j]; dj = HDL(gj); @@ -1288,6 +1434,7 @@ int head_pbucket(int mod,PGeoBucket g) if ( sum < 0 ) sum += mod; g->body[i] = nd_remove_head(gi); + g->len[i]--; } } } @@ -1296,8 +1443,10 @@ int head_pbucket(int mod,PGeoBucket g) else if ( sum ) { HCM(gj) = sum; return j; - } else + } else { g->body[j] = nd_remove_head(gj); + g->len[j]--; + } } } @@ -1331,8 +1480,10 @@ int head_pbucket_q(PGeoBucket g) if ( c > 0 ) { if ( sum ) HCQ(gj) = sum; - else + else { g->body[j] = nd_remove_head(gj); + g->len[j]--; + } j = i; gj = g->body[j]; dj = HDL(gj); @@ -1341,6 +1492,7 @@ int head_pbucket_q(PGeoBucket g) addq(sum,HCQ(gi),&t); sum = t; g->body[i] = nd_remove_head(gi); + g->len[i]--; } } } @@ -1349,19 +1501,25 @@ int head_pbucket_q(PGeoBucket g) else if ( sum ) { HCQ(gj) = sum; return j; - } else + } else { g->body[j] = nd_remove_head(gj); + g->len[j]--; + } } } ND normalize_pbucket(int mod,PGeoBucket g) { - int i; + int i,dummy; ND r,t; r = 0; - for ( i = 0; i <= g->m; i++ ) - r = nd_add(mod,r,g->body[i]); + for ( i = 0; i <= g->m; i++ ) { + r = nd_add(mod,r,g->body[i],&dummy); + g->body[i] = 0; + g->len[i] = 0; + } + g->m = -1; return r; } @@ -1394,7 +1552,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); @@ -1447,7 +1605,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); @@ -2696,7 +2854,7 @@ int nd_sp(int mod,ND_pairs p,ND *rp) NDV p1,p2; ND t1,t2; unsigned int *lcm; - int td; + int td,dummy; if ( mod ) { p1 = nd_ps[p->i1]; p2 = nd_ps[p->i2]; @@ -2721,7 +2879,7 @@ int nd_sp(int mod,ND_pairs p,ND *rp) return 0; } t2 = ndv_mul_nm(mod,p2,m); - *rp = nd_add(mod,t1,t2); + *rp = nd_add(mod,t1,t2,&dummy); FREENM(m); return 1; }