=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.24 retrieving revision 1.37 diff -u -p -r1.24 -r1.37 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/08/05 08:06:21 1.24 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/08/20 08:38:20 1.37 @@ -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.36 2003/08/20 07:55:45 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 { @@ -37,7 +40,6 @@ typedef struct oNM { int m; Q z; } c; - int td; unsigned int dl[1]; } *NM; @@ -46,28 +48,29 @@ typedef struct oNMV { int m; Q z; } c; - int td; unsigned int dl[1]; } *NMV; typedef struct oRHist { struct oRHist *next; int index; - int td,sugar; + int sugar; unsigned int dl[1]; } *RHist; typedef struct oND_pairs { struct oND_pairs *next; int i1,i2; - int td,sugar; + int sugar; unsigned int lcm[1]; } *ND_pairs; +int (*nd_compare_function)(unsigned int *a1,unsigned int *a2); + 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 +81,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,28 +90,41 @@ 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_dcomp; -extern int Top,Reverse; +extern int Top,Reverse,dp_nelim; -#define HTD(d) ((d)->body->td) +#define TD(d) (d[0]) #define HDL(d) ((d)->body->dl) +#define HTD(d) (TD(HDL(d))) #define HCM(d) ((d)->body->c.m) #define HCQ(d) ((d)->body->c.z) #define CM(a) ((a)->c.m) #define CQ(a) ((a)->c.z) #define DL(a) ((a)->dl) -#define TD(a) ((a)->td) #define SG(a) ((a)->sugar) #define LEN(a) ((a)->len) +#define LCM(a) ((a)->lcm) +#define TD_DL_COMPARE(d1,d2)\ +(TD(d1)>TD(d2)?1:(TD(d1)nv=(n); BDY(d)=(m) +((r)=(RHist)MALLOC(sizeof(struct oRHist)+nd_wpd*sizeof(unsigned int))) +#define NEWND_pairs(m) \ +if(!_ndp_free_list)_NDP_alloc();\ +(m)=_ndp_free_list; _ndp_free_list = NEXT(_ndp_free_list) +#define NEWNM(m)\ +if(!_nm_free_list)_NM_alloc();\ +(m)=_nm_free_list; _nm_free_list = NEXT(_nm_free_list) +#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);} @@ -117,6 +132,7 @@ if(!(r)){NEWRHist(r);(c)=(r);}else{NEWRHist(NEXT(c));( if(!(r)){NEWNM(r);(c)=(r);}else{NEWNM(NEXT(c));(c)=NEXT(c);} #define NEXTNM2(r,c,s) \ if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);} + #define FREENM(m) NEXT(m)=_nm_free_list; _nm_free_list=(m) #define FREENDP(m) NEXT(m)=_ndp_free_list; _ndp_free_list=(m) #define FREEND(m) BDY(m)=(NM)_nd_free_list; _nd_free_list=(m) @@ -124,15 +140,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,24 +177,27 @@ 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(); void _ND_alloc(); int ndl_td(unsigned int *d); -int ndl_dehomogenize(unsigned int *p); +void ndl_dehomogenize(unsigned int *p); ND nd_add(int mod,ND p1,ND p2); ND nd_add_q(ND p1,ND p2); -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); +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); @@ -179,7 +209,7 @@ void ndp_print(ND_pairs d); int nd_length(ND p); void nd_mul_c(int mod,ND p,int mul); void nd_free_redlist(); -void nd_append_red(unsigned int *d,int td,int i); +void nd_append_red(unsigned int *d,int i); unsigned int *nd_compute_bound(ND p); unsigned int *dp_compute_bound(DP p); ND_pairs nd_reconstruct(int mod,int trace,ND_pairs ndp); @@ -193,12 +223,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); @@ -220,7 +247,7 @@ void _NM_alloc() int i; for ( i = 0; i < 1024; i++ ) { - p = (NM)GC_malloc(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); + p = (NM)GC_malloc(sizeof(struct oNM)+nd_wpd*sizeof(unsigned int)); p->next = _nm_free_list; _nm_free_list = p; } } @@ -243,12 +270,12 @@ void _NDP_alloc() for ( i = 0; i < 1024; i++ ) { p = (ND_pairs)GC_malloc(sizeof(struct oND_pairs) - +(nd_wpd-1)*sizeof(unsigned int)); + +nd_wpd*sizeof(unsigned int)); p->next = _ndp_free_list; _ndp_free_list = p; } } -INLINE nd_length(ND p) +INLINE int nd_length(ND p) { NM m; int i; @@ -266,9 +293,10 @@ INLINE int ndl_reducible(unsigned int *d1,unsigned int unsigned int u1,u2; int i,j; + if ( TD(d1) < TD(d2) ) return 0; switch ( nd_bpe ) { case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0xf0000000) < (u2&0xf0000000) ) return 0; if ( (u1&0xf000000) < (u2&0xf000000) ) return 0; @@ -282,7 +310,7 @@ INLINE int ndl_reducible(unsigned int *d1,unsigned int return 1; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0x3f000000) < (u2&0x3f000000) ) return 0; if ( (u1&0xfc0000) < (u2&0xfc0000) ) return 0; @@ -293,7 +321,7 @@ INLINE int ndl_reducible(unsigned int *d1,unsigned int return 1; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0xff000000) < (u2&0xff000000) ) return 0; if ( (u1&0xff0000) < (u2&0xff0000) ) return 0; @@ -303,7 +331,7 @@ INLINE int ndl_reducible(unsigned int *d1,unsigned int return 1; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0xffff0000) < (u2&0xffff0000) ) return 0; if ( (u1&0xffff) < (u2&0xffff) ) return 0; @@ -311,12 +339,12 @@ INLINE int ndl_reducible(unsigned int *d1,unsigned int return 1; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 1; i <= nd_wpd; i++ ) if ( d1[i] < d2[i] ) return 0; return 1; break; default: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; for ( j = 0; j < nd_epw; j++ ) if ( (u1&nd_mask[j]) < (u2&nd_mask[j]) ) return 0; @@ -325,33 +353,31 @@ INLINE int ndl_reducible(unsigned int *d1,unsigned int } } -/* returns the exponent of homo variable */ - -int ndl_dehomogenize(unsigned int *d) +void 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++ ) + h = d[1]; + for ( i = 2; i <= nd_wpd; i++ ) d[i-1] = d[i]; d[i-1] = 0; - return h; + TD(d) -= h; } else { - mask = (1<<(nd_epw*nd_bpe))-1; - h = (d[0]>>((nd_epw-1)*nd_bpe))&nd_mask0; - for ( i = 0; i < nd_wpd; i++ ) + bits = nd_epw*nd_bpe; + mask = bits==32?0xffffffff:((1<<(nd_epw*nd_bpe))-1); + h = (d[1]>>((nd_epw-1)*nd_bpe))&nd_mask0; + for ( i = 1; i <= nd_wpd; i++ ) d[i] = ((d[i]<>((nd_epw-1)*nd_bpe))&nd_mask0):0); - return h; + |(i+1<=nd_wpd?((d[i+1]>>((nd_epw-1)*nd_bpe))&nd_mask0):0); + TD(d) -= h; } - } else { - /* do nothing */ - return d[nd_wpd-1]; - } + } else + TD(d) -= ((d[(nd_nvar-1)/nd_epw+1]>> + ((nd_epw-((nd_nvar-1)%nd_epw)-1)*nd_bpe))&((1<t2?t1:t2; t1 = (u1&0xf000000); t2 = (u2&0xf000000); u |= t1>t2?t1:t2; @@ -375,7 +401,7 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in } break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = (u1&0x3f000000); t2 = (u2&0x3f000000); u = t1>t2?t1:t2; t1 = (u1&0xfc0000); t2 = (u2&0xfc0000); u |= t1>t2?t1:t2; @@ -386,7 +412,7 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in } break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = (u1&0xff000000); t2 = (u2&0xff000000); u = t1>t2?t1:t2; t1 = (u1&0xff0000); t2 = (u2&0xff0000); u |= t1>t2?t1:t2; @@ -396,7 +422,7 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in } break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = (u1&0xffff0000); t2 = (u2&0xffff0000); u = t1>t2?t1:t2; t1 = (u1&0xffff); t2 = (u2&0xffff); u |= t1>t2?t1:t2; @@ -404,13 +430,13 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in } break; case 32: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; d[i] = u1>u2?u1:u2; } break; default: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; for ( j = 0, u = 0; j < nd_epw; j++ ) { t1 = (u1&nd_mask[j]); t2 = (u2&nd_mask[j]); u |= t1>t2?t1:t2; @@ -419,6 +445,7 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in } break; } + TD(d) = ndl_td(d); } int ndl_td(unsigned int *d) @@ -426,7 +453,7 @@ int ndl_td(unsigned int *d) unsigned int t,u; int i,j; - for ( t = 0, i = 0; i < nd_wpd; i++ ) { + for ( t = 0, i = 1; i <= nd_wpd; i++ ) { u = d[i]; for ( j = 0; j < nd_epw; j++, u>>=nd_bpe ) t += (u&nd_mask0); @@ -434,15 +461,15 @@ int ndl_td(unsigned int *d) return t; } -INLINE int ndl_compare(unsigned int *d1,unsigned int *d2) +INLINE int ndl_lex_compare(unsigned int *d1,unsigned int *d2) { int i; for ( i = 0; i < nd_wpd; i++, d1++, d2++ ) if ( *d1 > *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; } @@ -450,8 +477,9 @@ INLINE int ndl_equal(unsigned int *d1,unsigned int *d2 { int i; - for ( i = 0; i < nd_wpd; i++ ) - if ( d1[i] != d2[i] ) + if ( *d1++ != *d2++ ) return 0; + for ( i = 1; i <= nd_wpd; i++ ) + if ( *d1++ != *d2++ ) return 0; return 1; } @@ -462,14 +490,16 @@ INLINE void ndl_copy(unsigned int *d1,unsigned int *d2 switch ( nd_wpd ) { case 1: - d2[0] = d1[0]; + TD(d2) = TD(d1); + d2[1] = d1[1]; break; case 2: - d2[0] = d1[0]; + TD(d2) = TD(d1); d2[1] = d1[1]; + d2[2] = d1[2]; break; default: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 0; i <= nd_wpd; i++ ) d2[i] = d1[i]; break; } @@ -479,45 +509,27 @@ INLINE void ndl_add(unsigned int *d1,unsigned int *d2, { int i; + TD(d) = TD(d1)+TD(d2); switch ( nd_wpd ) { case 1: - d[0] = d1[0]+d2[0]; + d[1] = d1[1]+d2[1]; break; case 2: - d[0] = d1[0]+d2[0]; d[1] = d1[1]+d2[1]; + d[2] = d1[2]+d2[2]; break; default: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 1; i <= nd_wpd; i++ ) d[i] = d1[i]+d2[i]; break; } } -INLINE void ndl_add2(unsigned int *d1,unsigned int *d2) +INLINE void ndl_sub(unsigned int *d1,unsigned int *d2,unsigned int *d) { int i; - switch ( nd_wpd ) { - case 1: - d2[0] += d1[0]; - break; - case 2: - d2[0] += d1[0]; - d2[1] += d1[1]; - break; - default: - for ( i = 0; i < nd_wpd; i++ ) - d2[i] += d1[i]; - break; - } -} - -void ndl_sub(unsigned int *d1,unsigned int *d2,unsigned int *d) -{ - int i; - - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 0; i <= nd_wpd; i++ ) d[i] = d1[i]-d2[i]; } @@ -528,7 +540,7 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2) switch ( nd_bpe ) { case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = u1&0xf0000000; t2 = u2&0xf0000000; if ( t1&&t2 ) return 0; t1 = u1&0xf000000; t2 = u2&0xf000000; if ( t1&&t2 ) return 0; @@ -542,7 +554,7 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2) return 1; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = u1&0x3f000000; t2 = u2&0x3f000000; if ( t1&&t2 ) return 0; t1 = u1&0xfc0000; t2 = u2&0xfc0000; if ( t1&&t2 ) return 0; @@ -553,7 +565,7 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2) return 1; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = u1&0xff000000; t2 = u2&0xff000000; if ( t1&&t2 ) return 0; t1 = u1&0xff0000; t2 = u2&0xff0000; if ( t1&&t2 ) return 0; @@ -563,7 +575,7 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2) return 1; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = u1&0xffff0000; t2 = u2&0xffff0000; if ( t1&&t2 ) return 0; t1 = u1&0xffff; t2 = u2&0xffff; if ( t1&&t2 ) return 0; @@ -571,12 +583,12 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2) return 1; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 1; i <= nd_wpd; i++ ) if ( d1[i] && d2[i] ) return 0; return 1; break; default: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; for ( j = 0; j < nd_epw; j++ ) { if ( (u1&nd_mask0) && (u2&nd_mask0) ) return 0; @@ -598,7 +610,7 @@ int ndl_check_bound2(int index,unsigned int *d2) ind = 0; switch ( nd_bpe ) { case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u2 = d2[i]; if ( d1[ind++]+((u2>>28)&0xf) >= 0x10 ) return 1; if ( d1[ind++]+((u2>>24)&0xf) >= 0x10 ) return 1; @@ -612,7 +624,7 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u2 = d2[i]; if ( d1[ind++]+((u2>>24)&0x3f) >= 0x40 ) return 1; if ( d1[ind++]+((u2>>18)&0x3f) >= 0x40 ) return 1; @@ -623,7 +635,7 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u2 = d2[i]; if ( d1[ind++]+((u2>>24)&0xff) >= 0x100 ) return 1; if ( d1[ind++]+((u2>>16)&0xff) >= 0x100 ) return 1; @@ -633,7 +645,7 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; i <= nd_wpd; i++ ) { u2 = d2[i]; if ( d1[ind++]+((u2>>16)&0xffff) > 0x10000 ) return 1; if ( d1[ind++]+(u2&0xffff) > 0x10000 ) return 1; @@ -641,12 +653,12 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 1; i <= nd_wpd; i++ ) if ( d1[i]+d2[i]>28)&0xf)+((u2>>28)&0xf) >= 0x10 ) return 1; if ( ((u1>>24)&0xf)+((u2>>24)&0xf) >= 0x10 ) return 1; @@ -678,7 +690,7 @@ int ndl_check_bound2_direct(unsigned int *d1,unsigned return 0; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; 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; @@ -689,7 +701,7 @@ int ndl_check_bound2_direct(unsigned int *d1,unsigned return 0; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; 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; @@ -699,7 +711,7 @@ int ndl_check_bound2_direct(unsigned int *d1,unsigned return 0; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = 1; 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; @@ -707,12 +719,12 @@ int ndl_check_bound2_direct(unsigned int *d1,unsigned return 0; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = 1; i <= nd_wpd; i++ ) if ( d1[i]+d2[i] 0 ) nd_notfirst++; nd_found++; return r->index; } } - if ( Reverse ) for ( i = nd_psn-1; i >= 0; i-- ) { r = nd_psh[i]; - if ( HTD(g) >= TD(r) && ndl_reducible(HDL(g),DL(r)) ) { + if ( ndl_reducible(dg,DL(r)) ) { nd_create++; - nd_append_red(HDL(g),HTD(g),i); + nd_append_red(dg,i); return i; } } else for ( i = 0; i < nd_psn; i++ ) { r = nd_psh[i]; - if ( HTD(g) >= TD(r) && ndl_reducible(HDL(g),DL(r)) ) { + if ( ndl_reducible(dg,DL(r)) ) { nd_create++; - nd_append_red(HDL(g),HTD(g),i); + nd_append_red(dg,i); return i; } } @@ -772,22 +785,23 @@ 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-- ) { r = ps[i]; - if ( HTD(g) >= HTD(r) && ndl_reducible(HDL(g),HDL(r)) ) { - nd_append_red(HDL(g),HTD(g),i); + if ( ndl_reducible(HDL(g),HDL(r)) ) { + nd_append_red(HDL(g),i); return i; } } else for ( i = 0; i < len; i++ ) { r = ps[i]; - if ( HTD(g) >= HTD(r) && ndl_reducible(HDL(g),HDL(r)) ) { - nd_append_red(HDL(g),HTD(g),i); + if ( ndl_reducible(HDL(g),HDL(r)) ) { + nd_append_red(HDL(g),i); return i; } } @@ -797,32 +811,26 @@ 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,td1,td2; ND r; NM m1,m2,mr0,mr,s; - if ( !p1 ) - return p2; - else if ( !p2 ) - return p1; + if ( !p1 ) 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 = DL_COMPARE(DL(m1),DL(m2)); switch ( c ) { case 0: t = ((CM(m1))+(CM(m2))) - mod; - if ( t < 0 ) - t += mod; + if ( t < 0 ) t += mod; s = m1; m1 = NEXT(m1); if ( t ) { - NEXTNM2(mr0,mr,s); CM(mr) = (t); + can++; NEXTNM2(mr0,mr,s); CM(mr) = (t); } else { - FREENM(s); + can += 2; FREENM(s); } s = m2; m2 = NEXT(m2); FREENM(s); break; @@ -835,20 +843,15 @@ ND nd_add(int mod,ND p1,ND p2) } } if ( !mr0 ) - if ( m1 ) - mr0 = m1; - else if ( m2 ) - mr0 = m2; - else - return 0; - else if ( m1 ) - NEXT(mr) = m1; - else if ( m2 ) - NEXT(mr) = m2; - else - NEXT(mr) = 0; + if ( m1 ) mr0 = m1; + else if ( m2 ) mr0 = m2; + else return 0; + else if ( m1 ) NEXT(mr) = m1; + else if ( m2 ) NEXT(mr) = m2; + else 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,31 +859,25 @@ 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; - if ( !p1 ) - return p2; - else if ( !p2 ) - return p1; + if ( !p1 ) return 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 = DL_COMPARE(DL(m1),DL(m2)); switch ( c ) { case 0: addq(CQ(m1),CQ(m2),&t); s = m1; m1 = NEXT(m1); if ( t ) { - NEXTNM2(mr0,mr,s); CQ(mr) = (t); + can++; NEXTNM2(mr0,mr,s); CQ(mr) = (t); } else { - FREENM(s); + can += 2; FREENM(s); } s = m2; m2 = NEXT(m2); FREENM(s); break; @@ -893,26 +890,20 @@ ND nd_add_q(ND p1,ND p2) } } if ( !mr0 ) - if ( m1 ) - mr0 = m1; - else if ( m2 ) - mr0 = m2; - else - return 0; - else if ( m1 ) - NEXT(mr) = m1; - else if ( m2 ) - NEXT(mr) = m2; - else - NEXT(mr) = 0; + if ( m1 ) mr0 = m1; + else if ( m2 ) mr0 = m2; + else return 0; + else if ( m1 ) NEXT(mr) = m1; + else if ( m2 ) NEXT(mr) = m2; + else 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 +911,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; @@ -930,23 +921,16 @@ int nd_nf(int mod,ND g,int full,ND *rp) *rp = 0; return 1; } - if ( !mod ) - hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + if ( !mod ) hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; sugar0 = sugar = SG(g); n = NV(g); - mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); + mul = (NM)ALLOCA(sizeof(struct oNM)+nd_wpd*sizeof(unsigned int)); for ( d = 0; g; ) { 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 0 - if ( d && (SG(p)+TD(mul)) > sugar ) { - goto afo; - } -#endif if ( ndl_check_bound2(index,DL(mul)) ) { nd_free(g); nd_free(d); return 0; @@ -961,9 +945,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(DL(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; @@ -972,28 +955,120 @@ int nd_nf(int mod,ND g,int full,ND *rp) *rp = g; return 1; } else { -afo: m = BDY(g); if ( NEXT(m) ) { - BDY(g) = NEXT(m); NEXT(m) = 0; + BDY(g) = NEXT(m); NEXT(m) = 0; LEN(g)--; } else { FREEND(g); g = 0; } if ( d ) { - NEXT(tail)=m; - tail=m; + NEXT(tail)=m; tail=m; LEN(d)++; } else { - MKND(n,m,d); - tail = BDY(d); + MKND(n,m,1,d); tail = BDY(d); } } } - if ( d ) - SG(d) = sugar; + if ( d ) SG(d) = sugar; *rp = d; 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*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)); + 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); + psugar = SG(p)+TD(DL(mul)); + sugar = MAX(sugar,psugar); + 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; @@ -1020,13 +1095,12 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full sugar0 = sugar = SG(g); n = NV(g); - mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); + mul = (NM)ALLOCA(sizeof(struct oNM)+nd_wpd*sizeof(unsigned int)); for ( d = 0; g; ) { index = nd_find_reducer_direct(g,ps,len); if ( index >= 0 ) { p = ps[index]; ndl_sub(HDL(g),HDL(p),DL(mul)); - TD(mul) = HTD(g)-HTD(p); if ( ndl_check_bound2_direct(HDL(p),DL(mul)) ) { nd_free(g); nd_free(d); return 0; @@ -1039,9 +1113,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(DL(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; @@ -1052,36 +1125,156 @@ int nd_nf_direct(int mod,ND g,NDV *ps,int len,int full } else { m = BDY(g); if ( NEXT(m) ) { - BDY(g) = NEXT(m); NEXT(m) = 0; + BDY(g) = NEXT(m); NEXT(m) = 0; LEN(g)--; } else { FREEND(g); g = 0; } if ( d ) { - NEXT(tail)=m; - tail=m; + NEXT(tail)=m; tail=m; LEN(d)++; } else { - MKND(n,m,d); - tail = BDY(d); + MKND(n,m,1,d); tail = BDY(d); } } } - if ( d ) - SG(d) = sugar; + if ( d ) SG(d) = sugar; *rp = d; return 1; } + +int nd_nf_direct_pbucket(int mod,ND g,NDV *ps,int len,int full,ND *rp) +{ + int hindex,index; + NDV p; + ND u,d,red; + NODE l; + NM mul,m,mrd,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*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; + + 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; m = BDY(p); if ( !NEXT(m) ) { - FREEND(p); - p = 0; - } else - BDY(p) = NEXT(m); + FREEND(p); p = 0; + } else { + BDY(p) = NEXT(m); LEN(p)--; + } FREENM(m); return p; } @@ -1095,22 +1288,43 @@ 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); +} + int head_pbucket(int mod,PGeoBucket g) { int j,i,c,k,nv,sum; @@ -1129,33 +1343,22 @@ int head_pbucket(int mod,PGeoBucket g) dj = HDL(gj); sum = HCM(gj); } 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 = DL_COMPARE(HDL(gi),dj); if ( c > 0 ) { - if ( sum ) - HCM(gj) = sum; - else - g->body[j] = nd_remove_head(gj); + if ( sum ) HCM(gj) = sum; + else g->body[j] = nd_remove_head(gj); j = i; gj = g->body[j]; dj = HDL(gj); sum = HCM(gj); } else if ( c == 0 ) { sum = sum+HCM(gi)-mod; - if ( sum < 0 ) - sum += mod; + if ( sum < 0 ) sum += mod; g->body[i] = nd_remove_head(gi); } } } - if ( j < 0 ) - return -1; + if ( j < 0 ) return -1; else if ( sum ) { HCM(gj) = sum; return j; @@ -1164,73 +1367,63 @@ 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; + 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]; + sum = HCQ(gj); + } else { + nv = NV(gi); + c = DL_COMPARE(HDL(gi),HDL(gj)); + if ( c > 0 ) { + if ( sum ) HCQ(gj) = sum; + else g->body[j] = nd_remove_head(gj); + j = i; + gj = g->body[j]; + 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 +1450,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); @@ -1274,11 +1468,9 @@ again: } } if ( m ) - for ( t = g; t; t = NEXT(t) ) - BDY(t) = (pointer)nd_ps[(int)BDY(t)]; + 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_psq[(int)BDY(t)]; return g; } @@ -1309,7 +1501,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 +1513,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 +1532,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 DL_COMPARE(HDL(*p1),HDL(*p2)); } int ndv_compare_rev(NDV *p1,NDV *p2) { - return -ndv_compare(p1,p2); + return -DL_COMPARE(HDL(*p1),HDL(*p2)); } NODE nd_reduceall(int m,NODE f) @@ -1365,10 +1554,8 @@ NODE nd_reduceall(int m,NODE f) 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 ( j = 0; j < i; j++ ) w[j] = (NDV)ps[j]; + for ( j = i+1; j < n; j++ ) w[j-1] = ps[j]; g = ndvtond(m,ps[i]); stat = nd_nf_direct(m,g,w,n-1,1,&nf); if ( !stat ) @@ -1376,8 +1563,7 @@ NODE nd_reduceall(int m,NODE f) 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]; n--; } else { printf("."); fflush(stdout); @@ -1408,23 +1594,18 @@ ND_pairs update_pairs( ND_pairs d, NODE /* of index */ while ( cur ) { if ( crit_2( cur->i1,cur->i2 ) ) { remove = cur; - if ( !prev ) { - head = cur = NEXT(cur); - } else { - cur = NEXT(prev) = NEXT(cur); - } + if ( !prev ) head = cur = NEXT(cur); + else cur = NEXT(prev) = NEXT(cur); FREENDP(remove); } else { - prev = cur; - cur = NEXT(cur); + prev = cur; cur = NEXT(cur); } } if ( !d ) return head; else { nd = d; - while ( NEXT(nd) ) - nd = NEXT(nd); + while ( NEXT(nd) ) nd = NEXT(nd); NEXT(nd) = head; return d; } @@ -1434,20 +1615,18 @@ ND_pairs nd_newpairs( NODE g, int t ) { NODE h; unsigned int *dl; - int td,ts,s; + int ts,s; ND_pairs r,r0; dl = DL(nd_psh[t]); - td = TD(nd_psh[t]); - ts = SG(nd_psh[t]) - td; + ts = SG(nd_psh[t]) - TD(dl); for ( r0 = 0, h = g; h; h = NEXT(h) ) { NEXTND_pairs(r0,r); r->i1 = (int)BDY(h); r->i2 = t; ndl_lcm(DL(nd_psh[r->i1]),dl,r->lcm); - TD(r) = ndl_td(r->lcm); - s = SG(nd_psh[r->i1])-TD(nd_psh[r->i1]); - SG(r) = MAX(s,ts) + TD(r); + s = SG(nd_psh[r->i1])-TD(DL(nd_psh[r->i1])); + SG(r) = MAX(s,ts) + TD(LCM(r)); } NEXT(r) = 0; return r0; @@ -1463,7 +1642,7 @@ ND_pairs crit_B( ND_pairs d, int s ) t = DL(nd_psh[s]); prev = 0; head = cur = d; - lcm = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); + lcm = (unsigned int *)ALLOCA((nd_wpd+1)*sizeof(unsigned int)); while ( cur ) { tl = cur->lcm; if ( ndl_reducible(tl,t) @@ -1477,39 +1656,34 @@ ND_pairs crit_B( ND_pairs d, int s ) } FREENDP(remove); } else { - prev = cur; - cur = NEXT(cur); + prev = cur; cur = NEXT(cur); } } return head; } +/* XXX : check is necessary */ + ND_pairs crit_M( ND_pairs d1 ) { ND_pairs e,d2,d3,dd,p; unsigned int *id,*jd; - int itd,jtd; for ( dd = 0, e = d1; e; e = d3 ) { if ( !(d2 = NEXT(e)) ) { NEXT(e) = dd; return e; } - id = e->lcm; - itd = TD(e); + id = LCM(e); for ( d3 = 0; d2; d2 = p ) { - p = NEXT(d2), - jd = d2->lcm; - jtd = TD(d2); - if ( jtd == itd ) - if ( id == jd ); - else if ( ndl_reducible(jd,id) ) continue; - else if ( ndl_reducible(id,jd) ) goto delit; - else ; - else if ( jtd > itd ) + p = NEXT(d2); + jd = LCM(d2); + if ( ndl_equal(jd,id) ) + ; + else if ( TD(jd) > TD(id) ) if ( ndl_reducible(jd,id) ) continue; else ; - else if ( ndl_reducible(id,jd ) ) goto delit; + else if ( ndl_reducible(id,jd) ) goto delit; NEXT(d2) = d3; d3 = d2; } @@ -1580,16 +1754,14 @@ static ND_pairs equivalent_pairs( ND_pairs d1, ND_pair { ND_pairs w,p,r,s; unsigned int *d; - int td; w = d1; - d = w->lcm; - td = TD(w); + d = LCM(w); s = NEXT(w); NEXT(w) = 0; for ( r = 0; s; s = p ) { p = NEXT(s); - if ( td == TD(s) && ndl_equal(d,s->lcm) ) { + if ( ndl_equal(d,LCM(s)) ) { NEXT(s) = w; w = s; } else { @@ -1605,14 +1777,11 @@ NODE update_base(NODE nd,int ndp) { unsigned int *dl, *dln; NODE last, p, head; - int td,tdn; dl = DL(nd_psh[ndp]); - td = TD(nd_psh[ndp]); for ( head = last = 0, p = nd; p; ) { dln = DL(nd_psh[(int)BDY(p)]); - tdn = TD(nd_psh[(int)BDY(p)]); - if ( tdn >= td && ndl_reducible( dln, dl ) ) { + if ( ndl_reducible( dln, dl ) ) { p = NEXT(p); if ( last ) NEXT(last) = p; } else { @@ -1628,45 +1797,21 @@ 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) && (DL_COMPARE(LCM(p),LCM(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 +1829,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)); @@ -1693,7 +1837,7 @@ int nd_newps(int mod,ND a) } nd_removecont(mod,a); nd_bound[nd_psn] = nd_compute_bound(a); - NEWRHist(r); SG(r) = SG(a); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); + NEWRHist(r); SG(r) = SG(a); ndl_copy(HDL(a),DL(r)); nd_psh[nd_psn] = r; b = ndtondv(mod,a); len = LEN(b); @@ -1701,12 +1845,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 +1857,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); @@ -1732,17 +1871,9 @@ int nd_newps_trace(int mod,ND nf,ND nfq) nd_psq[nd_psn] = ndtondv(0,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)); + NEWRHist(r); SG(r) = SG(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 +1888,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)); @@ -1771,18 +1901,12 @@ void nd_setup(int mod,NODE f) nd_red = (RHist *)MALLOC(REDTAB_LEN*sizeof(RHist)); bzero(nd_red,REDTAB_LEN*sizeof(RHist)); - if ( max < 2 ) - nd_bpe = 2; - else if ( max < 4 ) - nd_bpe = 4; - else if ( max < 64 ) - nd_bpe = 6; - else if ( max < 256 ) - nd_bpe = 8; - else if ( max < 65536 ) - nd_bpe = 16; - else - nd_bpe = 32; + if ( max < 2 ) nd_bpe = 2; + else if ( max < 4 ) nd_bpe = 4; + else if ( max < 64 ) nd_bpe = 6; + else if ( max < 256 ) nd_bpe = 8; + else if ( max < 65536 ) nd_bpe = 16; + else nd_bpe = 32; nd_setup_parameters(); nd_free_private_storage(); @@ -1792,19 +1916,11 @@ void nd_setup(int mod,NODE f) a = dptondv(mod,(DP)BDY(f)); ndv_removecont(mod,a); len = MAX(len,LEN(a)); - SG(r) = HTD(a); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); - if ( mod ) - nd_ps[i] = a; - else - nd_psq[i] = a; + SG(r) = HTD(a); ndl_copy(HDL(a),DL(r)); + if ( mod ) nd_ps[i] = a; + else 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 +1934,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)); @@ -1832,18 +1947,12 @@ void nd_setup_trace(int mod,NODE f) nd_red = (RHist *)MALLOC(REDTAB_LEN*sizeof(RHist)); bzero(nd_red,REDTAB_LEN*sizeof(RHist)); - if ( max < 2 ) - nd_bpe = 2; - else if ( max < 4 ) - nd_bpe = 4; - else if ( max < 64 ) - nd_bpe = 6; - else if ( max < 256 ) - nd_bpe = 8; - else if ( max < 65536 ) - nd_bpe = 16; - else - nd_bpe = 32; + if ( max < 2 ) nd_bpe = 2; + else if ( max < 4 ) nd_bpe = 4; + else if ( max < 64 ) nd_bpe = 6; + else if ( max < 256 ) nd_bpe = 8; + else if ( max < 65536 ) nd_bpe = 16; + else nd_bpe = 32; nd_setup_parameters(); nd_free_private_storage(); @@ -1853,12 +1962,9 @@ void nd_setup_trace(int mod,NODE f) a = dptondv(0,(DP)BDY(f)); ndv_removecont(0,a); nd_psq[i] = a; NEWRHist(r); len = MAX(len,LEN(a)); - SG(r) = HTD(a); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); + SG(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 +1976,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 +1985,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 +2001,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 +2036,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) @@ -2001,31 +2077,32 @@ void dltondl(int n,DL dl,unsigned int *r) int i; d = dl->d; - bzero(r,nd_wpd*sizeof(unsigned int)); - if ( is_rlex ) + for ( i = 0; i <= nd_wpd; i++ ) r[i] = 0; + 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)); + r[(n-1-i)/nd_epw+1] |= (d[i]<<((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)); else for ( i = 0; i < n; i++ ) - r[i/nd_epw] |= d[i]<<((nd_epw-(i%nd_epw)-1)*nd_bpe); + r[i/nd_epw+1] |= d[i]<<((nd_epw-(i%nd_epw)-1)*nd_bpe); + TD(r) = ndl_td(r); } -DL ndltodl(int n,int td,unsigned int *ndl) +DL ndltodl(int n,unsigned int *ndl) { DL dl; int *d; int i; NEWDL(dl,n); - TD(dl) = td; + dl->td = TD(ndl); 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)) + d[i] = (ndl[(n-1-i)/nd_epw+1]>>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) &((1<>((nd_epw-(i%nd_epw)-1)*nd_bpe)) + d[i] = (ndl[i/nd_epw+1]>>((nd_epw-(i%nd_epw)-1)*nd_bpe)) &((1<>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) + (dl[(n-1-i)/nd_epw+1]>>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) &((1<>((nd_epw-(i%nd_epw)-1)*nd_bpe)) + (dl[i/nd_epw+1]>>((nd_epw-(i%nd_epw)-1)*nd_bpe)) &((1<>"); } @@ -2138,9 +2209,7 @@ void ndp_print(ND_pairs d) { ND_pairs t; - for ( t = d; t; t = NEXT(t) ) { - printf("%d,%d ",t->i1,t->i2); - } + for ( t = d; t; t = NEXT(t) ) printf("%d,%d ",t->i1,t->i2); printf("\n"); } @@ -2153,15 +2222,13 @@ void nd_removecont(int mod,ND p) struct oVECT v; N q,r; - if ( mod ) - nd_mul_c(mod,p,invm(HCM(p),mod)); + 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)); 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] = CQ(m); removecont_array(w,n); for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ ) CQ(m) = w[i]; } @@ -2187,10 +2254,8 @@ void nd_removecont2(ND p1,ND p2) w = (Q *)ALLOCA(n*sizeof(Q)); 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] = CQ(m); + for ( m = BDY(p2); i < n; m = NEXT(m), i++ ) w[i] = CQ(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]; @@ -2208,8 +2273,7 @@ void ndv_removecont(int mod,NDV p) 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); + 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++ ) { @@ -2231,12 +2295,12 @@ void ndv_dehomogenize(NDV p) newnvar = nd_nvar-1; newwpd = newnvar/nd_epw+(newnvar%nd_epw?1:0); for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) - TD(m) -= ndl_dehomogenize(DL(m)); + 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); + d = (unsigned int *)ALLOCA((newwpd+1)*sizeof(unsigned int)); + newadv = sizeof(struct oNMV)+newwpd*sizeof(unsigned int); for ( m = r = BDY(p), i = 0; i < len; NMV_ADV(m), NEWADV(r), i++ ) { - CQ(r) = CQ(m); TD(r) = TD(m); ndl_copy(DL(m),d); ndl_copy(d,DL(r)); + CQ(r) = CQ(m); ndl_copy(DL(m),d); ndl_copy(d,DL(r)); } } NV(p)--; @@ -2259,9 +2323,7 @@ void removecont_array(Q *c,int n) NTOQ(qn,SGN(c[i])*SGN(d0),q[i]); NTOQ(rn,SGN(c[i]),r[i]); } - for ( i = 0; i < n; i++ ) - if ( r[i] ) - break; + 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); @@ -2276,8 +2338,7 @@ void removecont_array(Q *c,int n) q[i] = u; } } - for ( i = 0; i < n; i++ ) - c[i] = q[i]; + for ( i = 0; i < n; i++ ) c[i] = q[i]; } void nd_mul_c(int mod,ND p,int mul) @@ -2285,8 +2346,7 @@ void nd_mul_c(int mod,ND p,int mul) NM m; int c,c1; - if ( !p ) - return; + if ( !p ) return; for ( m = BDY(p); m; m = NEXT(m) ) { c1 = CM(m); DMAR(c1,mul,0,mod,c); @@ -2299,8 +2359,7 @@ void nd_mul_c_q(ND p,Q mul) NM m; Q c; - if ( !p ) - return; + if ( !p ) return; for ( m = BDY(p); m; m = NEXT(m) ) { mulq(CQ(m),mul,&c); CQ(m) = c; } @@ -2310,8 +2369,7 @@ void nd_free(ND p) { NM t,s; - if ( !p ) - return; + if ( !p ) return; t = BDY(p); while ( t ) { s = NEXT(t); @@ -2326,15 +2384,14 @@ void ndv_free(NDV p) GC_free(BDY(p)); } -void nd_append_red(unsigned int *d,int td,int i) +void nd_append_red(unsigned int *d,int i) { RHist m,m0; int h; NEWRHist(m); - h = ndl_hash_value(td,d); + h = ndl_hash_value(d); m->index = i; - TD(m) = td; ndl_copy(d,DL(m)); NEXT(m) = nd_red[h]; nd_red[h] = m; @@ -2351,7 +2408,8 @@ unsigned int *dp_compute_bound(DP p) d1 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int)); d2 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int)); m = BDY(p); - bcopy(DL(m)->d,d1,nd_nvar*sizeof(unsigned int)); + d = DL(m)->d; + for ( i = 0; i < nd_nvar; i++ ) d1[i] = d[i]; for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { d = DL(m)->d; for ( i = 0; i < nd_nvar; i++ ) @@ -2360,8 +2418,8 @@ unsigned int *dp_compute_bound(DP p) } l = (nd_nvar+31); t = (unsigned int *)MALLOC_ATOMIC(l*sizeof(unsigned int)); - bzero(t,l*sizeof(unsigned int)); - bcopy(d1,t,nd_nvar*sizeof(unsigned int)); + for ( i = 0; i < nd_nvar; i++ ) t[i] = d1[i]; + for ( ; i < l; i++ ) t[i] = 0; return t; } @@ -2375,16 +2433,17 @@ unsigned int *nd_compute_bound(ND p) return 0; d1 = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); d2 = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); - bcopy(HDL(p),d1,nd_wpd*sizeof(unsigned int)); + ndl_copy(HDL(p),d1); for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { ndl_lcm(DL(m),d1,d2); t = d1; d1 = d2; d2 = t; } l = nd_nvar+31; t = (unsigned int *)MALLOC_ATOMIC(l*sizeof(unsigned int)); - bzero(t,l*sizeof(unsigned int)); + for ( i = 0; i < l; i++ ) t[i] = 0; for ( i = 0; i < nd_nvar; i++ ) - t[i] = (d1[i/nd_epw]>>((nd_epw-(i%nd_epw)-1)*nd_bpe))&nd_mask0; + t[i] = (d1[i/nd_epw+1]>>((nd_epw-(i%nd_epw)-1)*nd_bpe))&nd_mask0; + for ( ; i < l; i++ ) t[i] = 0; return t; } @@ -2404,34 +2463,29 @@ void nd_setup_parameters() { nd_mask[nd_epw-i-1] = (nd_mask0<<(i*nd_bpe)); nd_mask1 |= (1<<(nd_bpe-1))<<(i*nd_bpe); } - nm_adv = sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int); - nmv_adv = sizeof(struct oNMV)+(nd_wpd-1)*sizeof(unsigned int); + nm_adv = sizeof(struct oNM)+nd_wpd*sizeof(unsigned int); + nmv_adv = sizeof(struct oNMV)+nd_wpd*sizeof(unsigned int); } /* mod < 0 => realloc nd_ps and pd_psq */ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) { - int i,obpe,oadv; + int i,obpe,oadv,h; NM prev_nm_free_list; RHist mr0,mr; RHist r; + RHist *old_red; ND_pairs s0,s,t,prev_ndp_free_list; obpe = nd_bpe; oadv = nmv_adv; - if ( obpe < 4 ) - nd_bpe = 4; - else if ( obpe < 6 ) - nd_bpe = 6; - else if ( obpe < 8 ) - nd_bpe = 8; - else if ( obpe < 16 ) - nd_bpe = 16; - else if ( obpe < 32 ) - nd_bpe = 32; - else - error("nd_reconstruct : exponent too large"); + if ( obpe < 4 ) nd_bpe = 4; + else if ( obpe < 6 ) nd_bpe = 6; + else if ( obpe < 8 ) nd_bpe = 8; + else if ( obpe < 16 ) nd_bpe = 16; + else if ( obpe < 32 ) nd_bpe = 32; + else error("nd_reconstruct : exponent too large"); nd_setup_parameters(); prev_nm_free_list = _nm_free_list; @@ -2439,78 +2493,90 @@ ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) _nm_free_list = 0; _ndp_free_list = 0; if ( mod != 0 ) - for ( i = nd_psn-1; i >= 0; i-- ) - ndv_realloc(nd_ps[i],obpe,oadv); + for ( i = nd_psn-1; i >= 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_psq[i],obpe,oadv); s0 = 0; for ( t = d; t; t = NEXT(t) ) { NEXTND_pairs(s0,s); s->i1 = t->i1; s->i2 = t->i2; - TD(s) = TD(t); SG(s) = SG(t); - ndl_dup(obpe,t->lcm,s->lcm); + ndl_dup(obpe,LCM(t),LCM(s)); } + + old_red = (RHist *)ALLOCA(REDTAB_LEN*sizeof(RHist)); for ( i = 0; i < REDTAB_LEN; i++ ) { - for ( mr0 = 0, r = nd_red[i]; r; r = NEXT(r) ) { - NEXTRHist(mr0,mr); + 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); - TD(mr) = TD(r); ndl_dup(obpe,DL(r),DL(mr)); + h = ndl_hash_value(DL(mr)); + NEXT(mr) = nd_red[h]; + nd_red[h] = mr; } - if ( mr0 ) NEXT(mr) = 0; - nd_red[i] = mr0; - } + for ( i = 0; i < REDTAB_LEN; i++ ) old_red[i] = 0; + old_red = 0; for ( i = 0; i < nd_psn; i++ ) { NEWRHist(r); SG(r) = SG(nd_psh[i]); - TD(r) = TD(nd_psh[i]); ndl_dup(obpe,DL(nd_psh[i]),DL(r)); + ndl_dup(obpe,DL(nd_psh[i]),DL(r)); nd_psh[i] = r; } 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; } void nd_reconstruct_direct(int mod,NDV *ps,int len) { - int i,obpe,oadv; + int i,obpe,oadv,h; NM prev_nm_free_list; RHist mr0,mr; RHist r; + RHist *old_red; ND_pairs s0,s,t,prev_ndp_free_list; obpe = nd_bpe; oadv = nmv_adv; - if ( obpe < 4 ) - nd_bpe = 4; - else if ( obpe < 6 ) - nd_bpe = 6; - else if ( obpe < 8 ) - nd_bpe = 8; - else if ( obpe < 16 ) - nd_bpe = 16; - else if ( obpe < 32 ) - nd_bpe = 32; - else - error("nd_reconstruct_direct : exponent too large"); + if ( obpe < 4 ) nd_bpe = 4; + else if ( obpe < 6 ) nd_bpe = 6; + else if ( obpe < 8 ) nd_bpe = 8; + else if ( obpe < 16 ) nd_bpe = 16; + else if ( obpe < 32 ) nd_bpe = 32; + else error("nd_reconstruct_direct : exponent too large"); nd_setup_parameters(); prev_nm_free_list = _nm_free_list; prev_ndp_free_list = _ndp_free_list; - _nm_free_list = 0; - _ndp_free_list = 0; + _nm_free_list = 0; _ndp_free_list = 0; if ( mod != 0 ) - for ( i = len-1; i >= 0; i-- ) - ndv_realloc(ps[i],obpe,oadv); + 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_dup(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; prev_nm_free_list = 0; prev_ndp_free_list = 0; - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); GC_gcollect(); } @@ -2522,19 +2588,19 @@ void ndl_dup(int obpe,unsigned int *d,unsigned int *r) oepw = (sizeof(unsigned int)*8)/obpe; cepw = nd_epw; cbpe = nd_bpe; - for ( i = 0; i < nd_wpd; i++ ) - r[i] = 0; - if ( is_rlex ) + TD(r) = TD(d); + for ( i = 1; i <= nd_wpd; i++ ) r[i] = 0; + if ( nd_isrlex ) for ( i = 0; i < n; i++ ) { - ei = (d[(n-1-i)/oepw]>>((oepw-((n-1-i)%oepw)-1)*obpe)) + ei = (d[(n-1-i)/oepw+1]>>((oepw-((n-1-i)%oepw)-1)*obpe)) &((1<>((oepw-(i%oepw)-1)*obpe)) + ei = (d[i/oepw+1]>>((oepw-(i%oepw)-1)*obpe)) &((1<i1]; p2 = nd_psq[p->i2]; } - lcm = p->lcm; - td = TD(p); + lcm = LCM(p); NEWNM(m); CQ(m) = HCQ(p2); - TD(m) = td-HTD(p1); ndl_sub(lcm,HDL(p1),DL(m)); - if ( ndl_check_bound2(p->i1,DL(m)) ) - return 0; - t1 = ndv_mul_nm_create(mod,p1,m); - if ( mod ) - CM(m) = mod-HCM(p1); - else - chsgnq(HCQ(p1),&CQ(m)); - TD(m) = td-HTD(p2); ndl_sub(lcm,HDL(p2),DL(m)); + ndl_sub(lcm,HDL(p1),DL(m)); + if ( ndl_check_bound2(p->i1,DL(m)) ) return 0; + t1 = ndv_mul_nm(mod,p1,m); + if ( mod ) CM(m) = mod-HCM(p1); + else chsgnq(HCQ(p1),&CQ(m)); + ndl_sub(lcm,HDL(p2),DL(m)); if ( ndl_check_bound2(p->i2,DL(m)) ) { 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; } @@ -2619,13 +2679,10 @@ void ndv_mul_c(int mod,NDV p,int mul) NMV m; int c,c1,len,i; - if ( !p ) - return; + if ( !p ) return; len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { - c1 = CM(m); - DMAR(c1,mul,0,mod,c); - CM(m) = c; + c1 = CM(m); DMAR(c1,mul,0,mod,c); CM(m) = c; } } @@ -2635,49 +2692,15 @@ void ndv_mul_c_q(NDV p,Q mul) Q c; int len,i; - if ( !p ) - return; + 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; } } -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; @@ -2685,13 +2708,13 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0) Q q; ND r; - if ( !p ) - return 0; + if ( !p ) return 0; else { n = NV(p); m = BDY(p); - d = DL(m0); td = TD(m0); + d = DL(m0); len = LEN(p); mr0 = 0; + td = TD(d); if ( mod ) { c = CM(m0); for ( i = 0; i < len; i++, NMV_ADV(m) ) { @@ -2699,7 +2722,6 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0) 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 { @@ -2707,169 +2729,16 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0) for ( i = 0; i < len; i++, NMV_ADV(m) ) { NEXTNM(mr0,mr); mulq(CQ(m),q,&CQ(mr)); - TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr)); } } NEXT(mr) = 0; - MKND(NV(p),mr0,r); - SG(r) = SG(p) + td; + MKND(NV(p),mr0,len,r); + SG(r) = SG(p) + TD(d); 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; @@ -2880,20 +2749,15 @@ void ndv_realloc(NDV p,int obpe,int oadv) if ( p ) { m = BDY(p); len = LEN(p); - if ( nmv_adv > oadv ) - mr0 = (NMV)REALLOC(BDY(p),len*nmv_adv); - else - mr0 = BDY(p); + mr0 = nmv_adv>oadv?(NMV)REALLOC(BDY(p),len*nmv_adv):BDY(p); m = (NMV)((char *)mr0+(len-1)*oadv); 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); - TD(t) = TD(m); for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0; ndl_dup(obpe,DL(m),DL(t)); CQ(mr) = CQ(t); - TD(mr) = TD(t); ndl_copy(DL(t),DL(mr)); } BDY(p) = mr0; @@ -2907,15 +2771,10 @@ NDV ndtondv(int mod,ND p) NM t; int i,len; - if ( !p ) - return 0; - len = nd_length(p); - if ( mod ) - m0 = m = (NMV)MALLOC_ATOMIC(len*nmv_adv); - else - m0 = m = (NMV)MALLOC(len*nmv_adv); + if ( !p ) return 0; + len = LEN(p); + m0 = m = (NMV)(mod?MALLOC_ATOMIC(len*nmv_adv):MALLOC(len*nmv_adv)); for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, NMV_ADV(m) ) { - TD(m) = TD(t); ndl_copy(DL(t),DL(m)); CQ(m) = CQ(t); } @@ -2931,18 +2790,16 @@ ND ndvtond(int mod,NDV p) NMV t; int i,len; - if ( !p ) - return 0; + if ( !p ) return 0; m0 = 0; len = p->len; for ( t = BDY(p), i = 0; i < len; NMV_ADV(t), i++ ) { NEXTNM(m0,m); - TD(m) = TD(t); ndl_copy(DL(t),DL(m)); CQ(m) = CQ(t); } NEXT(m) = 0; - MKND(NV(p),m0,d); + MKND(NV(p),m0,len,d); SG(d) = SG(p); return d; } @@ -2955,8 +2812,7 @@ NDV dptondv(int mod,DP p) DP q; int l,i,n; - if ( !p ) - return 0; + 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; @@ -2965,11 +2821,8 @@ NDV dptondv(int mod,DP p) 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) ) { - if ( mod ) - CM(m) = ITOS(C(t)); - else - CQ(m) = (Q)C(t); - TD(m) = TD(DL(t)); + if ( mod ) CM(m) = ITOS(C(t)); + else CQ(m) = (Q)C(t); dltondl(n,DL(t),DL(m)); } MKNDV(n,m0,l,d); @@ -2984,18 +2837,15 @@ DP ndvtodp(int mod,NDV p) NMV t; int len,i,n; - if ( !p ) - return 0; + if ( !p ) return 0; m0 = 0; len = LEN(p); n = NV(p); for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) { NEXTMP(m0,m); - if ( mod ) - C(m) = STOI(CM(t)); - else - C(m) = (P)CQ(t); - DL(m) = ndltodl(n,TD(t),DL(t)); + if ( mod ) C(m) = STOI(CM(t)); + else C(m) = (P)CQ(t); + DL(m) = ndltodl(n,DL(t)); } NEXT(m) = 0; MKDP(NV(p),m0,d); @@ -3008,8 +2858,7 @@ void ndv_print(NDV p) NMV m; int i,len; - if ( !p ) - printf("0\n"); + if ( !p ) printf("0\n"); else { len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { @@ -3025,8 +2874,7 @@ void ndv_print_q(NDV p) NMV m; int i,len; - if ( !p ) - printf("0\n"); + if ( !p ) printf("0\n"); else { len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { @@ -3038,3 +2886,51 @@ void ndv_print_q(NDV p) printf("\n"); } } + +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_dcomp = 0; + switch ( ord->ord.simple ) { + case 0: + nd_dcomp = 1; + nd_isrlex = 1; + break; + case 1: + nd_dcomp = 1; + nd_isrlex = 0; + break; + case 9: + /* td1->td->rlex */ + nd_dcomp = -dp_nelim; + nd_isrlex = 1; + break; + default: + error("nd_gr : unsupported order"); + } +} +