=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.96 retrieving revision 1.112 diff -u -p -r1.96 -r1.112 --- OpenXM_contrib2/asir2000/engine/nd.c 2004/03/17 08:16:24 1.96 +++ OpenXM_contrib2/asir2000/engine/nd.c 2004/10/06 11:58:52 1.112 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.95 2004/03/15 08:44:52 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.111 2004/09/21 07:19:01 noro Exp $ */ #include "nd.h" @@ -8,7 +8,9 @@ NM _nm_free_list; ND _nd_free_list; ND_pairs _ndp_free_list; +#if 0 static int ndv_alloc; +#endif #if 1 static int nd_f4_nsp=0x7fffffff; #else @@ -33,7 +35,8 @@ static RHist *nd_red; static int *nd_work_vector; static int **nd_matrix; static int nd_matrix_len; - +static struct weight_or_block *nd_worb; +static int nd_worb_len; static int nd_found,nd_create,nd_notfirst; static int nmv_adv; static int nd_demand; @@ -441,6 +444,67 @@ int ndl_matrix_compare(UINT *d1,UINT *d2) return 0; } +int ndl_composite_compare(UINT *d1,UINT *d2) +{ + int i,j,s,start,end,len,o; + int *v; + struct sparse_weight *sw; + + for ( j = 0; j < nd_nvar; j++ ) + nd_work_vector[j] = GET_EXP(d1,j)-GET_EXP(d2,j); + for ( i = 0; i < nd_worb_len; i++ ) { + len = nd_worb[i].length; + switch ( nd_worb[i].type ) { + case IS_DENSE_WEIGHT: + v = nd_worb[i].body.dense_weight; + for ( j = 0, s = 0; j < len; j++ ) + s += v[j]*nd_work_vector[j]; + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + break; + case IS_SPARSE_WEIGHT: + sw = nd_worb[i].body.sparse_weight; + for ( j = 0, s = 0; j < len; j++ ) + s += sw[j].value*nd_work_vector[sw[j].pos]; + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + break; + case IS_BLOCK: + o = nd_worb[i].body.block.order; + start = nd_worb[i].body.block.start; + switch ( o ) { + case 0: + end = start+len; + for ( j = start, s = 0; j < end; j++ ) + s += MUL_WEIGHT(nd_work_vector[j],j); + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + for ( j = end-1; j >= start; j-- ) + if ( nd_work_vector[j] < 0 ) return 1; + else if ( nd_work_vector[j] > 0 ) return -1; + break; + case 1: + end = start+len; + for ( j = start, s = 0; j < end; j++ ) + s += MUL_WEIGHT(nd_work_vector[j],j); + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + for ( j = start; j < end; j++ ) + if ( nd_work_vector[j] > 0 ) return 1; + else if ( nd_work_vector[j] < 0 ) return -1; + break; + case 2: + for ( j = start; j < end; j++ ) + if ( nd_work_vector[j] > 0 ) return 1; + else if ( nd_work_vector[j] < 0 ) return -1; + break; + } + break; + } + } + return 0; +} + /* TDH -> WW -> TD-> RL */ int ndl_ww_lex_compare(UINT *d1,UINT *d2) @@ -852,7 +916,7 @@ ND nd_add(int mod,ND p1,ND p2) if ( !p1 ) return p2; else if ( !p2 ) return p1; else if ( mod == -1 ) return nd_add_sf(p1,p2); - else if ( !mod ) return nd_add_q(p1,p2); + else if ( !mod ) return nd_add_z(p1,p2); else { can = 0; for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { @@ -897,16 +961,16 @@ ND nd_add(int mod,ND p1,ND p2) * done in a function. */ -int nm_destructive_add_q(NM *m1,NM *m2,NM *mr0,NM *mr) +int nm_destructive_add_z(NM *m1,NM *m2,NM *mr0,NM *mr) { NM s; - Q t; + Z t; int can; - addq(CQ(*m1),CQ(*m2),&t); + t = addz(CZ(*m1),CZ(*m2)); s = *m1; *m1 = NEXT(*m1); if ( t ) { - can = 1; NEXTNM2(*mr0,*mr,s); CQ(*mr) = (t); + can = 1; NEXTNM2(*mr0,*mr,s); CZ(*mr) = (t); } else { can = 2; FREENM(s); } @@ -914,12 +978,12 @@ int nm_destructive_add_q(NM *m1,NM *m2,NM *mr0,NM *mr) return can; } -ND nd_add_q(ND p1,ND p2) +ND nd_add_z(ND p1,ND p2) { int n,c,can; ND r; NM m1,m2,mr0,mr,s; - Q t; + Z t; if ( !p1 ) return p2; else if ( !p2 ) return p1; @@ -930,12 +994,12 @@ ND nd_add_q(ND p1,ND p2) switch ( c ) { case 0: #if defined(__x86_64__) - can += nm_destructive_add_q(&m1,&m2,&mr0,&mr); + can += nm_destructive_add_z(&m1,&m2,&mr0,&mr); #else - addq(CQ(m1),CQ(m2),&t); + t = addz(CZ(m1),CZ(m2)); s = m1; m1 = NEXT(m1); if ( t ) { - can++; NEXTNM2(mr0,mr,s); CQ(mr) = (t); + can++; NEXTNM2(mr0,mr,s); CZ(mr) = (t); } else { can += 2; FREENM(s); } @@ -1013,7 +1077,7 @@ ND nd_add_sf(ND p1,ND p2) } /* ret=1 : success, ret=0 : overflow */ -int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *rp) +int nd_nf(int mod,ND g,NDV *ps,int full,Q *dn,ND *rp) { ND d; NM m,mrd,tail; @@ -1022,20 +1086,17 @@ int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *rp) int c,c1,c2,dummy; RHist h; NDV p,red; - Q cg,cred,gcd,tq,qq; + Z cg,cred,gcd; + Q tq,qq; double hmag; - if ( dn ) { - if ( mod ) - dn->m = 1; - else - dn->z = ONE; - } + if ( dn && !mod ) + *dn = ONE; if ( !g ) { *rp = 0; return 1; } - if ( !mod ) hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + if ( !mod ) hmag = ((double)z_mag(HCZ(g)))*nd_scale; sugar0 = sugar = SG(g); n = NV(g); @@ -1059,22 +1120,24 @@ int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *rp) 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); + gcd = gcdz_cofactor(HCZ(g),HCZ(p),&cg,&cred); + CZ(mul) = chsgnz(cg); + nd_mul_c_z(d,cred); + nd_mul_c_z(g,cred); if ( dn ) { - mulq(dn->z,cred,&tq); dn->z = tq; + mulq(*dn,ztoq(cred),&tq); *dn = tq; } } g = nd_add(mod,g,ndv_mul_nm(mod,mul,p)); + sugar = MAX(sugar,SG(p)+TD(DL(mul))); - if ( !mod && hmag && g && ((double)(p_mag((P)HCQ(g))) > hmag) ) { - tq = HCQ(g); + if ( !mod && hmag && g && ((double)(z_mag(HCZ(g))) > hmag) ) { + tq = ztoq(HCZ(g)); nd_removecont2(d,g); if ( dn ) { - divq(tq,HCQ(g),&qq); divq(dn->z,qq,&tq); dn->z = tq; + divq(tq,ztoq(HCZ(g)),&qq); divq(*dn,qq,&tq); *dn = tq; } - hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + hmag = ((double)z_mag((P)HCZ(g)))*nd_scale; } } else if ( !full ) { *rp = g; @@ -1108,7 +1171,7 @@ int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *rp int sugar,psugar,n,h_reducible; PGeoBucket bucket; int c,c1,c2; - Q cg,cred,gcd,zzz; + Z cg,cred,gcd,zzz; RHist h; double hmag,gmag; int count = 0; @@ -1120,13 +1183,13 @@ int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *rp } sugar = SG(g); n = NV(g); - if ( !mod ) hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + if ( !mod ) hmag = ((double)z_mag(HCZ(g)))*nd_scale; bucket = create_pbucket(); add_pbucket(mod,bucket,g); d = 0; mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(UINT)); while ( 1 ) { - hindex = mod?head_pbucket(mod,bucket):head_pbucket_q(bucket); + hindex = mod?head_pbucket(mod,bucket):head_pbucket_z(bucket); if ( hindex < 0 ) { if ( DP_Print > 3 ) printf("(%d %d)",count,hcount); if ( d ) SG(d) = sugar; @@ -1153,12 +1216,12 @@ int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *rp 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); + gcd = gcdz_cofactor(HCZ(g),HCZ(p),&cg,&cred); + CZ(mul) = chsgnz(cg); + nd_mul_c_z(d,cred); + mulz_pbucket(bucket,cred); g = bucket->body[hindex]; - gmag = (double)p_mag((P)HCQ(g)); + gmag = (double)z_mag(HCZ(g)); } red = ndv_mul_nm(mod,mul,p); bucket->body[hindex] = nd_remove_head(g); @@ -1174,7 +1237,7 @@ int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *rp return 1; } nd_removecont2(d,g); - hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + hmag = ((double)z_mag(HCZ(g)))*nd_scale; add_pbucket(mod,bucket,g); } } else if ( !full ) { @@ -1208,7 +1271,6 @@ int ndv_check_candidate(NODE input,int obpe,int oadv,E ND nf,d; NDV r; NODE t,s; - union oNDC dn; ndv_setup(0,0,cand); n = length(cand); @@ -1223,7 +1285,7 @@ again: d = ndvtond(0,r); stat = nd_nf(0,d,nd_ps,0,0,&nf); if ( !stat ) { - nd_reconstruct(0,0,0); + nd_reconstruct(0,0); goto again; } else if ( nf ) return 0; if ( DP_Print ) { printf("."); fflush(stdout); } @@ -1323,12 +1385,12 @@ void add_pbucket(int mod,PGeoBucket g,ND d) g->m = MAX(g->m,k); } -void mulq_pbucket(PGeoBucket g,Q c) +void mulz_pbucket(PGeoBucket g,Z c) { int k; for ( k = 0; k <= g->m; k++ ) - nd_mul_c_q(g->body[k],c); + nd_mul_c_z(g->body[k],c); } NM remove_head_pbucket_symbolic(PGeoBucket g) @@ -1409,10 +1471,10 @@ int head_pbucket(int mod,PGeoBucket g) } } -int head_pbucket_q(PGeoBucket g) +int head_pbucket_z(PGeoBucket g) { int j,i,c,k,nv; - Q sum,t; + Z sum,t; ND gi,gj; k = g->m; @@ -1423,26 +1485,25 @@ int head_pbucket_q(PGeoBucket g) if ( j < 0 ) { j = i; gj = g->body[j]; - sum = HCQ(gj); + sum = HCZ(gj); } else { nv = NV(gi); c = DL_COMPARE(HDL(gi),HDL(gj)); if ( c > 0 ) { - if ( sum ) HCQ(gj) = sum; + if ( sum ) HCZ(gj) = sum; else g->body[j] = nd_remove_head(gj); j = i; gj = g->body[j]; - sum = HCQ(gj); + sum = HCZ(gj); } else if ( c == 0 ) { - addq(sum,HCQ(gi),&t); - sum = t; + sum = addz(sum,HCZ(gi)); g->body[i] = nd_remove_head(gi); } } } if ( j < 0 ) return -1; else if ( sum ) { - HCQ(gj) = sum; + HCZ(gj) = sum; return j; } else g->body[j] = nd_remove_head(gj); @@ -1469,8 +1530,8 @@ void do_diagonalize(int sugar,int m) NODE r,g,t; ND h,nf,s,head; NDV nfv; - Q q,num,den; - union oNDC dn; + Z q,num,den; + Q dn; for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) { if ( nd_demand ) @@ -1481,12 +1542,10 @@ void do_diagonalize(int sugar,int m) s = nd_separate_head(s,&head); nd_nf(m,s,nd_ps,1,&dn,&nf); if ( !m ) { - NTOQ(NM(dn.z),SGN(dn.z),num); - mulq(HCQ(head),num,&q); HCQ(head) = q; - if ( DN(dn.z) ) { - NTOQ(DN(dn.z),1,den); - nd_mul_c_q(nf,den); - } + HCZ(head) = mulz(HCZ(head),simpz((Z)NM(dn))); + if ( SGN(dn) < 0 ) HCZ(head) = chsgnz(HCZ(head)); + if ( DN(dn) ) + nd_mul_c_z(nf,simpz((Z)DN(dn))); } nf = nd_add(m,head,nf); ndv_free(nfv); @@ -1512,8 +1571,6 @@ NODE nd_gb(int m,int ishomo,int checkonly) ND_pairs l; ND h,nf,s,head; NDV nfv; - Q q,num,den; - union oNDC dn; g = 0; d = 0; for ( i = 0; i < nd_psn; i++ ) { @@ -1533,7 +1590,7 @@ again: stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); goto again; } #if USE_GEOBUCKET @@ -1543,7 +1600,7 @@ again: #endif if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); goto again; } else if ( nf ) { if ( checkonly ) return 0; @@ -1574,8 +1631,7 @@ void do_diagonalize_trace(int sugar,int m) NODE r,g,t; ND h,nf,nfq,s,head; NDV nfv,nfqv; - Q q,den,num; - union oNDC dn; + Q dn; for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) { /* for nd_ps */ @@ -1595,12 +1651,10 @@ void do_diagonalize_trace(int sugar,int m) s = ndvtond(0,nfv); s = nd_separate_head(s,&head); nd_nf(0,s,nd_ps_trace,1,&dn,&nf); - NTOQ(NM(dn.z),SGN(dn.z),num); - mulq(HCQ(head),num,&q); HCQ(head) = q; - if ( DN(dn.z) ) { - NTOQ(DN(dn.z),1,den); - nd_mul_c_q(nf,den); - } + HCZ(head) = mulz(HCZ(head),(Z)NM(dn)); + if ( SGN(dn) < 0 ) HCZ(head) = chsgnz(HCZ(head)); + if ( DN(dn) ) + nd_mul_c_z(nf,(Z)DN(dn)); nf = nd_add(0,head,nf); ndv_free(nfv); nd_removecont(0,nf); @@ -1623,8 +1677,6 @@ NODE nd_gb_trace(int m,int ishomo) ND_pairs l; ND h,nf,nfq,s,head; NDV nfv,nfqv; - Q q,den,num; - union oNDC dn; g = 0; d = 0; for ( i = 0; i < nd_psn; i++ ) { @@ -1643,7 +1695,7 @@ again: stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,1,d); + d = nd_reconstruct(1,d); goto again; } #if USE_GEOBUCKET @@ -1653,7 +1705,7 @@ again: #endif if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,1,d); + d = nd_reconstruct(1,d); goto again; } else if ( nf ) { if ( nd_demand ) { @@ -1664,13 +1716,13 @@ again: if ( !nfq ) { if ( !nd_sp(0,1,l,&h) || !nd_nf(0,h,nd_ps_trace,!Top,0,&nfq) ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,1,d); + d = nd_reconstruct(1,d); goto again; } } if ( nfq ) { /* m|HC(nfq) => failure */ - if ( !rem(NM(HCQ(nfq)),m) ) return 0; + if ( !remzi(HCZ(nfq),m) ) return 0; if ( DP_Print ) { printf("+"); fflush(stdout); } nd_removecont(m,nf); nfv = ndtondv(m,nf); nd_free(nf); @@ -1710,9 +1762,8 @@ NODE ndv_reduceall(int m,NODE f) int i,n,stat; ND nf,g,head; NODE t,a0,a; - union oNDC dn; + Q dn; NDV *w; - Q q,num,den; n = length(f); #if 0 @@ -1728,16 +1779,14 @@ NODE ndv_reduceall(int m,NODE f) g = nd_separate_head(g,&head); stat = nd_nf(m,g,nd_ps,1,&dn,&nf); if ( !stat ) - nd_reconstruct(m,0,0); + nd_reconstruct(0,0); else { if ( DP_Print ) { printf("."); fflush(stdout); } if ( !m ) { - NTOQ(NM(dn.z),SGN(dn.z),num); - mulq(HCQ(head),num,&q); HCQ(head) = q; - if ( DN(dn.z) ) { - NTOQ(DN(dn.z),1,den); - nd_mul_c_q(nf,den); - } + HCZ(head) = mulz(HCZ(head),simpz((Z)NM(dn))); + if ( SGN(dn) < 0 ) HCZ(head) = chsgnz(HCZ(head)); + if ( DN(dn) ) + nd_mul_c_z(nf,simpz((Z)DN(dn))); } nf = nd_add(m,head,nf); ndv_free(nd_ps[i]); @@ -2124,7 +2173,9 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe if ( !m && Demand ) nd_demand = 1; else nd_demand = 0; +#if 0 ndv_alloc = 0; +#endif get_vars((Obj)f,&fv); pltovl(v,&vv); for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); switch ( ord->id ) { @@ -2162,7 +2213,9 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe } if ( r0 ) NEXT(r) = 0; MKLIST(*rp,r0); +#if 0 fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); +#endif } void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp) @@ -2364,7 +2417,7 @@ void nd_print(ND p) } } -void nd_print_q(ND p) +void nd_print_z(ND p) { NM m; @@ -2373,7 +2426,7 @@ void nd_print_q(ND p) else { for ( m = BDY(p); m; m = NEXT(m) ) { printf("+"); - printexpr(CO,(Obj)CQ(m)); + printz(CZ(m)); printf("*"); ndl_print(DL(m)); } @@ -2392,33 +2445,30 @@ void ndp_print(ND_pairs d) void nd_removecont(int mod,ND p) { int i,n; - Q *w; - Q dvr,t; + Z *w; + Z dvr,t; NM m; struct oVECT v; - N q,r; if ( mod == -1 ) nd_mul_c(mod,p,_invsf(HCM(p))); else if ( mod ) nd_mul_c(mod,p,invm(HCM(p),mod)); else { for ( m = BDY(p), n = 0; m; m = NEXT(m), n++ ); - w = (Q *)ALLOCA(n*sizeof(Q)); + w = (Z *)ALLOCA(n*sizeof(Z)); v.len = n; v.body = (pointer *)w; - for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ ) w[i] = CQ(m); + for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ ) w[i] = CZ(m); removecont_array(w,n); - for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ ) CQ(m) = w[i]; + for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ ) CZ(m) = w[i]; } } void nd_removecont2(ND p1,ND p2) { int i,n1,n2,n; - Q *w; - Q dvr,t; + Z *w; NM m; struct oVECT v; - N q,r; if ( !p1 ) { nd_removecont(0,p2); return; @@ -2428,21 +2478,21 @@ void nd_removecont2(ND p1,ND p2) n1 = nd_length(p1); n2 = nd_length(p2); n = n1+n2; - w = (Q *)ALLOCA(n*sizeof(Q)); + w = (Z *)ALLOCA(n*sizeof(Z)); v.len = n; v.body = (pointer *)w; - for ( m = BDY(p1), i = 0; i < n1; m = NEXT(m), i++ ) w[i] = CQ(m); - for ( m = BDY(p2); i < n; m = NEXT(m), i++ ) w[i] = CQ(m); + for ( m = BDY(p1), i = 0; i < n1; m = NEXT(m), i++ ) w[i] = CZ(m); + for ( m = BDY(p2); i < n; m = NEXT(m), i++ ) w[i] = CZ(m); removecont_array(w,n); - for ( m = BDY(p1), i = 0; i < n1; m = NEXT(m), i++ ) CQ(m) = w[i]; - for ( m = BDY(p2); i < n; m = NEXT(m), i++ ) CQ(m) = w[i]; + for ( m = BDY(p1), i = 0; i < n1; m = NEXT(m), i++ ) CZ(m) = w[i]; + for ( m = BDY(p2); i < n; m = NEXT(m), i++ ) CZ(m) = w[i]; } void ndv_removecont(int mod,NDV p) { int i,len; - Q *w; - Q dvr,t; + Z *w; + Z dvr,t; NMV m; if ( mod == -1 ) @@ -2451,13 +2501,10 @@ void ndv_removecont(int mod,NDV p) ndv_mul_c(mod,p,invm(HCM(p),mod)); else { len = p->len; - w = (Q *)ALLOCA(len*sizeof(Q)); - for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) w[i] = CQ(m); - sortbynm(w,len); - qltozl(w,len,&dvr); - for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) { - divq(CQ(m),dvr,&t); CQ(m) = t; - } + w = (Z *)ALLOCA(len*sizeof(Z)); + for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) w[i] = CZ(m); + removecont_array(w,len); + for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) CZ(m) = w[i]; } } @@ -2475,7 +2522,7 @@ void ndv_homogenize(NDV p,int obpe,int oadv,EPOS oepos t = (NMV)ALLOCA(nmv_adv); for ( i = 0; i < len; i++, NMV_OPREV(m), NMV_PREV(mr) ) { ndl_homogenize(DL(m),DL(t),obpe,oepos,max); - CQ(mr) = CQ(m); + CZ(mr) = CZ(m); ndl_copy(DL(t),DL(mr)); } NV(p)++; @@ -2485,8 +2532,8 @@ void ndv_homogenize(NDV p,int obpe,int oadv,EPOS oepos void ndv_dehomogenize(NDV p,struct order_spec *ord) { int i,j,adj,len,newnvar,newwpd,newadv,newexporigin; - Q *w; - Q dvr,t; + Z *w; + Z dvr,t; NMV m,r; len = p->len; @@ -2498,7 +2545,7 @@ void ndv_dehomogenize(NDV p,struct order_spec *ord) if ( newwpd != nd_wpd ) { newadv = ROUND_FOR_ALIGN(sizeof(struct oNMV)+(newwpd-1)*sizeof(UINT)); for ( m = r = BDY(p), i = 0; i < len; NMV_ADV(m), NDV_NADV(r), i++ ) { - CQ(r) = CQ(m); + CZ(r) = CZ(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]; @@ -2507,36 +2554,87 @@ void ndv_dehomogenize(NDV p,struct order_spec *ord) NV(p)--; } -void removecont_array(Q *c,int n) +int comp_z(Z *a,Z *b) { + return cmpz(*a,*b); +} + +Z zgcdv(VECT a) +{ + int i,j,n,nz; + Z g,gt,q,r; + Z *c; + + n = a->len; + c = (Z *)ALLOCA(n*sizeof(Z)); + for ( i = 0; i < n; i++ ) + c[i] = (Z)a->body[i]; + qsort(c,n,sizeof(Z),(int (*) (const void *,const void *))comp_z); + for ( ; n && ! *c; n--, c++ ); + + if ( !n ) + return 0; + else if ( n == 1 ) + return absz(c[0]); + + g = gcdz(c[0],c[1]); + for ( i = 2; i < n; i++ ) { + q = divz(c[i],g,&r); + gt = gcdz(g,r); + if ( !cmpz(g,gt) ) { + for ( j = i+1; j < n; j++ ) { + q = divz(c[j],g,&r); c[j] = r; + } + } else + g = gt; + } + return absz(g); +} + +Z zgcdv_estimate(VECT a) +{ + int n,i,m; + Z s,t,u,g; + Z *q; + + n = a->len; q = (Z *)a->body; + if ( n == 1 ) + return absz(q[0]); + + m = n/2; + for ( i = 0 , s = 0; i < m; i++ ) + s = sgnz(q[i])>=0 ? addz(s,q[i]) : subz(s,q[i]); + for ( t = 0; i < n; i++ ) + t = sgnz(q[i])>=0 ? addz(t,q[i]) : subz(t,q[i]); + g = gcdz(s,t); + return absz(g); +} + +void removecont_array(Z *c,int n) +{ struct oVECT v; - Q d0,d1,a,u,u1,gcd; - int i; - N qn,rn,gn; - Q *q,*r; + Z d0,d1,a,u,u1,gcd; + int i,j; + Z q0,q1; + Z *q,*r; - q = (Q *)ALLOCA(n*sizeof(Q)); - r = (Q *)ALLOCA(n*sizeof(Q)); + q = (Z *)ALLOCA(n*sizeof(Z)); + r = (Z *)ALLOCA(n*sizeof(Z)); v.id = O_VECT; v.len = n; v.body = (pointer *)c; - igcdv_estimate(&v,&d0); - for ( i = 0; i < n; i++ ) { - divn(NM(c[i]),NM(d0),&qn,&rn); - NTOQ(qn,SGN(c[i])*SGN(d0),q[i]); - NTOQ(rn,SGN(c[i]),r[i]); - } + d0 = zgcdv_estimate(&v); + /* c[i] = d0*q[i]+r[i] */ + for ( i = 0; i < n; i++ ) + q[i] = divz(c[i],d0,&r[i]); for ( i = 0; i < n; i++ ) if ( r[i] ) break; if ( i < n ) { v.id = O_VECT; v.len = n; v.body = (pointer *)r; - igcdv(&v,&d1); - gcdn(NM(d0),NM(d1),&gn); NTOQ(gn,1,gcd); - divsn(NM(d0),gn,&qn); NTOQ(qn,1,a); + /* d1 = GCD(r[0],...,r[n-1]) */ + d1 = zgcdv(&v); + /* q0 = d0/GCD(d0,d1) */ + gcd = gcdz_cofactor(d0,d1,&q0,&q1); for ( i = 0; i < n; i++ ) { - mulq(a,q[i],&u); - if ( r[i] ) { - divsn(NM(r[i]),gn,&qn); NTOQ(qn,SGN(r[i]),u1); - addq(u,u1,&q[i]); - } else - q[i] = u; + /* q[i] = d0/gcd*q[i]+r[i]/gcd */ + q[i] = addz(mulz(q0,q[i]),divsz(r[i],gcd)); } } for ( i = 0; i < n; i++ ) c[i] = q[i]; @@ -2557,14 +2655,14 @@ void nd_mul_c(int mod,ND p,int mul) } } -void nd_mul_c_q(ND p,Q mul) +void nd_mul_c_z(ND p,Z mul) { NM m; - Q c; + Z c; - if ( !p ) return; + if ( !p || uniz(mul) ) return; for ( m = BDY(p); m; m = NEXT(m) ) { - mulq(CQ(m),mul,&c); CQ(m) = c; + CZ(m) = mulz(CZ(m),mul); } } @@ -2640,6 +2738,35 @@ UINT *ndv_compute_bound(NDV p) return t; } +UINT *nd_compute_bound(ND p) +{ + UINT *d1,*d2,*t; + UINT u; + int i,j,k,l,len,ind; + NM m; + + if ( !p ) + return 0; + d1 = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + d2 = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + len = LEN(p); + m = BDY(p); ndl_copy(DL(m),d1); m = NEXT(m); + for ( m = NEXT(m); m; m = NEXT(m) ) { + ndl_lcm(DL(m),d1,d2); + t = d1; d1 = d2; d2 = t; + } + l = nd_nvar+31; + t = (UINT *)MALLOC_ATOMIC(l*sizeof(UINT)); + for ( i = nd_exporigin, ind = 0; i < nd_wpd; i++ ) { + u = d1[i]; + k = (nd_epw-1)*nd_bpe; + for ( j = 0; j < nd_epw; j++, k -= nd_bpe, ind++ ) + t[ind] = (u>>k)&nd_mask0; + } + for ( ; ind < l; ind++ ) t[ind] = 0; + return t; +} + int nd_get_exporigin(struct order_spec *ord) { switch ( ord->id ) { @@ -2698,7 +2825,7 @@ void nd_setup_parameters(int nvar,int max) { nd_work_vector = (int *)REALLOC(nd_work_vector,nd_nvar*sizeof(int)); } -ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) +ND_pairs nd_reconstruct(int trace,ND_pairs d) { int i,obpe,oadv,h; static NM prev_nm_free_list; @@ -2842,14 +2969,14 @@ int nd_sp(int mod,int trace,ND_pairs p,ND *rp) } lcm = LCM(p); NEWNM(m); - CQ(m) = HCQ(p2); + CZ(m) = HCZ(p2); ndl_sub(lcm,HDL(p1),DL(m)); if ( ndl_check_bound2(p->i1,DL(m)) ) return 0; t1 = ndv_mul_nm(mod,m,p1); if ( mod == -1 ) CM(m) = _chsgnsf(HCM(p1)); else if ( mod ) CM(m) = mod-HCM(p1); - else chsgnq(HCQ(p1),&CQ(m)); + else CZ(m) = chsgnz(HCZ(p1)); ndl_sub(lcm,HDL(p2),DL(m)); if ( ndl_check_bound2(p->i2,DL(m)) ) { nd_free(t1); @@ -2877,16 +3004,16 @@ void ndv_mul_c(int mod,NDV p,int mul) } } -void ndv_mul_c_q(NDV p,Q mul) +void ndv_mul_c_z(NDV p,Z mul) { NMV m; - Q c; + Z c; int len,i; if ( !p ) return; len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { - mulq(CQ(m),mul,&c); CQ(m) = c; + CZ(m) = mulz(CZ(m),mul); } } @@ -2933,8 +3060,8 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta { int i,n2,j,s,curlen,homo,h,a,b,k,l,u,min; UINT *d0,*d1,*d,*dt,*ctab; - Q *ctab_q; - Q q,q1; + Z *ctab_z; + Z q,q1; UINT c0,c1,c; NM *p; NM m,t; @@ -2946,7 +3073,7 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta if ( mod ) { c0 = CM(m0); c1 = CM(m1); DMAR(c0,c1,0,mod,c); CM(m) = c; } else - mulq(CQ(m0),CQ(m1),&CQ(m)); + CZ(m) = mulz(CZ(m0),CZ(m1)); for ( i = 0; i < nd_wpd; i++ ) d[i] = 0; homo = n&1 ? 1 : 0; if ( homo ) { @@ -2979,8 +3106,8 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta ctab = (UINT *)ALLOCA((min+1)*sizeof(UINT)); mkwcm(k,l,mod,ctab); } else { - ctab_q = (Q *)ALLOCA((min+1)*sizeof(Q)); - mkwc(k,l,ctab_q); + ctab_z = (Z *)ALLOCA((min+1)*sizeof(Z)); + mkwcz(k,l,ctab_z); } for ( j = min; j >= 0; j-- ) { for ( u = 0; u < nd_wpd; u++ ) d[u] = 0; @@ -2992,7 +3119,7 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta } else TD(d) = h; if ( nd_blockmask ) ndl_weight_mask(d); if ( mod ) c = ctab[j]; - else q = ctab_q[j]; + else q = ctab_z[j]; p = tab+curlen*j; if ( j == 0 ) { for ( u = 0; u < curlen; u++, p++ ) { @@ -3001,7 +3128,7 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta if ( mod ) { c0 = CM(tab[u]); DMAR(c0,c,0,mod,c1); CM(tab[u]) = c1; } else { - mulq(CQ(tab[u]),q,&q1); CQ(tab[u]) = q1; + CZ(tab[u]) = mulz(CZ(tab[u]),q); } } } @@ -3013,7 +3140,7 @@ void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *ta if ( mod ) { c0 = CM(tab[u]); DMAR(c0,c,0,mod,c1); CM(t) = c1; } else - mulq(CQ(tab[u]),q,&CQ(t)); + CZ(t) = mulz(CZ(tab[u]),q); *p = t; } } @@ -3030,7 +3157,6 @@ ND ndv_mul_nm_symbolic(NM m0,NDV p) NMV m; UINT *d,*dt,*dm; int c,n,td,i,c1,c2,len; - Q q; ND r; if ( !p ) return 0; @@ -3059,7 +3185,7 @@ ND ndv_mul_nm(int mod,NM m0,NDV p) NMV m; UINT *d,*dt,*dm; int c,n,td,i,c1,c2,len; - Q q; + Z q; ND r; if ( !p ) return 0; @@ -3091,10 +3217,10 @@ ND ndv_mul_nm(int mod,NM m0,NDV p) ndl_add(DL(m),d,DL(mr)); } } else { - q = CQ(m0); + q = CZ(m0); for ( i = 0; i < len; i++, NMV_ADV(m) ) { NEXTNM(mr0,mr); - mulq(CQ(m),q,&CQ(mr)); + CZ(mr) = mulz(CZ(m),q); ndl_add(DL(m),d,DL(mr)); } } @@ -3105,6 +3231,52 @@ ND ndv_mul_nm(int mod,NM m0,NDV p) } } +ND nd_quo(int mod,PGeoBucket bucket,NDV d) +{ + NM mq0,mq; + NMV tm; + int i,nv,sg,c,c1,c2,hindex; + ND p,t,r; + N tnm; + + if ( !p ) return 0; + else { + nv = NV(d); + mq0 = 0; + tm = (NMV)ALLOCA(nmv_adv); + while ( 1 ) { + hindex = mod?head_pbucket(mod,bucket):head_pbucket_z(bucket); + if ( hindex < 0 ) break; + p = bucket->body[hindex]; + NEXTNM(mq0,mq); + ndl_sub(HDL(p),HDL(d),DL(mq)); + ndl_copy(DL(mq),DL(tm)); + if ( mod ) { + c1 = invm(HCM(d),mod); c2 = HCM(p); + DMAR(c1,c2,0,mod,c); CM(mq) = c; + CM(tm) = mod-c; + } else { + CZ(mq) = divsz(HCZ(p),HCZ(d)); + CZ(tm) = chsgnz(CZ(mq)); + } + t = ndv_mul_nmv_trunc(mod,tm,d,HDL(d)); + bucket->body[hindex] = nd_remove_head(p); + t = nd_remove_head(t); + add_pbucket(mod,bucket,t); + } + if ( !mq0 ) + r = 0; + else { + NEXT(mq) = 0; + for ( i = 0, mq = mq0; mq; mq = NEXT(mq), i++ ); + MKND(nv,mq0,i,r); + /* XXX */ + SG(r) = HTD(r); + } + return r; + } +} + void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos) { NMV m,mr,mr0,t; @@ -3117,10 +3289,10 @@ void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos) mr = (NMV)((char *)mr0+(len-1)*nmv_adv); t = (NMV)ALLOCA(nmv_adv); for ( i = 0; i < len; i++, NMV_OPREV(m), NMV_PREV(mr) ) { - CQ(t) = CQ(m); + CZ(t) = CZ(m); for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0; ndl_reconstruct(DL(m),DL(t),obpe,oepos); - CQ(mr) = CQ(t); + CZ(mr) = CZ(t); ndl_copy(DL(t),DL(mr)); } BDY(p) = mr0; @@ -3138,7 +3310,7 @@ NDV ndv_dup_realloc(NDV p,int obpe,int oadv,EPOS oepos for ( i = 0; i < len; i++, NMV_OADV(m), NMV_ADV(mr) ) { ndl_zero(DL(mr)); ndl_reconstruct(DL(m),DL(mr),obpe,oepos); - CQ(mr) = CQ(m); + CZ(mr) = CZ(m); } MKNDV(NV(p),mr0,len,r); SG(r) = SG(p); @@ -3158,7 +3330,7 @@ NDV ndv_dup(int mod,NDV p) m0 = m = (NMV)(mod?MALLOC_ATOMIC(len*nmv_adv):MALLOC(len*nmv_adv)); for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t), NMV_ADV(m) ) { ndl_copy(DL(t),DL(m)); - CQ(m) = CQ(t); + CZ(m) = CZ(t); } MKNDV(NV(p),m0,len,d); SG(d) = SG(p); @@ -3174,7 +3346,7 @@ ND nd_dup(ND p) for ( m0 = 0, t = BDY(p); t; t = NEXT(t) ) { NEXTNM(m0,m); ndl_copy(DL(t),DL(m)); - CQ(m) = CQ(t); + CZ(m) = CZ(t); } if ( m0 ) NEXT(m) = 0; MKND(NV(p),m0,LEN(p),d); @@ -3205,10 +3377,8 @@ void ndv_mod(int mod,NDV p) } else for ( t = d = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) { - r = rem(NM(CQ(t)),mod); + r = remzi(CZ(t),mod); if ( r ) { - if ( SGN(CQ(t)) < 0 ) - r = mod-r; CM(d) = r; ndl_copy(DL(t),DL(d)); NMV_ADV(d); @@ -3244,7 +3414,7 @@ ND ptond(VL vl,VL dvl,P p) else if ( NUM(p) ) { NEWNM(m); ndl_zero(DL(m)); - CQ(m) = (Q)p; + CZ(m) = qtoz((Q)p); NEXT(m) = 0; MKND(nd_nvar,m,1,r); SG(r) = 0; @@ -3254,7 +3424,7 @@ ND ptond(VL vl,VL dvl,P p) w = (DCP *)ALLOCA(k*sizeof(DCP)); for ( dc = DC(p), j = 0; j < k; dc = NEXT(dc), j++ ) w[j] = dc; for ( i = 0, tvl = dvl, v = VR(p); - vl && tvl->v != v; tvl = NEXT(tvl), i++ ); + tvl && tvl->v != v; tvl = NEXT(tvl), i++ ); if ( !tvl ) { for ( j = k-1, s = 0, MKV(v,x); j >= 0; j-- ) { t = ptond(vl,dvl,COEF(w[j])); @@ -3302,7 +3472,7 @@ P ndvtop(int mod,VL vl,VL dvl,NDV p) } else if ( mod ) { STOQ(CM(m),q); c = (P)q; } else - c = CP(m); + c = (P)ztoq(CZ(m)); d = DL(m); for ( i = 0, t = c, tvl = dvl; i < n; tvl = NEXT(tvl), i++ ) { MKV(tvl->v,r); e = GET_EXP(d,i); STOQ(e,q); @@ -3327,10 +3497,12 @@ NDV ndtondv(int mod,ND p) m0 = m = (NMV)GC_malloc_atomic_ignore_off_page(len*nmv_adv); else m0 = m = MALLOC(len*nmv_adv); +#if 0 ndv_alloc += nmv_adv*len; +#endif for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, NMV_ADV(m) ) { ndl_copy(DL(t),DL(m)); - CQ(m) = CQ(t); + CZ(m) = CZ(t); } MKNDV(NV(p),m0,len,d); SG(d) = SG(p); @@ -3350,7 +3522,7 @@ ND ndvtond(int mod,NDV p) for ( t = BDY(p), i = 0; i < len; NMV_ADV(t), i++ ) { NEXTNM(m0,m); ndl_copy(DL(t),DL(m)); - CQ(m) = CQ(t); + CZ(m) = CZ(t); } NEXT(m) = 0; MKND(NV(p),m0,len,d); @@ -3375,7 +3547,7 @@ void ndv_print(NDV p) } } -void ndv_print_q(NDV p) +void ndv_print_z(NDV p) { NMV m; int i,len; @@ -3385,7 +3557,7 @@ void ndv_print_q(NDV p) len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { printf("+"); - printexpr(CO,(Obj)CQ(m)); + printz(CZ(m)); printf("*"); ndl_print(DL(m)); } @@ -3463,7 +3635,12 @@ void nd_init_ord(struct order_spec *ord) ndl_compare_function = ndl_matrix_compare; break; case 3: - error("nd_init_ord : composite order is not supported yet."); + /* composite order */ + nd_dcomp = -1; + nd_isrlex = 0; + nd_worb_len = ord->ord.composite.length; + nd_worb = ord->ord.composite.w_or_b; + ndl_compare_function = ndl_composite_compare; break; } nd_ord = ord; @@ -3555,7 +3732,6 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec NDV ndv; VL vv,tv; int stat,nvar,max,e; - union oNDC dn; pltovl(v,&vv); for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); @@ -3593,7 +3769,7 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec stat = nd_nf(m,nd,nd_ps,1,0,&nf); if ( !stat ) { nd_psn++; - nd_reconstruct(m,0,0); + nd_reconstruct(0,0); nd_psn--; } else break; @@ -3617,47 +3793,22 @@ int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r) return i; } -int ndv_to_vect(int mod,UINT *s0,int n,NDV d,UINT *r) +int nd_to_vect_z(UINT *s0,int n,ND d,Z *r) { - NMV m; + NM m; UINT *t,*s; - int i,j,len; + int i; for ( i = 0; i < n; i++ ) r[i] = 0; - m = BDY(d); - len = LEN(d); - for ( i = j = 0, s = s0; j < len; j++, NMV_ADV(m)) { + for ( i = 0, s = s0, m = BDY(d); m; m = NEXT(m) ) { t = DL(m); for ( ; !ndl_equal(t,s); s += nd_wpd, i++ ); - r[i] = CM(m); + r[i] = CZ(m); } for ( i = 0; !r[i]; i++ ); return i; } -int nm_ind_pair_to_vect(int mod,UINT *s0,int n,NM_ind_pair pair,UINT *r) -{ - NM m; - NMV mr; - UINT *d,*t,*s; - NDV p; - int i,j,len; - - m = pair->mul; - d = DL(m); - p = nd_ps[pair->index]; - t = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); - for ( i = 0; i < n; i++ ) r[i] = 0; - len = LEN(p); - for ( i = j = 0, s = s0, mr = BDY(p); j < len; j++, NMV_ADV(mr) ) { - ndl_add(d,DL(mr),t); - for ( ; !ndl_equal(t,s); s += nd_wpd, i++ ); - r[i] = CM(mr); - } - for ( i = 0; !r[i]; i++ ); - return i; -} - IndArray nm_ind_pair_to_vect_compress(int mod,UINT *s0,int n,NM_ind_pair pair) { NM m; @@ -3707,6 +3858,61 @@ IndArray nm_ind_pair_to_vect_compress(int mod,UINT *s0 } +int ndv_reduce_vect_z(Z *svect,int col,IndArray *imat,NM_ind_pair *rp0,int nred) +{ + int i,j,k,len,pos,prev; + Z cs,mcs,c1,c2,cr,gcd,t; + IndArray ivect; + unsigned char *ivc; + unsigned short *ivs; + unsigned int *ivi; + NDV redv; + NMV mr; + NODE rp; + int maxrs; + + maxrs = 0; + for ( i = 0; i < nred; i++ ) { + ivect = imat[i]; + k = ivect->head; + if ( svect[k] ) { + maxrs = MAX(maxrs,rp0[i]->sugar); + redv = nd_ps[rp0[i]->index]; + len = LEN(redv); mr = BDY(redv); + gcd = gcdz_cofactor(svect[k],CZ(mr),&cs,&cr); + mcs = chsgnz(cs); + if ( !uniz(cr) ) + for ( j = 0; j < col; j++ ) + svect[j] = mulz(svect[j],cr); + svect[k] = 0; prev = k; + switch ( ivect->width ) { + case 1: + ivc = ivect->index.c; + for ( j = 1, NMV_ADV(mr); j < len; j++, NMV_ADV(mr) ) { + pos = prev+ivc[j]; prev = pos; + svect[pos] = addz(svect[pos],mulz(CZ(mr),mcs)); + } + break; + case 2: + ivs = ivect->index.s; + for ( j = 1, NMV_ADV(mr); j < len; j++, NMV_ADV(mr) ) { + pos = prev+ivs[j]; prev = pos; + svect[pos] = addz(svect[pos],mulz(CZ(mr),mcs)); + } + break; + case 4: + ivi = ivect->index.i; + for ( j = 1, NMV_ADV(mr); j < len; j++, NMV_ADV(mr) ) { + pos = prev+ivi[j]; prev = pos; + svect[pos] = addz(svect[pos],mulz(CZ(mr),mcs)); + } + break; + } + } + } + return maxrs; +} + int ndv_reduce_vect(int m,UINT *svect,int col,IndArray *imat,NM_ind_pair *rp0,int nred) { int i,j,k,len,pos,prev; @@ -3830,7 +4036,9 @@ NDV vect_to_ndv(UINT *vect,int spcol,int col,int *rhea if ( !len ) return 0; else { mr0 = (NMV)GC_malloc_atomic_ignore_off_page(nmv_adv*len); +#if 0 ndv_alloc += nmv_adv*len; +#endif mr = mr0; p = s0vect; for ( j = k = 0; j < col; j++, p += nd_wpd ) @@ -3844,6 +4052,34 @@ NDV vect_to_ndv(UINT *vect,int spcol,int col,int *rhea } } +NDV vect_to_ndv_z(Z *vect,int spcol,int col,int *rhead,UINT *s0vect) +{ + int j,k,len; + UINT *p; + Z c; + NDV r; + NMV mr0,mr; + + for ( j = 0, len = 0; j < spcol; j++ ) if ( vect[j] ) len++; + if ( !len ) return 0; + else { + mr0 = (NMV)GC_malloc(nmv_adv*len); +#if 0 + ndv_alloc += nmv_adv*len; +#endif + mr = mr0; + p = s0vect; + for ( j = k = 0; j < col; j++, p += nd_wpd ) + if ( !rhead[j] ) { + if ( c = vect[k++] ) { + ndl_copy(p,DL(mr)); CZ(mr) = c; NMV_ADV(mr); + } + } + MKNDV(nd_nvar,mr0,len,r); + return r; + } +} + int nd_sp_f4(int m,ND_pairs l,PGeoBucket bucket) { ND_pairs t; @@ -3923,9 +4159,9 @@ NODE nd_f4(int m) PGeoBucket bucket; struct oEGT eg0,eg1,eg_f4; - if ( !m ) - error("nd_f4 : not implemented"); +#if 0 ndv_alloc = 0; +#endif g = 0; d = 0; for ( i = 0; i < nd_psn; i++ ) { d = update_pairs(d,g,i); @@ -3940,7 +4176,7 @@ NODE nd_f4(int m) if ( !stat ) { for ( t = l; NEXT(t); t = NEXT(t) ); NEXT(t) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); continue; } if ( bucket->m < 0 ) continue; @@ -3948,7 +4184,7 @@ NODE nd_f4(int m) if ( !col ) { for ( t = l; NEXT(t); t = NEXT(t) ); NEXT(t) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); continue; } get_eg(&eg1); init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg1); @@ -3969,30 +4205,23 @@ NODE nd_f4(int m) } } for ( r = g; r; r = NEXT(r) ) BDY(r) = (pointer)nd_ps[(int)BDY(r)]; +#if 0 fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); +#endif return g; } NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0) { IndArray *imat; - int nsp,nred,spcol,sprow,a; + int nsp,nred,i; int *rhead; - int i,j,k,l,rank; - NODE rp,r0,r; + NODE r0,rp; ND_pairs sp; - ND spol; - int **spmat; - UINT *svect,*v; - int *colstat; - struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2; NM_ind_pair *rvect; - int maxrs; - int *spsugar; - get_eg(&eg0); for ( sp = sp0, nsp = 0; sp; sp = NEXT(sp), nsp++ ); - nred = length(rp0); spcol = col-nred; + nred = length(rp0); imat = (IndArray *)ALLOCA(nred*sizeof(IndArray)); rhead = (int *)ALLOCA(col*sizeof(int)); for ( i = 0; i < col; i++ ) rhead[i] = 0; @@ -4004,7 +4233,30 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col imat[i] = nm_ind_pair_to_vect_compress(m,s0vect,col,rvect[i]); rhead[imat[i]->head] = 1; } + if ( m ) + r0 = nd_f4_red_main(m,sp0,nsp,s0vect,col,rvect,rhead,imat,nred); + else + r0 = nd_f4_red_z_main(sp0,nsp,s0vect,col,rvect,rhead,imat,nred); + return r0; +} +NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col, + NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred) +{ + int spcol,sprow,a; + int i,j,k,l,rank; + NODE r0,r; + ND_pairs sp; + ND spol; + int **spmat; + UINT *svect,*v; + int *colstat; + struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2; + int maxrs; + int *spsugar; + + spcol = col-nred; + get_eg(&eg0); /* elimination (1st step) */ spmat = (int **)ALLOCA(nsp*sizeof(UINT *)); svect = (UINT *)ALLOCA(col*sizeof(UINT)); @@ -4048,6 +4300,7 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col SG((NDV)BDY(r)) = spsugar[i]; GC_free(spmat[i]); } + if ( r0 ) NEXT(r) = 0; for ( ; i < sprow; i++ ) GC_free(spmat[i]); get_eg(&eg2); init_eg(&eg_f4_2); add_eg(&eg_f4_2,&eg1,&eg2); init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg2); @@ -4060,6 +4313,74 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col return r0; } +NODE nd_f4_red_z_main(ND_pairs sp0,int nsp,UINT *s0vect,int col, + NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred) +{ + int spcol,sprow,a; + int i,j,k,l,rank; + NODE r0,r; + ND_pairs sp; + ND spol; + Z **spmat; + Z *svect,*v; + int *colstat; + struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2; + int maxrs; + int *spsugar; + + spcol = col-nred; + get_eg(&eg0); + /* elimination (1st step) */ + spmat = (Z **)ALLOCA(nsp*sizeof(Z *)); + svect = (Z *)ALLOCA(col*sizeof(Z)); + spsugar = (int *)ALLOCA(nsp*sizeof(Z)); + for ( a = sprow = 0, sp = sp0; a < nsp; a++, sp = NEXT(sp) ) { + nd_sp(0,0,sp,&spol); + if ( !spol ) continue; + nd_to_vect_z(s0vect,col,spol,svect); + maxrs = ndv_reduce_vect_z(svect,col,imat,rvect,nred); + for ( i = 0; i < col; i++ ) if ( svect[i] ) break; + if ( i < col ) { + spmat[sprow] = v = (Z *)MALLOC(spcol*sizeof(Z)); + for ( j = k = 0; j < col; j++ ) + if ( !rhead[j] ) v[k++] = svect[j]; + spsugar[sprow] = MAX(maxrs,SG(spol)); + sprow++; + } +/* nd_free(spol); */ + } + get_eg(&eg1); init_eg(&eg_f4_1); add_eg(&eg_f4_1,&eg0,&eg1); + if ( DP_Print ) { + fprintf(asir_out,"elim1=%fsec,",eg_f4_1.exectime+eg_f4_1.gctime); + fflush(asir_out); + } + /* free index arrays */ +/* for ( i = 0; i < nred; i++ ) GC_free(imat[i]->index.c); */ + + /* elimination (2nd step) */ + colstat = (int *)ALLOCA(spcol*sizeof(int)); + rank = nd_gauss_elim_z(spmat,spsugar,sprow,spcol,colstat); + r0 = 0; + for ( i = 0; i < rank; i++ ) { + NEXTNODE(r0,r); BDY(r) = + (pointer)vect_to_ndv_z(spmat[i],spcol,col,rhead,s0vect); + SG((NDV)BDY(r)) = spsugar[i]; +/* GC_free(spmat[i]); */ + } + if ( r0 ) NEXT(r) = 0; + +/* for ( ; i < sprow; i++ ) GC_free(spmat[i]); */ + get_eg(&eg2); init_eg(&eg_f4_2); add_eg(&eg_f4_2,&eg1,&eg2); + init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg2); + if ( DP_Print ) { + fprintf(asir_out,"elim2=%fsec\n",eg_f4_2.exectime+eg_f4_2.gctime); + fprintf(asir_out,"nsp=%d,nred=%d,spmat=(%d,%d),rank=%d ", + nsp,nred,sprow,spcol,rank); + fprintf(asir_out,"%fsec\n",eg_f4.exectime+eg_f4.gctime); + } + return r0; +} + FILE *nd_write,*nd_read; void nd_send_int(int a) { @@ -4123,7 +4444,9 @@ NDV nd_recv_ndv() if ( !len ) return 0; else { m0 = m = (NMV)GC_malloc_atomic_ignore_off_page(nmv_adv*len); +#if 0 ndv_alloc += len*nmv_adv; +#endif for ( i = 0; i < len; i++, NMV_ADV(m) ) { CM(m) = nd_recv_int(); nd_recv_intarray(DL(m),nd_wpd); @@ -4314,6 +4637,58 @@ void nd_exec_f4_red_dist() fflush(nd_write); } +/* XXX */ +int generic_gauss_elim_z(MAT m,MAT *nm,Z *dn,int **ri,int **ci) +{} + +int nd_gauss_elim_z(Z **mat0,int *sugar,int row,int col,int *colstat) +{ + int mod,i,j,t,c,rank,rank0,inv; + int *ci,*ri; + Z dn; + MAT m,nm; + int **wmat; + + /* XXX */ + mod = 99999989; + wmat = (int **)ALLOCA(row*sizeof(int *)); + for ( i = 0; i < row; i++ ) { + wmat[i] = (int *)ALLOCA(col*sizeof(int)); + for ( j = 0; j < col; j++ ) { + if ( mat0[i][j] ) + wmat[i][j] = remzi(mat0[i][j],mod); + else + wmat[i][j] = 0; + } + } + rank0 = nd_gauss_elim_mod(wmat,sugar,row,col,mod,colstat); + NEWMAT(m); m->row = row; m->col = col; m->body = (pointer **)mat0; + rank = generic_gauss_elim_z(m,&nm,&dn,&ri,&ci); + if ( rank != rank0 ) + error("afo"); + for ( i = 0; i < row; i++ ) + for ( j = 0; j < col; j++ ) + mat0[i][j] = 0; + c = col-rank; + for ( i = 0; i < rank; i++ ) { + mat0[i][ri[i]] = dn; + for ( j = 0; j < c; j++ ) + mat0[i][ci[j]] = (Z)BDY(nm)[i][j]; + } + inv = invm(remzi(dn,mod),mod); + for ( i = 0; i < row; i++ ) + for ( j = 0; j < col; j++ ) { + if ( mat0[i][j] ) + t = remzi(mat0[i][j],mod); + else + t = 0; + c = dmar(t,inv,0,mod); + if ( wmat[i][j] != c ) + error("afo"); + } + return rank; +} + int nd_gauss_elim_mod(int **mat0,int *sugar,int row,int col,int md,int *colstat) { int i,j,k,l,inv,a,rank,s; @@ -4469,7 +4844,7 @@ void ndv_save(NDV p,int index) write_int(s,&len); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { - saveobj(s,(Obj)CQ(m)); + saveobj(s,(Obj)ztoq(CZ(m))); dl = DL(m); td = TD(dl); write_int(s,&td); @@ -4505,7 +4880,7 @@ NDV ndv_load(int index) m0 = m = MALLOC(len*nmv_adv); for ( i = 0; i < len; i++, NMV_ADV(m) ) { - loadobj(s,&obj); CQ(m) = (Q)obj; + loadobj(s,&obj); CZ(m) = qtoz((Q)obj); dl = DL(m); ndl_zero(dl); read_int(s,&td); TD(dl) = td; @@ -4519,4 +4894,155 @@ NDV ndv_load(int index) MKNDV(nv,m0,len,d); SG(d) = sugar; return d; +} + +void nd_det(int mod,MAT f,P *rp) +{ + VL fv,tv; + int n,i,j,max,e,nvar,sgn,k0,l0,len0,len,k,l,a; + pointer **m; + Z mone; + NDV **dm; + NDV *t,*mi,*mj; + NDV d,s,mij,mjj; + ND u; + NMV nmv; + PGeoBucket bucket; + struct order_spec *ord; + + create_order_spec(0,0,&ord); + nd_init_ord(ord); + get_vars((Obj)f,&fv); + if ( f->row != f->col ) + error("nd_det : non-square matrix"); + n = f->row; + for ( nvar = 0, tv = fv; tv; tv = NEXT(tv), nvar++ ); + m = f->body; + for ( i = 0, max = 0; i < n; i++ ) + for ( j = 0; j < n; j++ ) + for ( tv = fv; tv; tv = NEXT(tv) ) { + e = getdeg(tv->v,(P)m[i][j]); + max = MAX(e,max); + } + nd_setup_parameters(nvar,1024); + dm = (NDV **)almat_pointer(n,n); + for ( i = 0, max = 0; i < n; i++ ) + for ( j = 0; j < n; j++ ) { + dm[i][j] = ptondv(CO,fv,m[i][j]); + if ( mod ) ndv_mod(mod,dm[i][j]); + if ( dm[i][j] && !LEN(dm[i][j]) ) dm[i][j] = 0; + } + d = ptondv(CO,fv,(P)ONE); + if ( mod ) ndv_mod(mod,d); + mone = chsgnz(qtoz(ONE)); + for ( j = 0, sgn = 1; j < n; j++ ) { + if ( DP_Print ) fprintf(stderr,"j=%d\n",j); + for ( i = j; i < n && !dm[i][j]; i++ ); + if ( i == n ) { + *rp = 0; + return; + } + k0 = i; l0 = j; len0 = LEN(dm[k0][l0]); + for ( k = j; k < n; k++ ) + for ( l = j; l < n; l++ ) + if ( dm[k][l] && LEN(dm[k][l]) < len0 ) { + k0 = k; l0 = l; len0 = LEN(dm[k][l]); + } + if ( k0 != j ) { + t = dm[j]; dm[j] = dm[k0]; dm[k0] = t; + sgn = -sgn; + } + if ( l0 != j ) { + for ( k = j; k < n; k++ ) { + s = dm[k][j]; dm[k][j] = dm[k][l0]; dm[k][l0] = s; + } + sgn = -sgn; + } + for ( i = j+1, mj = dm[j], mjj = mj[j]; i < n; i++ ) { + if ( DP_Print ) fprintf(stderr," i=%d\n ",i); + mi = dm[i]; mij = mi[j]; + if ( mod ) + ndv_mul_c(mod,mij,mod-1); + else + ndv_mul_c_z(mij,mone); + for ( k = j+1; k < n; k++ ) { + if ( DP_Print ) fprintf(stderr,"k=%d ",k); + bucket = create_pbucket(); + if ( mi[k] ) { + nmv = BDY(mjj); len = LEN(mjj); + for ( a = 0; a < len; a++, NMV_ADV(nmv) ) { + u = ndv_mul_nmv_trunc(mod,nmv,mi[k],DL(BDY(d))); + add_pbucket(mod,bucket,u); + } + } + if ( mj[k] && mij ) { + nmv = BDY(mij); len = LEN(mij); + for ( a = 0; a < len; a++, NMV_ADV(nmv) ) { + u = ndv_mul_nmv_trunc(mod,nmv,mj[k],DL(BDY(d))); + add_pbucket(mod,bucket,u); + } + } + u = nd_quo(mod,bucket,d); + mi[k] = ndtondv(mod,u); + } + if ( DP_Print ) fprintf(stderr,"\n",k); + } + d = mjj; + } + if ( sgn < 0 ) + if ( mod ) + ndv_mul_c(mod,d,mod-1); + else + ndv_mul_c_z(d,mone); + *rp = ndvtop(mod,CO,fv,d); +} + +ND ndv_mul_nmv_trunc(int mod,NMV m0,NDV p,UINT *d) +{ + NM mr,mr0; + NM tnm; + NMV m; + UINT *d0,*dt,*dm; + int c,n,td,i,c1,c2,len; + Z q; + ND r; + + if ( !p ) return 0; + else { + n = NV(p); m = BDY(p); len = LEN(p); + d0 = DL(m0); + td = TD(d); + mr0 = 0; + NEWNM(tnm); + if ( mod ) { + c = CM(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + ndl_add(DL(m),d0,DL(tnm)); + if ( ndl_reducible(DL(tnm),d) ) { + NEXTNM(mr0,mr); + c1 = CM(m); DMAR(c1,c,0,mod,c2); CM(mr) = c2; + ndl_copy(DL(tnm),DL(mr)); + } + } + } else { + q = CZ(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + ndl_add(DL(m),d0,DL(tnm)); + if ( ndl_reducible(DL(tnm),d) ) { + NEXTNM(mr0,mr); + CZ(mr) = mulz(CZ(m),q); + ndl_copy(DL(tnm),DL(mr)); + } + } + } + if ( !mr0 ) + return 0; + else { + NEXT(mr) = 0; + for ( len = 0, mr = mr0; mr; mr = NEXT(mr), len++ ); + MKND(NV(p),mr0,len,r); + SG(r) = SG(p) + TD(d0); + return r; + } + } }