=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.10 retrieving revision 1.84 diff -u -p -r1.10 -r1.84 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/07/25 14:48:16 1.10 +++ OpenXM_contrib2/asir2000/engine/nd.c 2003/10/18 01:39:42 1.84 @@ -1,10 +1,11 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.9 2003/07/25 09:04:47 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.83 2003/10/17 05:15:20 noro Exp $ */ #include "ca.h" +#include "parse.h" +#include "ox.h" #include "inline.h" +#include -#define USE_NDV 1 - #if defined(__GNUC__) #define INLINE inline #elif defined(VISUAL) @@ -13,152 +14,375 @@ #define INLINE #endif +typedef unsigned int UINT; + +#define USE_GEOBUCKET 1 +#define USE_UNROLL 1 + #define REDTAB_LEN 32003 +/* GeoBucket for polynomial addition */ + typedef struct oPGeoBucket { int m; struct oND *body[32]; } *PGeoBucket; +/* distributed polynomial; linked list rep. */ typedef struct oND { struct oNM *body; int nv; + int len; int sugar; } *ND; +/* distributed polynomial; array rep. */ typedef struct oNDV { struct oNMV *body; int nv; - int sugar; int len; + int sugar; } *NDV; +typedef union oNDC { + int m; + Q z; + P p; +} *NDC; + +/* monomial; linked list rep. */ typedef struct oNM { struct oNM *next; - int td; - int c; - unsigned int dl[1]; + union oNDC c; + UINT dl[1]; } *NM; +/* monomial; array rep. */ typedef struct oNMV { - int td; - int c; - unsigned int dl[1]; + union oNDC c; + UINT dl[1]; } *NMV; +/* history of reducer */ +typedef struct oRHist { + struct oRHist *next; + int index; + int sugar; + UINT dl[1]; +} *RHist; + +/* S-pair list */ typedef struct oND_pairs { struct oND_pairs *next; int i1,i2; - int td,sugar; - unsigned int lcm[1]; + int sugar; + UINT lcm[1]; } *ND_pairs; -static ND *nd_ps; -static NDV *nd_psv; -static unsigned int **nd_bound; -int nd_mod,nd_nvar; -int is_rlex; -int nd_epw,nd_bpe,nd_wpd; -unsigned int nd_mask[32]; -unsigned int nd_mask0,nd_mask1; -NM _nm_free_list; -ND _nd_free_list; -ND_pairs _ndp_free_list; -NM *nd_red; -int nd_red_len; +/* index and shift count for each exponent */ +typedef struct oEPOS { + int i; /* index */ + int s; /* shift */ +} *EPOS; -extern int Top,Reverse; -int nd_psn,nd_pslen; -int nd_found,nd_create,nd_notfirst; -int *nd_psl; +typedef struct oBlockMask { + int n; + struct order_pair *order_pair; + UINT **mask; +} *BlockMask; -void GC_gcollect(); -NODE append_one(NODE,int); +typedef struct oBaseSet { + int len; + NDV *ps; + UINT **bound; +} *BaseSet; -#define HTD(d) ((d)->body->td) +typedef struct oNM_ind_pair +{ + NM mul; + int index,sugar; +} *NM_ind_pair; + +typedef struct oIndArray +{ + char width; + int head; + union { + unsigned char *c; + unsigned short *s; + unsigned int *i; + } index; +} *IndArray; + +int (*ndl_compare_function)(UINT *a1,UINT *a2); + +static int ndv_alloc; +static int nd_f4_nsp=0x7fffffff; +static double nd_scale=2; +static UINT **nd_bound; +static struct order_spec *nd_ord; +static EPOS nd_epos; +static BlockMask nd_blockmask; +static int nd_nvar; +static int nd_isrlex; +static int nd_epw,nd_bpe,nd_wpd,nd_exporigin; +static UINT nd_mask[32]; +static UINT nd_mask0,nd_mask1; + +static NM _nm_free_list; +static ND _nd_free_list; +static ND_pairs _ndp_free_list; + +static NDV *nd_ps; +static NDV *nd_ps_trace; +static RHist *nd_psh; +static int nd_psn,nd_pslen; + +static RHist *nd_red; + +static int nd_found,nd_create,nd_notfirst; +static int nm_adv; +static int nmv_adv; +static int nd_dcomp; +static int nd_demand; + +extern struct order_spec dp_current_spec; +extern char *Demand; +extern VL CO; +extern int Top,Reverse,DP_Print,dp_nelim,do_weyl,NoSugar; +extern int *current_weyl_weight_vector; + +/* fundamental macros */ +#define TD(d) (d[0]) #define HDL(d) ((d)->body->dl) -#define HC(d) ((d)->body->c) +#define HTD(d) (TD(HDL(d))) +#define HCM(d) ((d)->body->c.m) +#define HCQ(d) ((d)->body->c.z) +#define HCP(d) ((d)->body->c.p) +#define CM(a) ((a)->c.m) +#define CQ(a) ((a)->c.z) +#define CP(a) ((a)->c.p) +#define DL(a) ((a)->dl) +#define SG(a) ((a)->sugar) +#define LEN(a) ((a)->len) +#define LCM(a) ((a)->lcm) +#define GET_EXP(d,a) (((d)[nd_epos[a].i]>>nd_epos[a].s)&nd_mask0) +#define GET_EXP_MASK(d,a,m) ((((d)[nd_epos[a].i]&(m)[nd_epos[a].i])>>nd_epos[a].s)&nd_mask0) +#define PUT_EXP(r,a,e) ((r)[nd_epos[a].i] |= ((e)<nv=(n); BDY(d)=(m) +#define GET_EXP_OLD(d,a) (((d)[oepos[a].i]>>oepos[a].s)&omask0) +#define PUT_EXP_OLD(r,a,e) ((r)[oepos[a].i] |= ((e)<TD(d2)?1:(TD(d1)0?TD_DL_COMPARE(d1,d2)\ + :(nd_dcomp==0?ndl_lex_compare(d1,d2)\ + :(nd_blockmask?ndl_block_compare(d1,d2)\ + :(*ndl_compare_function)(d1,d2)))) +#else +#define DL_COMPARE(d1,d2)\ +(nd_dcomp>0?TD_DL_COMPARE(d1,d2):(*ndl_compare_function)(d1,d2)) +#endif + +/* allocators */ +#define NEWRHist(r) \ +((r)=(RHist)MALLOC(sizeof(struct oRHist)+(nd_wpd-1)*sizeof(UINT))) +#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 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; +#define NEWNM_ind_pair(p)\ +((p)=(NM_ind_pair)MALLOC(sizeof(struct oNM_ind_pair))) + +/* allocate and link a new object */ +#define NEXTRHist(r,c) \ +if(!(r)){NEWRHist(r);(c)=(r);}else{NEWRHist(NEXT(c));(c)=NEXT(c);} #define NEXTNM(r,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 NEXTND_pairs(r,c) \ +if(!(r)){NEWND_pairs(r);(c)=(r);}else{NEWND_pairs(NEXT(c));(c)=NEXT(c);} +#define MKNM_ind_pair(p,m,i,s) (NEWNM_ind_pair(p),(p)->mul=(m),(p)->index=(i),(p)->sugar = (s)) + +/* deallocators */ #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) -#define NEXTND_pairs(r,c) \ -if(!(r)){NEWND_pairs(r);(c)=(r);}else{NEWND_pairs(NEXT(c));(c)=NEXT(c);} +/* macro for increasing pointer to NMV */ +#define NMV_ADV(m) (m = (NMV)(((char *)m)+nmv_adv)) +#define NMV_OADV(m) (m = (NMV)(((char *)m)+oadv)) +#define NDV_NADV(m) (m = (NMV)(((char *)m)+newadv)) +#define NMV_PREV(m) (m = (NMV)(((char *)m)-nmv_adv)) +#define NMV_OPREV(m) (m = (NMV)(((char *)m)-oadv)) -ND_pairs crit_B( ND_pairs d, int s ); -void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp); -NODE nd_setup(NODE f); -int nd_newps(ND a); +/* external functions */ +#if 1 +void GC_gcollect(); +#endif +NODE append_one(NODE,int); + +/* manipulation of coefficients */ +void nd_removecont(int mod,ND p); +void nd_removecont2(ND p1,ND p2); +void removecont_array(Q *c,int n); + +/* GeoBucket functions */ +ND normalize_pbucket(int mod,PGeoBucket g); +int head_pbucket(int mod,PGeoBucket g); +int head_pbucket_q(PGeoBucket g); +void add_pbucket_symbolic(PGeoBucket g,ND d); +void add_pbucket(int mod,PGeoBucket g,ND d); +void free_pbucket(PGeoBucket b); +void mulq_pbucket(PGeoBucket g,Q c); +NM remove_head_pbucket_symbolic(PGeoBucket g); +PGeoBucket create_pbucket(); + +/* manipulation of pairs and bases */ +int nd_newps(int mod,ND a,ND aq); +ND_pairs nd_newpairs( NODE g, int t ); ND_pairs nd_minp( ND_pairs d, ND_pairs *prest ); +ND_pairs nd_minsugarp( ND_pairs d, ND_pairs *prest ); NODE update_base(NODE nd,int ndp); -static ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest ); -int crit_2( int dp1, int dp2 ); -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(NODE f); +ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest ); +ND_pairs crit_B( ND_pairs d, int s ); +ND_pairs crit_M( ND_pairs d1 ); +ND_pairs crit_F( ND_pairs d1 ); +int crit_2( int dp1, int dp2 ); +int ndv_newps(int m,NDV a,NDV aq); + +/* top level functions */ +void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp); +void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp); +NODE nd_f4(int m); +NODE nd_gb(int m,int ishomo,int checkonly); +NODE nd_gb_trace(int m,int ishomo); + +/* ndl functions */ +int ndl_weight(UINT *d); +void ndl_weight_mask(UINT *d); +void ndl_homogenize(UINT *d,UINT *r,int obpe,EPOS oepos,int weight); +void ndl_dehomogenize(UINT *p); +void ndl_reconstruct(UINT *d,UINT *r,int obpe,EPOS oepos); +INLINE int ndl_reducible(UINT *d1,UINT *d2); +INLINE int ndl_lex_compare(UINT *d1,UINT *d2); +INLINE int ndl_block_compare(UINT *d1,UINT *d2); +INLINE int ndl_equal(UINT *d1,UINT *d2); +INLINE void ndl_copy(UINT *d1,UINT *d2); +INLINE void ndl_zero(UINT *d); +INLINE void ndl_add(UINT *d1,UINT *d2,UINT *d); +INLINE void ndl_addto(UINT *d1,UINT *d2); +INLINE void ndl_sub(UINT *d1,UINT *d2,UINT *d); +INLINE int ndl_hash_value(UINT *d); + +/* normal forms */ +INLINE int ndl_find_reducer(UINT *g); +int nd_sp(int mod,int trace,ND_pairs p,ND *nf); +int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *nf); +int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *nf); + +/* finalizers */ +NODE ndv_reducebase(NODE x); +NODE ndv_reduceall(int m,NODE f); + +/* allocators */ void nd_free_private_storage(); void _NM_alloc(); void _ND_alloc(); -int ndl_td(unsigned int *d); -ND nd_add(ND p1,ND p2); -ND nd_mul_nm(ND p,NM m0); -ND nd_mul_ind_nm(int index,NM m0); -ND nd_mul_term(ND p,int td,unsigned int *d); -int nd_sp(ND_pairs p,ND *nf); -int nd_find_reducer(ND g); -int nd_nf(ND g,int full,ND *nf); -ND nd_reduce(ND p1,ND p2); -ND nd_reduce_special(ND p1,ND p2); void nd_free(ND p); -void ndl_print(unsigned int *dl); +void nd_free_redlist(); + +/* printing */ +void ndl_print(UINT *dl); void nd_print(ND p); +void nd_print_q(ND p); void ndp_print(ND_pairs d); + + +/* setup, reconstruct */ +void nd_init_ord(struct order_spec *spec); +ND_pairs nd_reconstruct(int mod,int trace,ND_pairs ndp); +void ndv_setup(int mod,int trace,NODE f); +void nd_setup_parameters(int nvar,int max); +BlockMask nd_create_blockmask(struct order_spec *ord); +EPOS nd_create_epos(struct order_spec *ord); +int nd_get_exporigin(struct order_spec *ord); +void ndv_mod(int mod,NDV p); +NDV ndv_dup(int mod,NDV p); +ND nd_dup(ND p); + +/* ND functions */ +int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand); +void nd_mul_c(int mod,ND p,int mul); +void nd_mul_c_q(ND p,Q mul); +void nd_mul_c_p(VL vl,ND p,P mul); +ND nd_remove_head(ND p); +ND nd_separate_head(ND p,ND *head); int nd_length(ND p); -void nd_monic(ND p); -void nd_mul_c(ND p,int mul); -void nd_free_redlist(); -void nd_append_red(unsigned int *d,int td,int i); -unsigned int *nd_compute_bound(ND p); -unsigned int *dp_compute_bound(DP p); -ND_pairs nd_reconstruct(ND_pairs); -void nd_setup_parameters(); -ND nd_dup(ND p,int obpe); +void nd_append_red(UINT *d,int i); +UINT *ndv_compute_bound(NDV p); ND nd_copy(ND p); -void ndl_dup(int obpe,unsigned int *d,unsigned int *r); +ND nd_merge(ND p1,ND p2); +ND nd_add(int mod,ND p1,ND p2); +ND nd_add_q(ND p1,ND p2); +ND nd_add_sf(ND p1,ND p2); +INLINE int nd_length(ND p); +NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0); +NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0); -#if USE_NDV -#define NMV_ADV(m) (m = (NMV)(((char *)m)+nmv_adv)) -#define NEWNDV(d) ((d)=(NDV)MALLOC(sizeof(struct oNDV))) -#define MKNDV(n,m,l,d) NEWNDV(d); (d)->nv=(n); BDY(d)=(m); (d)->len = l; +/* NDV functions */ +ND weyl_ndv_mul_nm(int mod,NM m0,NDV p); +void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *tab,int tlen); +void ndv_mul_c(int mod,NDV p,int mul); +void ndv_mul_c_q(NDV p,Q mul); +ND ndv_mul_nm_symbolic(NM m0,NDV p); +ND ndv_mul_nm(int mod,NM m0,NDV p); +void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos); +NDV ndv_dup_realloc(NDV p,int obpe,int oadv,EPOS oepos); +void ndv_homogenize(NDV p,int obpe,int oadv,EPOS eops); +void ndv_dehomogenize(NDV p,struct order_spec *spec); +void ndv_removecont(int mod,NDV p); +void ndv_print(NDV p); +void ndv_print_q(NDV p); +void ndv_free(NDV p); +void ndv_save(NDV p,int index); +NDV ndv_load(int index); -int nmv_adv; -int nmv_len; -NDV ndv_red; +/* converters */ +ND ptond(VL vl,VL dvl,P p); +NDV ptondv(VL vl,VL dvl,P p); +P ndvtop(int mod,VL vl,VL dvl,NDV p); +NDV ndtondv(int mod,ND p); +ND ndvtond(int mod,NDV p); +int nm_ind_pair_to_vect(int m,UINT *s0,int n,NM_ind_pair pair,UINT *r); +IndArray nm_ind_pair_to_vect_compress(int m,UINT *s0,int n,NM_ind_pair pair); +int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r); -ND ndv_add(ND p1,NDV p2); -NDV ndtondv(ND p); -void ndv_mul_nm(NDV pv,NM m,NDV r); -ND ndv_mul_nm_create(NDV p,NM m0); -#endif +/* elimination */ +int nd_gauss_elim_mod(int **mat0,int *sugar,int row,int col,int md,int *colstat); +int nd_gauss_elim_sf(int **mat0,int *sugar,int row,int col,int md,int *colstat); void nd_free_private_storage() { - _nd_free_list = 0; _nm_free_list = 0; _ndp_free_list = 0; - nd_red = 0; +#if 0 GC_gcollect(); +#endif } void _NM_alloc() @@ -166,8 +390,8 @@ void _NM_alloc() NM p; int i; - for ( i = 0; i < 16; i++ ) { - p = (NM)GC_malloc(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int)); + for ( i = 0; i < 1024; i++ ) { + p = (NM)GC_malloc(sizeof(struct oNM)+(nd_wpd-1)*sizeof(UINT)); p->next = _nm_free_list; _nm_free_list = p; } } @@ -188,14 +412,14 @@ void _NDP_alloc() ND_pairs p; int i; - for ( i = 0; i < 10240; i++ ) { + for ( i = 0; i < 1024; i++ ) { p = (ND_pairs)GC_malloc(sizeof(struct oND_pairs) - +(nd_wpd-1)*sizeof(unsigned int)); + +(nd_wpd-1)*sizeof(UINT)); p->next = _ndp_free_list; _ndp_free_list = p; } } -INLINE nd_length(ND p) +INLINE int nd_length(ND p) { NM m; int i; @@ -208,127 +432,230 @@ INLINE nd_length(ND p) } } -INLINE int ndl_reducible(unsigned int *d1,unsigned int *d2) +INLINE int ndl_reducible(UINT *d1,UINT *d2) { - unsigned int u1,u2; + UINT u1,u2; int i,j; + if ( TD(d1) < TD(d2) ) return 0; +#if USE_UNROLL switch ( nd_bpe ) { + case 3: + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + u1 = d1[i]; u2 = d2[i]; + if ( (u1&0x38000000) < (u2&0x38000000) ) return 0; + if ( (u1& 0x7000000) < (u2& 0x7000000) ) return 0; + if ( (u1& 0xe00000) < (u2& 0xe00000) ) return 0; + if ( (u1& 0x1c0000) < (u2& 0x1c0000) ) return 0; + if ( (u1& 0x38000) < (u2& 0x38000) ) return 0; + if ( (u1& 0x7000) < (u2& 0x7000) ) return 0; + if ( (u1& 0xe00) < (u2& 0xe00) ) return 0; + if ( (u1& 0x1c0) < (u2& 0x1c0) ) return 0; + if ( (u1& 0x38) < (u2& 0x38) ) return 0; + if ( (u1& 0x7) < (u2& 0x7) ) return 0; + } + return 1; + break; case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; i < nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0xf0000000) < (u2&0xf0000000) ) return 0; - if ( (u1&0xf000000) < (u2&0xf000000) ) return 0; - if ( (u1&0xf00000) < (u2&0xf00000) ) return 0; - if ( (u1&0xf0000) < (u2&0xf0000) ) return 0; - if ( (u1&0xf000) < (u2&0xf000) ) return 0; - if ( (u1&0xf00) < (u2&0xf00) ) return 0; - if ( (u1&0xf0) < (u2&0xf0) ) return 0; - if ( (u1&0xf) < (u2&0xf) ) return 0; + if ( (u1& 0xf000000) < (u2& 0xf000000) ) return 0; + if ( (u1& 0xf00000) < (u2& 0xf00000) ) return 0; + if ( (u1& 0xf0000) < (u2& 0xf0000) ) return 0; + if ( (u1& 0xf000) < (u2& 0xf000) ) return 0; + if ( (u1& 0xf00) < (u2& 0xf00) ) return 0; + if ( (u1& 0xf0) < (u2& 0xf0) ) return 0; + if ( (u1& 0xf) < (u2& 0xf) ) return 0; } return 1; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; i < nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0x3f000000) < (u2&0x3f000000) ) return 0; - if ( (u1&0xfc0000) < (u2&0xfc0000) ) return 0; - if ( (u1&0x3f000) < (u2&0x3f000) ) return 0; - if ( (u1&0xfc0) < (u2&0xfc0) ) return 0; - if ( (u1&0x3f) < (u2&0x3f) ) return 0; + if ( (u1& 0xfc0000) < (u2& 0xfc0000) ) return 0; + if ( (u1& 0x3f000) < (u2& 0x3f000) ) return 0; + if ( (u1& 0xfc0) < (u2& 0xfc0) ) return 0; + if ( (u1& 0x3f) < (u2& 0x3f) ) return 0; } return 1; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; i < nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0xff000000) < (u2&0xff000000) ) return 0; - if ( (u1&0xff0000) < (u2&0xff0000) ) return 0; - if ( (u1&0xff00) < (u2&0xff00) ) return 0; - if ( (u1&0xff) < (u2&0xff) ) return 0; + if ( (u1& 0xff0000) < (u2& 0xff0000) ) return 0; + if ( (u1& 0xff00) < (u2& 0xff00) ) return 0; + if ( (u1& 0xff) < (u2& 0xff) ) return 0; } return 1; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; i < nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; if ( (u1&0xffff0000) < (u2&0xffff0000) ) return 0; - if ( (u1&0xffff) < (u2&0xffff) ) return 0; + if ( (u1& 0xffff) < (u2& 0xffff) ) return 0; } return 1; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = nd_exporigin; i < nd_wpd; i++ ) if ( d1[i] < d2[i] ) return 0; return 1; break; default: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; } return 1; } +#else + for ( i = nd_exporigin; 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; + } + return 1; +#endif } -void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned int *d) +/* + * If the current order is a block order, + * then the last block is length 1 and contains + * the homo variable. Otherwise, the original + * order is either 0 or 2. + */ + +void ndl_homogenize(UINT *d,UINT *r,int obpe,EPOS oepos,int weight) { - unsigned int t1,t2,u,u1,u2; - int i,j; + int w,i,e,n,omask0; + omask0 = (1<>((nd_epw-1)*nd_bpe))&nd_mask0; + for ( i = nd_exporigin; i < nd_wpd; i++ ) + d[i] = ((d[i]<>((nd_epw-1)*nd_bpe))&nd_mask0):0); + TD(d) -= h; + } + } else { + h = GET_EXP(d,nd_nvar-1); + XOR_EXP(d,nd_nvar-1,h); + TD(d) -= h; + } + } +} + +void ndl_lcm(UINT *d1,unsigned *d2,UINT *d) +{ + UINT t1,t2,u,u1,u2; + int i,j,l; + +#if USE_UNROLL switch ( nd_bpe ) { + case 3: + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + u1 = d1[i]; u2 = d2[i]; + t1 = (u1&0x38000000); t2 = (u2&0x38000000); u = t1>t2?t1:t2; + t1 = (u1& 0x7000000); t2 = (u2& 0x7000000); u |= t1>t2?t1:t2; + t1 = (u1& 0xe00000); t2 = (u2& 0xe00000); u |= t1>t2?t1:t2; + t1 = (u1& 0x1c0000); t2 = (u2& 0x1c0000); u |= t1>t2?t1:t2; + t1 = (u1& 0x38000); t2 = (u2& 0x38000); u |= t1>t2?t1:t2; + t1 = (u1& 0x7000); t2 = (u2& 0x7000); u |= t1>t2?t1:t2; + t1 = (u1& 0xe00); t2 = (u2& 0xe00); u |= t1>t2?t1:t2; + t1 = (u1& 0x1c0); t2 = (u2& 0x1c0); u |= t1>t2?t1:t2; + t1 = (u1& 0x38); t2 = (u2& 0x38); u |= t1>t2?t1:t2; + t1 = (u1& 0x7); t2 = (u2& 0x7); u |= t1>t2?t1:t2; + d[i] = u; + } + break; case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; i < nd_wpd; i++ ) { u1 = d1[i]; u2 = d2[i]; t1 = (u1&0xf0000000); t2 = (u2&0xf0000000); u = t1>t2?t1:t2; - t1 = (u1&0xf000000); t2 = (u2&0xf000000); u |= t1>t2?t1:t2; - t1 = (u1&0xf00000); t2 = (u2&0xf00000); u |= t1>t2?t1:t2; - t1 = (u1&0xf0000); t2 = (u2&0xf0000); u |= t1>t2?t1:t2; - t1 = (u1&0xf000); t2 = (u2&0xf000); u |= t1>t2?t1:t2; - t1 = (u1&0xf00); t2 = (u2&0xf00); u |= t1>t2?t1:t2; - t1 = (u1&0xf0); t2 = (u2&0xf0); u |= t1>t2?t1:t2; - t1 = (u1&0xf); t2 = (u2&0xf); u |= t1>t2?t1:t2; + t1 = (u1& 0xf000000); t2 = (u2& 0xf000000); u |= t1>t2?t1:t2; + t1 = (u1& 0xf00000); t2 = (u2& 0xf00000); u |= t1>t2?t1:t2; + t1 = (u1& 0xf0000); t2 = (u2& 0xf0000); u |= t1>t2?t1:t2; + t1 = (u1& 0xf000); t2 = (u2& 0xf000); u |= t1>t2?t1:t2; + t1 = (u1& 0xf00); t2 = (u2& 0xf00); u |= t1>t2?t1:t2; + t1 = (u1& 0xf0); t2 = (u2& 0xf0); u |= t1>t2?t1:t2; + t1 = (u1& 0xf); t2 = (u2& 0xf); u |= t1>t2?t1:t2; d[i] = u; } break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; - t1 = (u1&0x3f000); t2 = (u2&0x3f000); u |= t1>t2?t1:t2; - t1 = (u1&0xfc0); t2 = (u2&0xfc0); u |= t1>t2?t1:t2; - t1 = (u1&0x3f); t2 = (u2&0x3f); u |= t1>t2?t1:t2; + t1 = (u1& 0xfc0000); t2 = (u2& 0xfc0000); u |= t1>t2?t1:t2; + t1 = (u1& 0x3f000); t2 = (u2& 0x3f000); u |= t1>t2?t1:t2; + t1 = (u1& 0xfc0); t2 = (u2& 0xfc0); u |= t1>t2?t1:t2; + t1 = (u1& 0x3f); t2 = (u2& 0x3f); u |= t1>t2?t1:t2; d[i] = u; } break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; - t1 = (u1&0xff00); t2 = (u2&0xff00); u |= t1>t2?t1:t2; - t1 = (u1&0xff); t2 = (u2&0xff); u |= t1>t2?t1:t2; + t1 = (u1& 0xff0000); t2 = (u2& 0xff0000); u |= t1>t2?t1:t2; + t1 = (u1& 0xff00); t2 = (u2& 0xff00); u |= t1>t2?t1:t2; + t1 = (u1& 0xff); t2 = (u2& 0xff); u |= t1>t2?t1:t2; d[i] = u; } break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; + t1 = (u1& 0xffff); t2 = (u2& 0xffff); u |= t1>t2?t1:t2; d[i] = u; } break; case 32: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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 = nd_exporigin; 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; @@ -337,55 +664,160 @@ void ndl_lcm(unsigned int *d1,unsigned *d2,unsigned in } break; } +#else + for ( i = nd_exporigin; 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; + } + d[i] = u; + } +#endif + TD(d) = ndl_weight(d); + if ( nd_blockmask ) ndl_weight_mask(d); } -int ndl_td(unsigned int *d) +int ndl_weight(UINT *d) { - unsigned int t,u; + UINT t,u; int i,j; - for ( t = 0, i = 0; i < nd_wpd; i++ ) { - u = d[i]; - for ( j = 0; j < nd_epw; j++, u>>=nd_bpe ) - t += (u&nd_mask0); - } + if ( current_dl_weight_vector ) + for ( i = 0, t = 0; i < nd_nvar; i++ ) { + u = GET_EXP(d,i); + t += MUL_WEIGHT(u,i); + } + else + for ( t = 0, i = nd_exporigin; i < nd_wpd; i++ ) { + u = d[i]; + for ( j = 0; j < nd_epw; j++, u>>=nd_bpe ) + t += (u&nd_mask0); + } return t; } -INLINE int ndl_compare(unsigned int *d1,unsigned int *d2) +void ndl_weight_mask(UINT *d) { + UINT t,u; + UINT *mask; + int i,j,k,l; + + l = nd_blockmask->n; + for ( k = 0; k < l; k++ ) { + mask = nd_blockmask->mask[k]; + if ( current_dl_weight_vector ) + for ( i = 0, t = 0; i < nd_nvar; i++ ) { + u = GET_EXP_MASK(d,i,mask); + t += MUL_WEIGHT(u,i); + } + else + for ( t = 0, i = nd_exporigin; i < nd_wpd; i++ ) { + u = d[i]&mask[i]; + for ( j = 0; j < nd_epw; j++, u>>=nd_bpe ) + t += (u&nd_mask0); + } + d[k+1] = t; + } +} + +int ndl_lex_compare(UINT *d1,UINT *d2) +{ int i; - for ( i = 0; i < nd_wpd; i++, d1++, d2++ ) + d1 += nd_exporigin; + d2 += nd_exporigin; + for ( i = nd_exporigin; 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; } -INLINE int ndl_equal(unsigned int *d1,unsigned int *d2) +int ndl_block_compare(UINT *d1,UINT *d2) { - int i; + int i,l,j,ord_o,ord_l; + struct order_pair *op; + UINT t1,t2,m; + UINT *mask; - for ( i = 0; i < nd_wpd; i++ ) - if ( d1[i] != d2[i] ) - return 0; - return 1; + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0; j < l; j++ ) { + mask = nd_blockmask->mask[j]; + ord_o = op[j].order; + if ( ord_o < 2 ) + if ( (t1=d1[j+1]) > (t2=d2[j+1]) ) return 1; + else if ( t1 < t2 ) return -1; + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + m = mask[i]; + t1 = d1[i]&m; + t2 = d2[i]&m; + if ( t1 > t2 ) + return !ord_o ? -1 : 1; + else if ( t1 < t2 ) + return !ord_o ? 1 : -1; + } + } + return 0; } -INLINE void ndl_copy(unsigned int *d1,unsigned int *d2) +/* TDH -> WW -> TD-> RL */ + +int ndl_ww_lex_compare(UINT *d1,UINT *d2) { + int i,m,e1,e2; + + if ( TD(d1) > TD(d2) ) return 1; + else if ( TD(d1) < TD(d2) ) return -1; + m = nd_nvar>>1; + for ( i = 0, e1 = e2 = 0; i < m; i++ ) { + e1 += current_weyl_weight_vector[i]*(GET_EXP(d1,m+i)-GET_EXP(d1,i)); + e2 += current_weyl_weight_vector[i]*(GET_EXP(d2,m+i)-GET_EXP(d2,i)); + } + if ( e1 > e2 ) return 1; + else if ( e1 < e2 ) return -1; + return ndl_lex_compare(d1,d2); +} + +INLINE int ndl_equal(UINT *d1,UINT *d2) +{ int i; switch ( nd_wpd ) { - case 1: - d2[0] = d1[0]; + case 2: + if ( TD(d2) != TD(d1) ) return 0; + if ( d2[1] != d1[1] ) return 0; + return 1; break; + case 3: + if ( TD(d2) != TD(d1) ) return 0; + if ( d2[1] != d1[1] ) return 0; + if ( d2[2] != d1[2] ) return 0; + return 1; + break; + default: + for ( i = 0; i < nd_wpd; i++ ) + if ( *d1++ != *d2++ ) return 0; + return 1; + break; + } +} + +INLINE void ndl_copy(UINT *d1,UINT *d2) +{ + int i; + + switch ( nd_wpd ) { case 2: - d2[0] = d1[0]; + TD(d2) = TD(d1); d2[1] = d1[1]; break; + case 3: + TD(d2) = TD(d1); + d2[1] = d1[1]; + d2[2] = d1[2]; + break; default: for ( i = 0; i < nd_wpd; i++ ) d2[i] = d1[i]; @@ -393,108 +825,141 @@ INLINE void ndl_copy(unsigned int *d1,unsigned int *d2 } } -INLINE void ndl_add(unsigned int *d1,unsigned int *d2,unsigned int *d) +INLINE void ndl_zero(UINT *d) { int i; + for ( i = 0; i < nd_wpd; i++ ) d[i] = 0; +} +INLINE void ndl_add(UINT *d1,UINT *d2,UINT *d) +{ + int i; + +#if 1 switch ( nd_wpd ) { - case 1: - d[0] = d1[0]+d2[0]; - break; case 2: - d[0] = d1[0]+d2[0]; + TD(d) = TD(d1)+TD(d2); d[1] = d1[1]+d2[1]; break; + case 3: + TD(d) = TD(d1)+TD(d2); + d[1] = d1[1]+d2[1]; + d[2] = d1[2]+d2[2]; + break; default: - for ( i = 0; i < nd_wpd; i++ ) - d[i] = d1[i]+d2[i]; + for ( i = 0; i < nd_wpd; i++ ) d[i] = d1[i]+d2[i]; break; } +#else + for ( i = 0; i < nd_wpd; i++ ) d[i] = d1[i]+d2[i]; +#endif } -INLINE void ndl_add2(unsigned int *d1,unsigned int *d2) +/* d1 += d2 */ +INLINE void ndl_addto(UINT *d1,UINT *d2) { int i; +#if 1 switch ( nd_wpd ) { - case 1: - d2[0] += d1[0]; - break; case 2: - d2[0] += d1[0]; - d2[1] += d1[1]; + TD(d1) += TD(d2); + d1[1] += d2[1]; break; + case 3: + TD(d1) += TD(d2); + d1[1] += d2[1]; + d1[2] += d2[2]; + break; default: - for ( i = 0; i < nd_wpd; i++ ) - d2[i] += d1[i]; + for ( i = 0; i < nd_wpd; i++ ) d1[i] += d2[i]; break; } +#else + for ( i = 0; i < nd_wpd; i++ ) d1[i] += d2[i]; +#endif } -void ndl_sub(unsigned int *d1,unsigned int *d2,unsigned int *d) +INLINE void ndl_sub(UINT *d1,UINT *d2,UINT *d) { int i; - for ( i = 0; i < nd_wpd; i++ ) - d[i] = d1[i]-d2[i]; + for ( i = 0; i < nd_wpd; i++ ) d[i] = d1[i]-d2[i]; } -int ndl_disjoint(unsigned int *d1,unsigned int *d2) +int ndl_disjoint(UINT *d1,UINT *d2) { - unsigned int t1,t2,u,u1,u2; + UINT t1,t2,u,u1,u2; int i,j; +#if USE_UNROLL switch ( nd_bpe ) { + case 3: + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + u1 = d1[i]; u2 = d2[i]; + t1 = u1&0x38000000; t2 = u2&0x38000000; if ( t1&&t2 ) return 0; + t1 = u1& 0x7000000; t2 = u2& 0x7000000; if ( t1&&t2 ) return 0; + t1 = u1& 0xe00000; t2 = u2& 0xe00000; if ( t1&&t2 ) return 0; + t1 = u1& 0x1c0000; t2 = u2& 0x1c0000; if ( t1&&t2 ) return 0; + t1 = u1& 0x38000; t2 = u2& 0x38000; if ( t1&&t2 ) return 0; + t1 = u1& 0x7000; t2 = u2& 0x7000; if ( t1&&t2 ) return 0; + t1 = u1& 0xe00; t2 = u2& 0xe00; if ( t1&&t2 ) return 0; + t1 = u1& 0x1c0; t2 = u2& 0x1c0; if ( t1&&t2 ) return 0; + t1 = u1& 0x38; t2 = u2& 0x38; if ( t1&&t2 ) return 0; + t1 = u1& 0x7; t2 = u2& 0x7; if ( t1&&t2 ) return 0; + } + return 1; + break; case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; - t1 = u1&0xf00000; t2 = u2&0xf00000; if ( t1&&t2 ) return 0; - t1 = u1&0xf0000; t2 = u2&0xf0000; if ( t1&&t2 ) return 0; - t1 = u1&0xf000; t2 = u2&0xf000; if ( t1&&t2 ) return 0; - t1 = u1&0xf00; t2 = u2&0xf00; if ( t1&&t2 ) return 0; - t1 = u1&0xf0; t2 = u2&0xf0; if ( t1&&t2 ) return 0; - t1 = u1&0xf; t2 = u2&0xf; if ( t1&&t2 ) return 0; + t1 = u1& 0xf000000; t2 = u2& 0xf000000; if ( t1&&t2 ) return 0; + t1 = u1& 0xf00000; t2 = u2& 0xf00000; if ( t1&&t2 ) return 0; + t1 = u1& 0xf0000; t2 = u2& 0xf0000; if ( t1&&t2 ) return 0; + t1 = u1& 0xf000; t2 = u2& 0xf000; if ( t1&&t2 ) return 0; + t1 = u1& 0xf00; t2 = u2& 0xf00; if ( t1&&t2 ) return 0; + t1 = u1& 0xf0; t2 = u2& 0xf0; if ( t1&&t2 ) return 0; + t1 = u1& 0xf; t2 = u2& 0xf; if ( t1&&t2 ) return 0; } return 1; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; - t1 = u1&0x3f000; t2 = u2&0x3f000; if ( t1&&t2 ) return 0; - t1 = u1&0xfc0; t2 = u2&0xfc0; if ( t1&&t2 ) return 0; - t1 = u1&0x3f; t2 = u2&0x3f; if ( t1&&t2 ) return 0; + t1 = u1& 0xfc0000; t2 = u2& 0xfc0000; if ( t1&&t2 ) return 0; + t1 = u1& 0x3f000; t2 = u2& 0x3f000; if ( t1&&t2 ) return 0; + t1 = u1& 0xfc0; t2 = u2& 0xfc0; if ( t1&&t2 ) return 0; + t1 = u1& 0x3f; t2 = u2& 0x3f; if ( t1&&t2 ) return 0; } return 1; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; - t1 = u1&0xff00; t2 = u2&0xff00; if ( t1&&t2 ) return 0; - t1 = u1&0xff; t2 = u2&0xff; if ( t1&&t2 ) return 0; + t1 = u1& 0xff0000; t2 = u2& 0xff0000; if ( t1&&t2 ) return 0; + t1 = u1& 0xff00; t2 = u2& 0xff00; if ( t1&&t2 ) return 0; + t1 = u1& 0xff; t2 = u2& 0xff; if ( t1&&t2 ) return 0; } return 1; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; + t1 = u1& 0xffff; t2 = u2& 0xffff; if ( t1&&t2 ) return 0; } return 1; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = nd_exporigin; i < nd_wpd; i++ ) if ( d1[i] && d2[i] ) return 0; return 1; break; default: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; @@ -504,218 +969,46 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2) return 1; break; } -} - -ND nd_reduce(ND p1,ND p2) -{ - int c,c1,c2,t,td,td2,mul; - NM m2,prev,head,cur,new; - unsigned int *d; - - if ( !p1 ) - return 0; - else { - c2 = invm(HC(p2),nd_mod); - c1 = nd_mod-HC(p1); - DMAR(c1,c2,0,nd_mod,mul); - td = HTD(p1)-HTD(p2); - d = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); - ndl_sub(HDL(p1),HDL(p2),d); - prev = 0; head = cur = BDY(p1); - NEWNM(new); - for ( m2 = BDY(p2); m2; ) { - td2 = new->td = m2->td+td; - ndl_add(m2->dl,d,new->dl); - if ( !cur ) { - c1 = C(m2); - DMAR(c1,mul,0,nd_mod,c2); - C(new) = c2; - if ( !prev ) { - prev = new; - NEXT(prev) = 0; - head = prev; - } else { - NEXT(prev) = new; - NEXT(new) = 0; - prev = new; - } - m2 = NEXT(m2); - NEWNM(new); - continue; - } - if ( cur->td > td2 ) - c = 1; - else if ( cur->td < td2 ) - c = -1; - else - c = ndl_compare(cur->dl,new->dl); - switch ( c ) { - case 0: - c2 = C(m2); - c1 = C(cur); - DMAR(c2,mul,c1,nd_mod,t); - if ( t ) - C(cur) = t; - else if ( !prev ) { - head = NEXT(cur); - FREENM(cur); - cur = head; - } else { - NEXT(prev) = NEXT(cur); - FREENM(cur); - cur = NEXT(prev); - } - m2 = NEXT(m2); - break; - case 1: - prev = cur; - cur = NEXT(cur); - break; - case -1: - if ( !prev ) { - /* cur = head */ - prev = new; - c2 = C(m2); - DMAR(c2,mul,0,nd_mod,c1); - C(prev) = c1; - NEXT(prev) = head; - head = prev; - } else { - c2 = C(m2); - DMAR(c2,mul,0,nd_mod,c1); - C(new) = c1; - NEXT(prev) = new; - NEXT(new) = cur; - prev = new; - } - NEWNM(new); - m2 = NEXT(m2); - break; - } +#else + for ( i = nd_exporigin; 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; + u1 >>= nd_bpe; u2 >>= nd_bpe; } - FREENM(new); - if ( head ) { - BDY(p1) = head; - p1->sugar = MAX(p1->sugar,p2->sugar+td); - return p1; - } else { - FREEND(p1); - return 0; - } - } + return 1; +#endif } -/* HDL(p1) = HDL(p2) */ - -ND nd_reduce_special(ND p1,ND p2) +int ndl_check_bound2(int index,UINT *d2) { - int c,c1,c2,t,td,td2,mul; - NM m2,prev,head,cur,new; - - if ( !p1 ) - return 0; - else { - c2 = invm(HC(p2),nd_mod); - c1 = nd_mod-HC(p1); - DMAR(c1,c2,0,nd_mod,mul); - prev = 0; head = cur = BDY(p1); - NEWNM(new); - for ( m2 = BDY(p2); m2; ) { - td2 = new->td = m2->td; - if ( !cur ) { - c1 = C(m2); - DMAR(c1,mul,0,nd_mod,c2); - C(new) = c2; - bcopy(m2->dl,new->dl,nd_wpd*sizeof(unsigned int)); - if ( !prev ) { - prev = new; - NEXT(prev) = 0; - head = prev; - } else { - NEXT(prev) = new; - NEXT(new) = 0; - prev = new; - } - m2 = NEXT(m2); - NEWNM(new); - continue; - } - if ( cur->td > td2 ) - c = 1; - else if ( cur->td < td2 ) - c = -1; - else - c = ndl_compare(cur->dl,m2->dl); - switch ( c ) { - case 0: - c2 = C(m2); - c1 = C(cur); - DMAR(c2,mul,c1,nd_mod,t); - if ( t ) - C(cur) = t; - else if ( !prev ) { - head = NEXT(cur); - FREENM(cur); - cur = head; - } else { - NEXT(prev) = NEXT(cur); - FREENM(cur); - cur = NEXT(prev); - } - m2 = NEXT(m2); - break; - case 1: - prev = cur; - cur = NEXT(cur); - break; - case -1: - bcopy(m2->dl,new->dl,nd_wpd*sizeof(unsigned int)); - if ( !prev ) { - /* cur = head */ - prev = new; - c2 = C(m2); - DMAR(c2,mul,0,nd_mod,c1); - C(prev) = c1; - NEXT(prev) = head; - head = prev; - } else { - c2 = C(m2); - DMAR(c2,mul,0,nd_mod,c1); - C(new) = c1; - NEXT(prev) = new; - NEXT(new) = cur; - prev = new; - } - NEWNM(new); - m2 = NEXT(m2); - break; - } - } - FREENM(new); - if ( head ) { - BDY(p1) = head; - p1->sugar = MAX(p1->sugar,p2->sugar+td); - return p1; - } else { - FREEND(p1); - return 0; - } - - } -} - -int ndl_check_bound2(int index,unsigned int *d2) -{ - unsigned int u2; - unsigned int *d1; + UINT u2; + UINT *d1; int i,j,ind,k; d1 = nd_bound[index]; ind = 0; +#if USE_UNROLL switch ( nd_bpe ) { + case 3: + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + u2 = d2[i]; + if ( d1[ind++]+((u2>>27)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>24)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>21)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>18)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>15)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>12)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>9)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>6)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+((u2>>3)&0x7) >= 0x8 ) return 1; + if ( d1[ind++]+(u2&0x7) >= 0x8 ) return 1; + } + return 0; + break; case 4: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; @@ -729,7 +1022,7 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 6: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; @@ -740,7 +1033,7 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 8: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; 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; @@ -750,7 +1043,7 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 16: - for ( i = 0; i < nd_wpd; i++ ) { + for ( i = nd_exporigin; i < nd_wpd; i++ ) { u2 = d2[i]; if ( d1[ind++]+((u2>>16)&0xffff) > 0x10000 ) return 1; if ( d1[ind++]+(u2&0xffff) > 0x10000 ) return 1; @@ -758,12 +1051,12 @@ int ndl_check_bound2(int index,unsigned int *d2) return 0; break; case 32: - for ( i = 0; i < nd_wpd; i++ ) + for ( i = nd_exporigin; i < nd_wpd; i++ ) if ( d1[i]+d2[i]i1]; - p2 = nd_psv[p->i2]; - lcm = p->lcm; - td = p->td; - NEWNM(m); - C(m) = HC(p2); m->td = td-HTD(p1); ndl_sub(lcm,HDL(p1),m->dl); - if ( ndl_check_bound2(p->i1,m->dl) ) - return 0; - t1 = ndv_mul_nm_create(p1,m); - C(m) = nd_mod-HC(p1); m->td = td-HTD(p2); ndl_sub(lcm,HDL(p2),m->dl); - if ( ndl_check_bound2(p->i2,m->dl) ) { - nd_free(t1); - return 0; - } - ndv_mul_nm(p2,m,ndv_red); - FREENM(m); - *rp = ndv_add(t1,ndv_red); - return 1; -} #else -int nd_sp(ND_pairs p,ND *rp) -{ - NM m; - ND p1,p2; - ND t1,t2; - unsigned int *lcm; - int td; - - p1 = nd_ps[p->i1]; - p2 = nd_ps[p->i2]; - lcm = p->lcm; - td = p->td; - NEWNM(m); - C(m) = HC(p2); m->td = td-HTD(p1); ndl_sub(lcm,HDL(p1),m->dl); - if ( ndl_check_bound2(p->i1,m->dl) ) - return 0; - t1 = nd_mul_ind_nm(p->i1,m); - C(m) = nd_mod-HC(p1); m->td = td-HTD(p2); ndl_sub(lcm,HDL(p2),m->dl); - if ( ndl_check_bound2(p->i2,m->dl) ) { - nd_free(t1); - return 0; + for ( i = nd_exporigin; i < nd_wpd; i++ ) { + u2 = d2[i]; + k = (nd_epw-1)*nd_bpe; + for ( j = 0; j < nd_epw; j++, k -= nd_bpe ) + if ( d1[ind++]+((u2>>k)&nd_mask0) > nd_mask0 ) return 1; } - t2 = nd_mul_ind_nm(p->i2,m); - FREENM(m); - *rp = nd_add(t1,t2); - return 1; -} + return 0; #endif +} -INLINE int ndl_hash_value(int td,unsigned int *d) +INLINE int ndl_hash_value(UINT *d) { int i; int r; - r = td; + r = 0; for ( i = 0; i < nd_wpd; i++ ) r = ((r<<16)+d[i])%REDTAB_LEN; return r; } -INLINE int nd_find_reducer(ND g) +INLINE int ndl_find_reducer(UINT *dg) { - NM m; - ND p; + RHist r; int d,k,i; - d = ndl_hash_value(HTD(g),HDL(g)); - for ( m = nd_red[d], k = 0; m; m = NEXT(m), k++ ) { - if ( HTD(g) == m->td && ndl_equal(HDL(g),m->dl) ) { + d = ndl_hash_value(dg); + for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) { + if ( ndl_equal(dg,DL(r)) ) { if ( k > 0 ) nd_notfirst++; nd_found++; - return m->c; + return r->index; } } - - for ( i = 0; i < nd_psn; i++ ) { - p = nd_ps[i]; - if ( HTD(g) >= HTD(p) && ndl_reducible(HDL(g),HDL(p)) ) { - nd_create++; - nd_append_red(HDL(g),HTD(g),i); - return i; + if ( Reverse ) + for ( i = nd_psn-1; i >= 0; i-- ) { + r = nd_psh[i]; + if ( ndl_reducible(dg,DL(r)) ) { + nd_create++; + nd_append_red(dg,i); + return i; + } } - } + else + for ( i = 0; i < nd_psn; i++ ) { + r = nd_psh[i]; + if ( ndl_reducible(dg,DL(r)) ) { + nd_create++; + nd_append_red(dg,i); + return i; + } + } return -1; } -ND nd_add(ND p1,ND p2) +ND nd_merge(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 ) + 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; ) { + c = DL_COMPARE(DL(m1),DL(m2)); + switch ( c ) { + case 0: + s = m1; m1 = NEXT(m1); + can++; NEXTNM2(mr0,mr,s); + s = m2; m2 = NEXT(m2); FREENM(s); + break; + case 1: + s = m1; m1 = NEXT(m1); NEXTNM2(mr0,mr,s); + break; + case -1: + s = m2; m2 = NEXT(m2); NEXTNM2(mr0,mr,s); + break; + } + } + 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; + BDY(p1) = mr0; + SG(p1) = MAX(SG(p1),SG(p2)); + LEN(p1) = LEN(p1)+LEN(p2)-can; + FREEND(p2); return p1; + } +} + +ND nd_add(int mod,ND p1,ND p2) +{ + int n,c; + int t,can,td1,td2; + ND r; + NM m1,m2,mr0,mr,s; + + 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 { + can = 0; for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) { - if ( m1->td > m2->td ) - c = 1; - else if ( m1->td < m2->td ) - c = -1; - else - c = ndl_compare(m1->dl,m2->dl); + c = DL_COMPARE(DL(m1),DL(m2)); switch ( c ) { case 0: - t = ((C(m1))+(C(m2))) - nd_mod; - if ( t < 0 ) - t += nd_mod; + t = ((CM(m1))+(CM(m2))) - mod; + if ( t < 0 ) t += mod; s = m1; m1 = NEXT(m1); if ( t ) { - NEXTNM2(mr0,mr,s); C(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; @@ -910,200 +1199,369 @@ ND nd_add(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; - p1->sugar = MAX(p1->sugar,p2->sugar); + SG(p1) = MAX(SG(p1),SG(p2)); + LEN(p1) = LEN(p1)+LEN(p2)-can; FREEND(p2); return p1; } } -ND nd_mul_nm(ND p,NM m0) +ND nd_add_q(ND p1,ND p2) { - NM m,mr,mr0; - unsigned int *d,*dt,*dm; - int c,n,td,i,c1,c2; - int *pt,*p1,*p2; + int n,c,can; ND r; + NM m1,m2,mr0,mr,s; + Q t; - if ( !p ) - return 0; + if ( !p1 ) return p2; + else if ( !p2 ) return p1; else { - n = NV(p); m = BDY(p); - d = m0->dl; td = m0->td; c = C(m0); - mr0 = 0; - for ( ; m; m = NEXT(m) ) { - NEXTNM(mr0,mr); - c1 = C(m); - DMAR(c1,c,0,nd_mod,c2); - C(mr) = c2; - mr->td = m->td+td; - ndl_add(m->dl,d,mr->dl); + can = 0; + for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && 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 ) { + can++; NEXTNM2(mr0,mr,s); CQ(mr) = (t); + } else { + can += 2; FREENM(s); + } + s = m2; m2 = NEXT(m2); FREENM(s); + break; + case 1: + s = m1; m1 = NEXT(m1); NEXTNM2(mr0,mr,s); + break; + case -1: + s = m2; m2 = NEXT(m2); NEXTNM2(mr0,mr,s); + break; + } } - NEXT(mr) = 0; - MKND(NV(p),mr0,r); - r->sugar = p->sugar + td; - return r; + 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; + BDY(p1) = mr0; + SG(p1) = MAX(SG(p1),SG(p2)); + LEN(p1) = LEN(p1)+LEN(p2)-can; + FREEND(p2); + return p1; } } -ND nd_mul_ind_nm(int index,NM m0) +ND nd_add_sf(ND p1,ND p2) { - register int c1,c2,c; - register NM m,new,prev; - NM mr0; - unsigned int *d; - int n,td,i,len,d0,d1; - ND p,r; + int n,c,can; + ND r; + NM m1,m2,mr0,mr,s; + int t; - p = nd_ps[index]; - len = nd_psl[index]; - n = NV(p); m = BDY(p); - d = m0->dl; td = m0->td; c = C(m0); - - NEWNM(mr0); - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); C(mr0) = c2; - mr0->td = m->td+td; ndl_add(m->dl,d,mr0->dl); - prev = mr0; m = NEXT(m); - len--; - - switch ( nd_wpd ) { - case 1: - d0 = d[0]; - while ( len-- ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); - NEWNM(new); C(new) = c2; - new->td = m->td+td; new->dl[0] = m->dl[0]+d0; - m = NEXT(m); NEXT(prev) = new; prev = new; + 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; ) { + c = DL_COMPARE(DL(m1),DL(m2)); + switch ( c ) { + case 0: + t = _addsf(CM(m1),CM(m2)); + s = m1; m1 = NEXT(m1); + if ( t ) { + can++; NEXTNM2(mr0,mr,s); CM(mr) = (t); + } else { + can += 2; FREENM(s); + } + s = m2; m2 = NEXT(m2); FREENM(s); + break; + case 1: + s = m1; m1 = NEXT(m1); NEXTNM2(mr0,mr,s); + break; + case -1: + s = m2; m2 = NEXT(m2); NEXTNM2(mr0,mr,s); + break; } - break; - case 2: - d0 = d[0]; d1 = d[1]; - while ( len-- ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); - NEWNM(new); C(new) = c2; - new->td = m->td+td; - new->dl[0] = m->dl[0]+d0; - new->dl[1] = m->dl[1]+d1; - m = NEXT(m); NEXT(prev) = new; prev = new; - } - break; - default: - while ( len-- ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); - NEWNM(new); C(new) = c2; - new->td = m->td+td; ndl_add(m->dl,d,new->dl); - m = NEXT(m); NEXT(prev) = new; prev = new; - } - break; + } + 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; + BDY(p1) = mr0; + SG(p1) = MAX(SG(p1),SG(p2)); + LEN(p1) = LEN(p1)+LEN(p2)-can; + FREEND(p2); + return p1; } - - NEXT(prev) = 0; - MKND(NV(p),mr0,r); - r->sugar = p->sugar + td; - return r; } -#if 1 /* ret=1 : success, ret=0 : overflow */ -int nd_nf(ND g,int full,ND *rp) +int nd_nf(int mod,ND g,NDV *ps,int full,NDC dn,ND *rp) { - ND p,d; + ND d; NM m,mrd,tail; NM mul; int n,sugar,psugar,sugar0,stat,index; - int c,c1,c2; -#if USE_NDV - NDV red; -#else - ND red; -#endif + int c,c1,c2,dummy; + RHist h; + NDV p,red; + Q cg,cred,gcd,tq,qq; + double hmag; + if ( dn ) { + if ( mod ) + dn->m = 1; + else + dn->z = ONE; + } if ( !g ) { *rp = 0; return 1; } - sugar0 = sugar = g->sugar; + 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-1)*sizeof(UINT)); for ( d = 0; g; ) { - index = nd_find_reducer(g); + index = ndl_find_reducer(HDL(g)); if ( index >= 0 ) { - p = nd_ps[index]; - ndl_sub(HDL(g),HDL(p),mul->dl); - mul->td = HTD(g)-HTD(p); -#if 0 - if ( d && (p->sugar+mul->td) > sugar ) { - goto afo; - } -#endif - if ( ndl_check_bound2(index,mul->dl) ) { + h = nd_psh[index]; + ndl_sub(HDL(g),DL(h),DL(mul)); + if ( ndl_check_bound2(index,DL(mul)) ) { nd_free(g); nd_free(d); return 0; } - c1 = invm(HC(p),nd_mod); c2 = nd_mod-HC(g); - DMAR(c1,c2,0,nd_mod,c); C(mul) = c; -#if USE_NDV - ndv_mul_nm(nd_psv[index],mul,ndv_red); - g = ndv_add(g,ndv_red); - sugar = MAX(sugar,ndv_red->sugar); -#else - red = nd_mul_ind_nm(index,mul); - g = nd_add(g,red); - sugar = MAX(sugar,red->sugar); -#endif + if ( nd_demand ) + p = ndv_load(index); + else + p = ps[index]; + if ( mod == -1 ) + CM(mul) = _mulsf(_invsf(HCM(p)),_chsgnsf(HCM(g))); + else 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); nd_mul_c_q(g,cred); + if ( dn ) { + mulq(dn->z,cred,&tq); dn->z = 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); + nd_removecont2(d,g); + if ( dn ) { + divq(tq,HCQ(g),&qq); divq(dn->z,qq,&tq); dn->z = tq; + } + hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + } } else if ( !full ) { *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 ) - d->sugar = sugar; + if ( d ) SG(d) = sugar; *rp = d; return 1; } -#else +int nd_nf_pbucket(int mod,ND g,NDV *ps,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; + int count = 0; + int hcount = 0; + + if ( !g ) { + *rp = 0; + return 1; + } + sugar = SG(g); + n = NV(g); + if ( !mod ) hmag = ((double)p_mag((P)HCQ(g)))*nd_scale; + bucket = create_pbucket(); + add_pbucket(mod,bucket,g); + d = 0; + mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(UINT)); + while ( 1 ) { + hindex = mod?head_pbucket(mod,bucket):head_pbucket_q(bucket); + if ( hindex < 0 ) { + if ( DP_Print > 3 ) printf("(%d %d)",count,hcount); + if ( d ) SG(d) = sugar; + *rp = d; + return 1; + } + g = bucket->body[hindex]; + index = ndl_find_reducer(HDL(g)); + if ( index >= 0 ) { + count++; + if ( !d ) hcount++; + 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; + } + p = ps[index]; + if ( mod == -1 ) + CM(mul) = _mulsf(_invsf(HCM(p)),_chsgnsf(HCM(g))); + else 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,mul,p); + 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); + } + } + } +} + +/* input : list of NDV, cand : list of NDV */ + +int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand) +{ + int n,i,stat; + ND nf,d; + NDV r; + NODE t,s; + union oNDC dn; + + ndv_setup(0,0,cand); + n = length(cand); + + /* membercheck : list is a subset of Id(cand) ? */ + for ( t = input; t; t = NEXT(t) ) { +again: + if ( nd_bpe > obpe ) + r = ndv_dup_realloc((NDV)BDY(t),obpe,oadv,oepos); + else + r = (NDV)BDY(t); + d = ndvtond(0,r); + stat = nd_nf(0,d,nd_ps,0,0,&nf); + if ( !stat ) { + nd_reconstruct(0,0,0); + goto again; + } else if ( nf ) return 0; + if ( DP_Print ) { printf("."); fflush(stdout); } + } + if ( DP_Print ) { printf("\n"); } + /* gbcheck : cand is a GB of Id(cand) ? */ + if ( !nd_gb(0,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; } +ND nd_separate_head(ND p,ND *head) +{ + NM m,m0; + ND r; + + m = BDY(p); + if ( !NEXT(m) ) { + *head = p; p = 0; + } else { + m0 = m; + BDY(p) = NEXT(m); LEN(p)--; + NEXT(m0) = 0; + MKND(NV(p),m0,1,r); + *head = r; + } + return p; +} + PGeoBucket create_pbucket() { PGeoBucket g; @@ -1113,26 +1571,97 @@ PGeoBucket create_pbucket() return g; } -void add_pbucket(PGeoBucket g,ND d) +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_symbolic(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 */ - d = nd_add(g->body[k],d); - for ( ; d && nd_length(d) > 1<<(2*k); 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_merge(g->body[k],d); + for ( ; d && LEN(d) > m; k++, m <<= 1 ) { g->body[k] = 0; - d = nd_add(g->body[k+1],d); + d = nd_merge(g->body[k+1],d); } g->body[k] = d; g->m = MAX(g->m,k); } -int head_pbucket(PGeoBucket g) +void add_pbucket(int mod,PGeoBucket g,ND d) { + int l,i,k,m; + + 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 && LEN(d) > m; k++, m <<= 1 ) { + g->body[k] = 0; + 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); +} + +NM remove_head_pbucket_symbolic(PGeoBucket g) +{ + int j,i,k,c; + NM head; + + k = g->m; + j = -1; + for ( i = 0; i <= k; i++ ) { + if ( !g->body[i] ) continue; + if ( j < 0 ) j = i; + else { + c = DL_COMPARE(HDL(g->body[i]),HDL(g->body[j])); + if ( c > 0 ) + j = i; + else if ( c == 0 ) + g->body[i] = nd_remove_head(g->body[i]); + } + } + if ( j < 0 ) return 0; + else { + head = BDY(g->body[j]); + if ( !NEXT(head) ) { + FREEND(g->body[j]); + g->body[j] = 0; + } else { + BDY(g->body[j]) = NEXT(head); + LEN(g->body[j])--; + } + return head; + } +} + +int head_pbucket(int mod,PGeoBucket g) +{ int j,i,c,k,nv,sum; - unsigned int *di,*dj; + UINT *di,*dj; ND gi,gj; k = g->m; @@ -1145,157 +1674,343 @@ int head_pbucket(PGeoBucket g) j = i; gj = g->body[j]; dj = HDL(gj); - sum = HC(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 ) - HC(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 = HC(gj); + sum = HCM(gj); } else if ( c == 0 ) { - sum = sum+HC(gi)-nd_mod; - if ( sum < 0 ) - sum += nd_mod; + if ( mod == -1 ) + sum = _addsf(sum,HCM(gi)); + else { + sum = sum+HCM(gi)-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 ) { - HC(gj) = sum; + HCM(gj) = sum; return j; } else g->body[j] = nd_remove_head(gj); } } -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++ ) - r = nd_add(r,g->body[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) +/* return value = 0 => input is not a GB */ + +NODE nd_gb(int m,int ishomo,int checkonly) { - ND u,p,d,red; - NODE l; - NM m,mrd; - int sugar,psugar,n,h_reducible,h; - PGeoBucket bucket; + int i,nh,sugar,stat; + NODE r,g,t; + ND_pairs d; + ND_pairs l; + ND h,nf,s,head; + NDV nfv; + Q q; + union oNDC dn; - if ( !g ) { - return 0; + g = 0; d = 0; + for ( i = 0; i < nd_psn; i++ ) { + d = update_pairs(d,g,i); + g = update_base(g,i); } - sugar = g->sugar; - n = g->nv; - bucket = create_pbucket(); - add_pbucket(bucket,g); - d = 0; - while ( 1 ) { - h = head_pbucket(bucket); - if ( h < 0 ) { - if ( d ) - d->sugar = sugar; - return d; + sugar = 0; + while ( d ) { +again: + l = nd_minp(d,&d); + if ( SG(l) != sugar ) { + if ( ishomo ) { + for ( i = nd_psn-1; SG(nd_psh[i]) == sugar; i-- ) { + if ( nd_demand ) + nfv = ndv_load(i); + else + nfv = nd_ps[i]; + s = ndvtond(m,nfv); + s = nd_separate_head(s,&head); + nd_nf(m,s,nd_ps,1,&dn,&nf); + if ( !m ) { mulq(HCQ(head),dn.z,&q); HCQ(head) = q; } + nf = nd_add(m,head,nf); + ndv_free(nfv); + nd_removecont(m,nf); + nfv = ndtondv(m,nf); + nd_free(nf); + nd_bound[i] = ndv_compute_bound(nfv); + if ( nd_demand ) { + ndv_save(nfv,i); + ndv_free(nfv); + } else + nd_ps[i] = nfv; + } + } + sugar = SG(l); + if ( DP_Print ) fprintf(asir_out,"%d",sugar); } - 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,red->sugar); - } else if ( !full ) { - g = normalize_pbucket(bucket); - if ( g ) - g->sugar = sugar; - return g; + stat = nd_sp(m,0,l,&h); + if ( !stat ) { + NEXT(l) = d; d = l; + d = nd_reconstruct(m,0,d); + goto again; + } +#if USE_GEOBUCKET + stat = m?nd_nf_pbucket(m,h,nd_ps,!Top,&nf):nd_nf(m,h,nd_ps,!Top,0,&nf); +#else + stat = nd_nf(m,h,nd_ps,!Top,0,&nf); +#endif + if ( !stat ) { + NEXT(l) = d; d = l; + d = nd_reconstruct(m,0,d); + goto again; + } else if ( nf ) { + if ( checkonly ) return 0; + if ( DP_Print ) { printf("+"); fflush(stdout); } + nd_removecont(m,nf); + nfv = ndtondv(m,nf); nd_free(nf); + nh = ndv_newps(m,nfv,0); + d = update_pairs(d,g,nh); + g = update_base(g,nh); + FREENDP(l); } 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); - } + if ( DP_Print ) { printf("."); fflush(stdout); } + FREENDP(l); } } + if ( nd_demand ) + for ( t = g; t; t = NEXT(t) ) + BDY(t) = (pointer)ndv_load((int)BDY(t)); + else + for ( t = g; t; t = NEXT(t) ) + BDY(t) = (pointer)nd_ps[(int)BDY(t)]; + return g; } -#endif -NODE nd_gb(NODE f) +NODE nd_gb_trace(int m,int ishomo) { int i,nh,sugar,stat; - NODE r,g,gall; + NODE r,g,t; ND_pairs d; ND_pairs l; - ND h,nf; + ND h,nf,nfq,s,head; + NDV nfv,nfqv; + Q q; + union oNDC dn; - for ( gall = g = 0, d = 0, r = f; r; r = NEXT(r) ) { - i = (int)BDY(r); + g = 0; d = 0; + for ( i = 0; i < nd_psn; i++ ) { d = update_pairs(d,g,i); g = update_base(g,i); - gall = append_one(gall,i); } sugar = 0; while ( d ) { again: l = nd_minp(d,&d); - if ( l->sugar != sugar ) { - sugar = l->sugar; - fprintf(asir_out,"%d",sugar); + if ( SG(l) != sugar ) { + if ( ishomo ) { + for ( i = nd_psn-1; SG(nd_psh[i]) == sugar; i-- ) { + /* for nd_ps */ + s = ndvtond(m,nd_ps[i]); + s = nd_separate_head(s,&head); + nd_nf_pbucket(m,s,nd_ps,1,&nf); + nf = nd_add(m,head,nf); + ndv_free(nd_ps[i]); + nd_ps[i] = ndtondv(m,nf); + nd_free(nf); + + /* for nd_ps_trace */ + if ( nd_demand ) + nfv = ndv_load(i); + else + nfv = nd_ps_trace[i]; + s = ndvtond(0,nfv); + s = nd_separate_head(s,&head); + nd_nf(0,s,nd_ps_trace,1,&dn,&nf); + mulq(HCQ(head),dn.z,&q); HCQ(head) = q; + nf = nd_add(0,head,nf); + ndv_free(nfv); + nd_removecont(0,nf); + nfv = ndtondv(0,nf); + nd_free(nf); + nd_bound[i] = ndv_compute_bound(nfv); + if ( nd_demand ) { + ndv_save(nfv,i); + ndv_free(nfv); + } else + nd_ps_trace[i] = nfv; + } + } + sugar = SG(l); + if ( DP_Print ) fprintf(asir_out,"%d",sugar); } - stat = nd_sp(l,&h); + stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(d); + d = nd_reconstruct(m,1,d); goto again; } - stat = nd_nf(h,!Top,&nf); +#if USE_GEOBUCKET + stat = nd_nf_pbucket(m,h,nd_ps,!Top,&nf); +#else + stat = nd_nf(m,h,nd_ps,!Top,0,&nf); +#endif if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(d); + d = nd_reconstruct(m,1,d); goto again; } else if ( nf ) { - printf("+"); fflush(stdout); - nh = nd_newps(nf); - d = update_pairs(d,g,nh); - g = update_base(g,nh); - gall = append_one(gall,nh); - FREENDP(l); + if ( nd_demand ) { + nfqv = ndv_load(nd_psn); + nfq = ndvtond(0,nfqv); + } else + nfq = 0; + 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); + goto again; + } + } + if ( nfq ) { + /* m|HC(nfq) => failure */ + if ( !rem(NM(HCQ(nfq)),m) ) return 0; + + if ( DP_Print ) { printf("+"); fflush(stdout); } + nd_removecont(m,nf); nfv = ndtondv(m,nf); nd_free(nf); + nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq); + nh = ndv_newps(0,nfv,nfqv); + d = update_pairs(d,g,nh); + g = update_base(g,nh); + } else { + if ( DP_Print ) { printf("*"); fflush(stdout); } + } } else { - printf("."); fflush(stdout); - FREENDP(l); + if ( DP_Print ) { printf("."); fflush(stdout); } } + FREENDP(l); } + if ( nd_demand ) + for ( t = g; t; t = NEXT(t) ) + BDY(t) = (pointer)ndv_load((int)BDY(t)); + else + for ( t = g; t; t = NEXT(t) ) + BDY(t) = (pointer)nd_ps_trace[(int)BDY(t)]; return g; } +int ndv_compare(NDV *p1,NDV *p2) +{ + return DL_COMPARE(HDL(*p1),HDL(*p2)); +} + +int ndv_compare_rev(NDV *p1,NDV *p2) +{ + return -DL_COMPARE(HDL(*p1),HDL(*p2)); +} + +NODE ndv_reduceall(int m,NODE f) +{ + int i,n,stat; + ND nf,g,head; + NODE t,a0,a; + union oNDC dn; + NDV *w; + Q q; + + n = length(f); +#if 0 + w = (NDV *)ALLOCA(n*sizeof(NDV)); + for ( i = 0, t = f; i < n; i++, t = NEXT(t) ) w[i] = (NDV)BDY(t); + qsort(w,n,sizeof(NDV), + (int (*)(const void *,const void *))ndv_compare); + for ( t = f, i = 0; t; i++, t = NEXT(t) ) BDY(t) = (pointer)w[i]; +#endif + ndv_setup(m,0,f); + for ( i = 0; i < n; ) { + g = ndvtond(m,nd_ps[i]); + g = nd_separate_head(g,&head); + stat = nd_nf(m,g,nd_ps,1,&dn,&nf); + if ( !stat ) + nd_reconstruct(m,0,0); + else { + if ( DP_Print ) { printf("."); fflush(stdout); } + if ( !m ) { mulq(HCQ(head),dn.z,&q); HCQ(head) = q; } + nf = nd_add(m,head,nf); + ndv_free(nd_ps[i]); + nd_removecont(m,nf); + nd_ps[i] = ndtondv(m,nf); nd_free(nf); + nd_bound[i] = ndv_compute_bound(nd_ps[i]); + i++; + } + } + if ( DP_Print ) { printf("\n"); } + for ( a0 = 0, i = 0; i < n; i++ ) { + NEXTNODE(a0,a); + BDY(a) = (pointer)nd_ps[i]; + } + NEXT(a) = 0; + return a0; +} + ND_pairs update_pairs( ND_pairs d, NODE /* of index */ g, int t) { ND_pairs d1,nd,cur,head,prev,remove; @@ -1305,27 +2020,26 @@ ND_pairs update_pairs( ND_pairs d, NODE /* of index */ d1 = nd_newpairs(g,t); d1 = crit_M(d1); d1 = crit_F(d1); - prev = 0; cur = head = d1; - while ( cur ) { - if ( crit_2( cur->i1,cur->i2 ) ) { - remove = cur; - if ( !prev ) { - head = cur = NEXT(cur); + if ( do_weyl ) + head = d1; + else { + prev = 0; cur = head = d1; + while ( cur ) { + if ( crit_2( cur->i1,cur->i2 ) ) { + remove = cur; + if ( !prev ) head = cur = NEXT(cur); + else cur = NEXT(prev) = NEXT(cur); + FREENDP(remove); } else { - cur = NEXT(prev) = NEXT(cur); + prev = cur; cur = NEXT(cur); } - FREENDP(remove); - } else { - 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; } @@ -1334,21 +2048,19 @@ ND_pairs update_pairs( ND_pairs d, NODE /* of index */ ND_pairs nd_newpairs( NODE g, int t ) { NODE h; - unsigned int *dl; - int td,ts,s; + UINT *dl; + int ts,s; ND_pairs r,r0; - dl = HDL(nd_ps[t]); - td = HTD(nd_ps[t]); - ts = nd_ps[t]->sugar - td; + dl = DL(nd_psh[t]); + 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(HDL(nd_ps[r->i1]),dl,r->lcm); - r->td = ndl_td(r->lcm); - s = nd_ps[r->i1]->sugar-HTD(nd_ps[r->i1]); - r->sugar = MAX(s,ts) + r->td; + ndl_lcm(DL(nd_psh[r->i1]),dl,r->lcm); + 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; @@ -1357,19 +2069,19 @@ ND_pairs nd_newpairs( NODE g, int t ) ND_pairs crit_B( ND_pairs d, int s ) { ND_pairs cur,head,prev,remove; - unsigned int *t,*tl,*lcm; + UINT *t,*tl,*lcm; int td,tdl; if ( !d ) return 0; - t = HDL(nd_ps[s]); + t = DL(nd_psh[s]); prev = 0; head = cur = d; - lcm = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int)); + lcm = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); while ( cur ) { tl = cur->lcm; if ( ndl_reducible(tl,t) - && (ndl_lcm(HDL(nd_ps[cur->i1]),t,lcm),!ndl_equal(lcm,tl)) - && (ndl_lcm(HDL(nd_ps[cur->i2]),t,lcm),!ndl_equal(lcm,tl)) ) { + && (ndl_lcm(DL(nd_psh[cur->i1]),t,lcm),!ndl_equal(lcm,tl)) + && (ndl_lcm(DL(nd_psh[cur->i2]),t,lcm),!ndl_equal(lcm,tl)) ) { remove = cur; if ( !prev ) { head = cur = NEXT(cur); @@ -1378,8 +2090,7 @@ ND_pairs crit_B( ND_pairs d, int s ) } FREENDP(remove); } else { - prev = cur; - cur = NEXT(cur); + prev = cur; cur = NEXT(cur); } } return head; @@ -1388,29 +2099,23 @@ ND_pairs crit_B( ND_pairs d, int s ) ND_pairs crit_M( ND_pairs d1 ) { ND_pairs e,d2,d3,dd,p; - unsigned int *id,*jd; - int itd,jtd; + UINT *id,*jd; for ( dd = 0, e = d1; e; e = d3 ) { if ( !(d2 = NEXT(e)) ) { NEXT(e) = dd; return e; } - id = e->lcm; - itd = e->td; + id = LCM(e); for ( d3 = 0; d2; d2 = p ) { - p = NEXT(d2), - jd = d2->lcm; - jtd = d2->td; - 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; } @@ -1438,7 +2143,7 @@ ND_pairs crit_F( ND_pairs d1 ) for ( head = last = 0, p = d1; NEXT(p); ) { r = w = equivalent_pairs(p,&rest); - s = r->sugar; + s = SG(r); w = NEXT(w); while ( w ) { if ( crit_2(w->i1,w->i2) ) { @@ -1450,10 +2155,10 @@ ND_pairs crit_F( ND_pairs d1 ) FREENDP(remove); } break; - } else if ( w->sugar < s ) { + } else if ( SG(w) < s ) { FREENDP(r); r = w; - s = r->sugar; + s = SG(r); w = NEXT(w); } else { remove = w; @@ -1474,28 +2179,24 @@ ND_pairs crit_F( ND_pairs d1 ) int crit_2( int dp1, int dp2 ) { - return ndl_disjoint(HDL(nd_ps[dp1]),HDL(nd_ps[dp2])); + return ndl_disjoint(DL(nd_psh[dp1]),DL(nd_psh[dp2])); } -static ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest ) +ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest ) { ND_pairs w,p,r,s; - unsigned int *d; - int td; + UINT *d; w = d1; - d = w->lcm; - td = w->td; + d = LCM(w); s = NEXT(w); NEXT(w) = 0; for ( r = 0; s; s = p ) { p = NEXT(s); - if ( td == s->td && ndl_equal(d,s->lcm) ) { - NEXT(s) = w; - w = s; + if ( ndl_equal(d,LCM(s)) ) { + NEXT(s) = w; w = s; } else { - NEXT(s) = r; - r = s; + NEXT(s) = r; r = s; } } *prest = r; @@ -1504,16 +2205,13 @@ static ND_pairs equivalent_pairs( ND_pairs d1, ND_pair NODE update_base(NODE nd,int ndp) { - unsigned int *dl, *dln; + UINT *dl, *dln; NODE last, p, head; - int td,tdn; - dl = HDL(nd_ps[ndp]); - td = HTD(nd_ps[ndp]); + dl = DL(nd_psh[ndp]); for ( head = last = 0, p = nd; p; ) { - dln = HDL(nd_ps[(int)BDY(p)]); - tdn = HTD(nd_ps[(int)BDY(p)]); - if ( tdn >= td && ndl_reducible( dln, dl ) ) { + dln = DL(nd_psh[(int)BDY(p)]); + if ( ndl_reducible( dln, dl ) ) { p = NEXT(p); if ( last ) NEXT(last) = p; } else { @@ -1528,45 +2226,26 @@ NODE update_base(NODE nd,int ndp) 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; + UINT *lcm; + int s,td,len,tlen,c,c1; if ( !(p = NEXT(m = d)) ) { *prest = p; NEXT(m) = 0; return m; } - lcm = m->lcm; - s = m->sugar; - td = m->td; - len = nd_psl[m->i1]+nd_psl[m->i2]; - for ( ml = 0, l = m; p; p = NEXT(l = p) ) { - if (p->sugar < s) - goto find; - else if ( p->sugar == s ) { - if ( p->td < td ) - goto find; - else if ( p->td == 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 + s = SG(m); + if ( !NoSugar ) { + 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 = m->sugar; - td = m->td; - len = tlen; + } else { + for ( ml = 0, l = m; p; p = NEXT(l = p) ) + if ( DL_COMPARE(LCM(p),LCM(m)) < 0 ) { + ml = l; m = p; s = SG(m); + } } if ( !ml ) *prest = NEXT(m); else { @@ -1577,260 +2256,365 @@ find: return m; } -int nd_newps(ND a) +ND_pairs nd_minsugarp( ND_pairs d, ND_pairs *prest ) { + int msugar,i; + ND_pairs t,dm0,dm,dr0,dr; + + for ( msugar = SG(d), t = NEXT(d); t; t = NEXT(t) ) + if ( SG(t) < msugar ) msugar = SG(t); + dm0 = 0; dr0 = 0; + for ( i = 0, t = d; t; t = NEXT(t) ) + if ( i < nd_f4_nsp && SG(t) == msugar ) { + if ( dm0 ) NEXT(dm) = t; + else dm0 = t; + dm = t; + i++; + } else { + if ( dr0 ) NEXT(dr) = t; + else dr0 = t; + dr = t; + } + NEXT(dm) = 0; + if ( dr0 ) NEXT(dr) = 0; + *prest = dr0; + return dm0; +} + +int ndv_newps(int m,NDV a,NDV aq) +{ int len; + RHist r; + NDV b; if ( nd_psn == nd_pslen ) { nd_pslen *= 2; - nd_ps = (ND *)REALLOC((char *)nd_ps,nd_pslen*sizeof(ND)); - nd_psl = (int *)REALLOC((char *)nd_psl,nd_pslen*sizeof(int)); -#if USE_NDV - nd_psv = (NDV *)REALLOC((char *)nd_psv,nd_pslen*sizeof(NDV)); -#endif - nd_bound = (unsigned int **) - REALLOC((char *)nd_bound,nd_pslen*sizeof(unsigned int *)); + nd_ps = (NDV *)REALLOC((char *)nd_ps,nd_pslen*sizeof(NDV)); + nd_ps_trace = (NDV *)REALLOC((char *)nd_ps_trace,nd_pslen*sizeof(NDV)); + nd_psh = (RHist *)REALLOC((char *)nd_psh,nd_pslen*sizeof(RHist)); + nd_bound = (UINT **) + REALLOC((char *)nd_bound,nd_pslen*sizeof(UINT *)); } - nd_monic(a); + NEWRHist(r); nd_psh[nd_psn] = r; nd_ps[nd_psn] = a; - nd_psl[nd_psn] = nd_length(a); - nd_bound[nd_psn] = nd_compute_bound(a); -#if USE_NDV - nd_psv[nd_psn] = ndtondv(a); - len = nd_psv[nd_psn]->len; - if ( len > nmv_len ) { - nmv_len = 2*len; - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); + if ( aq ) { + nd_ps_trace[nd_psn] = aq; + nd_bound[nd_psn] = ndv_compute_bound(aq); + SG(r) = SG(aq); ndl_copy(HDL(aq),DL(r)); + } else { + nd_bound[nd_psn] = ndv_compute_bound(a); + SG(r) = SG(a); ndl_copy(HDL(a),DL(r)); } -#endif + if ( nd_demand ) { + if ( aq ) { + ndv_save(nd_ps_trace[nd_psn],nd_psn); + nd_ps_trace[nd_psn] = 0; + } else { + ndv_save(nd_ps[nd_psn],nd_psn); + nd_ps[nd_psn] = 0; + } + } return nd_psn++; } -NODE NODE_sortb(NODE f,int); -ND dptond(DP); -DP ndtodp(ND); - -NODE nd_setup(NODE f) +void ndv_setup(int mod,int trace,NODE f) { int i,j,td,len,max; NODE s,s0,f0; - unsigned int *d; + UINT *d; + RHist r; + NDV *w; + NDV a,am; - nd_found = 0; - nd_notfirst = 0; - nd_create = 0; -#if 0 - f0 = f = NODE_sortb(f,1); -#endif - nd_psn = length(f); nd_pslen = 2*nd_psn; - nd_ps = (ND *)MALLOC(nd_pslen*sizeof(ND)); - nd_psl = (int *)MALLOC(nd_pslen*sizeof(int)); -#if USE_NDV - nd_psv = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); -#endif - nd_bound = (unsigned int **)MALLOC(nd_pslen*sizeof(unsigned int *)); - for ( max = 0, i = 0, s = f; i < nd_psn; i++, s = NEXT(s) ) { - nd_bound[i] = d = dp_compute_bound((DP)BDY(s)); - for ( j = 0; j < nd_nvar; j++ ) - max = MAX(d[j],max); - } + nd_found = 0; nd_notfirst = 0; nd_create = 0; - 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(); - len = 0; - for ( i = 0; i < nd_psn; i++, f = NEXT(f) ) { - nd_ps[i] = dptond((DP)BDY(f)); - nd_monic(nd_ps[i]); - nd_psl[i] = nd_length(nd_ps[i]); -#if USE_NDV - nd_psv[i] = ndtondv(nd_ps[i]); - len = MAX(len,nd_psv[i]->len); -#endif + for ( nd_psn = 0, s = f; s; s = NEXT(s) ) if ( BDY(s) ) nd_psn++; + w = (NDV *)ALLOCA(nd_psn*sizeof(NDV)); + for ( i = 0, s = f; s; s = NEXT(s) ) if ( BDY(s) ) w[i++] = BDY(s); + qsort(w,nd_psn,sizeof(NDV), + (int (*)(const void *,const void *))ndv_compare); + nd_pslen = 2*nd_psn; + nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); + nd_ps_trace = (NDV *)MALLOC(nd_pslen*sizeof(NDV)); + nd_psh = (RHist *)MALLOC(nd_pslen*sizeof(RHist)); + nd_bound = (UINT **)MALLOC(nd_pslen*sizeof(UINT *)); + + if ( !nd_red ) + nd_red = (RHist *)MALLOC(REDTAB_LEN*sizeof(RHist)); + for ( i = 0; i < REDTAB_LEN; i++ ) nd_red[i] = 0; + for ( i = 0; i < nd_psn; i++ ) { + if ( trace ) { + a = nd_ps_trace[i] = ndv_dup(0,w[i]); + ndv_removecont(0,a); + am = nd_ps[i] = ndv_dup(mod,a); + ndv_mod(mod,am); + ndv_removecont(mod,am); + } else { + a = nd_ps[i] = ndv_dup(mod,w[i]); + ndv_removecont(mod,a); + } + NEWRHist(r); SG(r) = HTD(a); ndl_copy(HDL(a),DL(r)); + nd_bound[i] = ndv_compute_bound(a); + nd_psh[i] = r; + if ( nd_demand ) { + if ( trace ) { + ndv_save(nd_ps_trace[i],i); + nd_ps_trace[i] = 0; + } else { + ndv_save(nd_ps[i],i); + nd_ps[i] = 0; + } + } } - nd_red = (NM *)MALLOC(REDTAB_LEN*sizeof(NM)); -#if USE_NDV - nmv_len = 16*len; - NEWNDV(ndv_red); - BDY(ndv_red) = (NMV)MALLOC_ATOMIC(nmv_len*nmv_adv); -#endif - for ( s0 = 0, i = 0; i < nd_psn; i++ ) { - NEXTNODE(s0,s); BDY(s) = (pointer)i; - } - if ( s0 ) NEXT(s) = 0; - return s0; } -void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp) +void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp) { - struct order_spec ord1; - VL fv,vv,vc; + VL tv,fv,vv,vc; NODE fd,fd0,r,r0,t,x,s,xx; - DP a,b,c; + int e,max,nvar; + NDV b; + int ishomo; + if ( !m && Demand ) nd_demand = 1; + else nd_demand = 0; + + ndv_alloc = 0; 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"); - } - initd(ord); - nd_mod = m; - for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { - ptod(CO,vv,(P)BDY(t),&b); - _dp_mod(b,m,0,&c); - if ( c ) { - NEXTNODE(fd0,fd); BDY(fd) = (pointer)c; + for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); + nd_init_ord(ord); + for ( t = BDY(f), max = 0; t; t = NEXT(t) ) + for ( tv = vv; tv; tv = NEXT(tv) ) { + e = getdeg(tv->v,(P)BDY(t)); + max = MAX(e,max); } + nd_setup_parameters(nvar,max); + ishomo = 1; + for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { + b = (pointer)ptondv(CO,vv,(P)BDY(t)); + if ( ishomo ) + ishomo = ishomo && ndv_ishomo(b); + if ( m ) ndv_mod(m,b); + if ( b ) { NEXTNODE(fd0,fd); BDY(fd) = (pointer)b; } } if ( fd0 ) NEXT(fd) = 0; - s = nd_setup(fd0); - x = nd_gb(s); -#if 0 - x = nd_reduceall(x,m); -#endif - for ( r0 = 0; x; x = NEXT(x) ) { + ndv_setup(m,0,fd0); + x = f4?nd_f4(m):nd_gb(m,ishomo,0); + nd_demand = 0; + x = ndv_reducebase(x); + x = ndv_reduceall(m,x); + for ( r0 = 0, t = x; t; t = NEXT(t) ) { NEXTNODE(r0,r); - a = ndtodp(nd_ps[(int)BDY(x)]); - _dtop_mod(CO,vv,a,(P *)&BDY(r)); + BDY(r) = ndvtop(m,CO,vv,BDY(t)); } if ( r0 ) NEXT(r) = 0; MKLIST(*rp,r0); - fprintf(asir_out,"found=%d,notfirst=%d,create=%d\n", - nd_found,nd_notfirst,nd_create); + fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); } -void dltondl(int n,DL dl,unsigned int *r) +void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp) { - unsigned int *d; - int i; + struct order_spec ord1; + VL tv,fv,vv,vc; + NODE fd,fd0,in0,in,r,r0,t,s,cand; + int m,nocheck,nvar,mindex,e,max; + NDV c; + NMV a; + P p; + EPOS oepos; + int obpe,oadv,wmax,i,len,cbpe,ishomo; + get_vars((Obj)f,&fv); pltovl(v,&vv); + for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); + nocheck = 0; + mindex = 0; + + if ( Demand ) nd_demand = 1; + else nd_demand = 0; + + /* setup modulus */ + if ( trace < 0 ) { + trace = -trace; + nocheck = 1; + } + m = trace > 1 ? trace : get_lprime(mindex); + for ( t = BDY(f), max = 0; t; t = NEXT(t) ) + for ( tv = vv; tv; tv = NEXT(tv) ) { + e = getdeg(tv->v,(P)BDY(t)); + max = MAX(e,max); + } + nd_init_ord(ord); + nd_setup_parameters(nvar,max); + obpe = nd_bpe; oadv = nmv_adv; oepos = nd_epos; + ishomo = 1; + for ( in0 = 0, fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { + c = ptondv(CO,vv,(P)BDY(t)); + if ( ishomo ) + ishomo = ishomo && ndv_ishomo(c); + if ( c ) { + NEXTNODE(in0,in); BDY(in) = (pointer)c; + NEXTNODE(fd0,fd); BDY(fd) = (pointer)ndv_dup(0,c); + } + } + if ( in0 ) NEXT(in) = 0; + if ( fd0 ) NEXT(fd) = 0; + if ( !ishomo && homo ) { + for ( t = in0, wmax = 0; t; t = NEXT(t) ) { + c = (NDV)BDY(t); len = LEN(c); + for ( a = BDY(c), i = 0; i < len; i++, NMV_ADV(a) ) + wmax = MAX(TD(DL(a)),wmax); + } + homogenize_order(ord,nvar,&ord1); + nd_init_ord(&ord1); + nd_setup_parameters(nvar+1,wmax); + for ( t = fd0; t; t = NEXT(t) ) + ndv_homogenize((NDV)BDY(t),obpe,oadv,oepos); + } + while ( 1 ) { + if ( Demand ) + nd_demand = 1; + ndv_setup(m,1,fd0); + cand = nd_gb_trace(m,ishomo || homo); + if ( !cand ) { + /* failure */ + if ( trace > 1 ) { *rp = 0; return; } + else m = get_lprime(++mindex); + continue; + } + if ( !ishomo && homo ) { + /* dehomogenization */ + for ( t = cand; t; t = NEXT(t) ) ndv_dehomogenize((NDV)BDY(t),ord); + nd_init_ord(ord); + nd_setup_parameters(nvar,0); + } + nd_demand = 0; + cand = ndv_reducebase(cand); + cand = ndv_reduceall(0,cand); + cbpe = nd_bpe; + if ( nocheck ) + break; + if ( ndv_check_candidate(in0,obpe,oadv,oepos,cand) ) + /* success */ + break; + else if ( trace > 1 ) { + /* failure */ + *rp = 0; return; + } else { + /* try the next modulus */ + m = get_lprime(++mindex); + /* reset the parameters */ + if ( !ishomo && homo ) { + nd_init_ord(&ord1); + nd_setup_parameters(nvar+1,wmax); + } else { + nd_init_ord(ord); + nd_setup_parameters(nvar,max); + } + } + } + /* dp->p */ + nd_bpe = cbpe; + nd_setup_parameters(nd_nvar,0); + for ( r = cand; r; r = NEXT(r) ) BDY(r) = (pointer)ndvtop(0,CO,vv,BDY(r)); + MKLIST(*rp,cand); +} + +void dltondl(int n,DL dl,UINT *r) +{ + UINT *d; + int i,j,l,s,ord_l; + struct order_pair *op; + d = dl->d; - bzero(r,nd_wpd*sizeof(unsigned int)); - if ( is_rlex ) - for ( i = 0; i < n; i++ ) - r[(n-1-i)/nd_epw] |= (d[i]<<((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)); - else - for ( i = 0; i < n; i++ ) - r[i/nd_epw] |= d[i]<<((nd_epw-(i%nd_epw)-1)*nd_bpe); + for ( i = 0; i < nd_wpd; i++ ) r[i] = 0; + if ( nd_blockmask ) { + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0, s = 0; j < l; j++ ) { + ord_l = op[j].length; + for ( i = 0; i < ord_l; i++, s++ ) PUT_EXP(r,s,d[s]); + } + TD(r) = ndl_weight(r); + ndl_weight_mask(r); + } else { + for ( i = 0; i < n; i++ ) PUT_EXP(r,i,d[i]); + TD(r) = ndl_weight(r); + } } -DL ndltodl(int n,int td,unsigned int *ndl) +DL ndltodl(int n,UINT *ndl) { DL dl; int *d; - int i; + int i,j,l,s,ord_l; + struct order_pair *op; NEWDL(dl,n); - dl->td = td; + dl->td = TD(ndl); d = dl->d; - if ( is_rlex ) - for ( i = 0; i < n; i++ ) - d[i] = (ndl[(n-1-i)/nd_epw]>>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) - &((1<>((nd_epw-(i%nd_epw)-1)*nd_bpe)) - &((1<n; + op = nd_blockmask->order_pair; + for ( j = 0, s = 0; j < l; j++ ) { + ord_l = op[j].length; + for ( i = 0; i < ord_l; i++, s++ ) d[s] = GET_EXP(ndl,s); + } + } else { + for ( i = 0; i < n; i++ ) d[i] = GET_EXP(ndl,i); + } return dl; } -ND dptond(DP p) +void ndl_print(UINT *dl) { - ND d; - NM m0,m; - MP t; int n; + int i,j,l,ord_l,s,s0; + struct order_pair *op; - if ( !p ) - return 0; - n = NV(p); - m0 = 0; - for ( t = BDY(p); t; t = NEXT(t) ) { - NEXTNM(m0,m); - m->c = ITOS(t->c); - m->td = t->dl->td; - dltondl(n,t->dl,m->dl); + n = nd_nvar; + printf("<<"); + if ( nd_blockmask ) { + l = nd_blockmask->n; + op = nd_blockmask->order_pair; + for ( j = 0, s = s0 = 0; j < l; j++ ) { + ord_l = op[j].length; + for ( i = 0; i < ord_l; i++, s++ ) + printf(s==n-1?"%d":"%d,",GET_EXP(dl,s)); + } + } else { + for ( i = 0; i < n; i++ ) printf(i==n-1?"%d":"%d,",GET_EXP(dl,i)); } - NEXT(m) = 0; - MKND(n,m0,d); - d->nv = n; - d->sugar = p->sugar; - return d; + printf(">>"); } -DP ndtodp(ND p) +void nd_print(ND p) { - DP d; - MP m0,m; - NM t; - int n; + NM m; if ( !p ) - return 0; - n = NV(p); - m0 = 0; - for ( t = BDY(p); t; t = NEXT(t) ) { - NEXTMP(m0,m); - m->c = STOI(t->c); - m->dl = ndltodl(n,t->td,t->dl); + printf("0\n"); + else { + for ( m = BDY(p); m; m = NEXT(m) ) { + if ( CM(m) & 0x80000000 ) printf("+@_%d*",IFTOF(CM(m))); + else printf("+%d*",CM(m)); + ndl_print(DL(m)); + } + printf("\n"); } - NEXT(m) = 0; - MKDP(n,m0,d); - d->sugar = p->sugar; - return d; } -void ndl_print(unsigned int *dl) +void nd_print_q(ND p) { - int n; - int i; - - n = nd_nvar; - printf("<<"); - if ( is_rlex ) - for ( i = 0; i < n; i++ ) - printf(i==n-1?"%d":"%d,", - (dl[(n-1-i)/nd_epw]>>((nd_epw-((n-1-i)%nd_epw)-1)*nd_bpe)) - &((1<>((nd_epw-(i%nd_epw)-1)*nd_bpe)) - &((1<>"); -} - -void nd_print(ND p) -{ NM m; if ( !p ) printf("0\n"); else { for ( m = BDY(p); m; m = NEXT(m) ) { - printf("+%d*",m->c); - ndl_print(m->dl); + printf("+"); + printexpr(CO,(Obj)CQ(m)); + printf("*"); + ndl_print(DL(m)); } printf("\n"); } @@ -1840,40 +2624,205 @@ 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"); } -void nd_monic(ND p) +void nd_removecont(int mod,ND p) { - if ( !p ) - return; - else - nd_mul_c(p,invm(HC(p),nd_mod)); + int i,n; + Q *w; + Q 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)); + v.len = n; + v.body = (pointer *)w; + 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]; + } } -void nd_mul_c(ND p,int mul) +void nd_removecont2(ND p1,ND p2) { + int i,n1,n2,n; + Q *w; + Q dvr,t; NM m; + struct oVECT v; + N q,r; + + if ( !p1 ) { + nd_removecont(0,p2); return; + } else if ( !p2 ) { + nd_removecont(0,p1); return; + } + n1 = nd_length(p1); + n2 = nd_length(p2); + n = n1+n2; + 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); + 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]; +} + +void ndv_removecont(int mod,NDV p) +{ + int i,len; + Q *w; + Q dvr,t; + NMV m; + + if ( mod == -1 ) + ndv_mul_c(mod,p,_invsf(HCM(p))); + else if ( mod ) + 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; + } + } +} + +void ndv_homogenize(NDV p,int obpe,int oadv,EPOS oepos) +{ + int len,i,max; + NMV m,mr0,mr,t; + + len = p->len; + for ( m = BDY(p), i = 0, max = 0; i < len; NMV_OADV(m), i++ ) + max = MAX(max,TD(DL(m))); + 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) ) { + ndl_homogenize(DL(m),DL(t),obpe,oepos,max); + CQ(mr) = CQ(m); + ndl_copy(DL(t),DL(mr)); + } + NV(p)++; + BDY(p) = mr0; +} + +void ndv_dehomogenize(NDV p,struct order_spec *ord) +{ + int i,j,adj,len,newnvar,newwpd,newadv,newexporigin; + Q *w; + Q dvr,t; + NMV m,r; + + len = p->len; + newnvar = nd_nvar-1; + newexporigin = nd_get_exporigin(ord); + newwpd = newnvar/nd_epw+(newnvar%nd_epw?1:0)+newexporigin; + for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) + ndl_dehomogenize(DL(m)); + if ( newwpd != nd_wpd ) { + newadv = 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); + for ( j = 0; j < newexporigin; j++ ) DL(r)[j] = DL(m)[j]; + adj = nd_exporigin-newexporigin; + for ( ; j < newwpd; j++ ) DL(r)[j] = DL(m)[j+adj]; + } + } + NV(p)--; +} + +void removecont_array(Q *c,int n) +{ + struct oVECT v; + Q d0,d1,a,u,u1,gcd; + int i; + N qn,rn,gn; + Q *q,*r; + + q = (Q *)ALLOCA(n*sizeof(Q)); + r = (Q *)ALLOCA(n*sizeof(Q)); + 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]); + } + 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); + 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; + } + } + for ( i = 0; i < n; i++ ) c[i] = q[i]; +} + +void nd_mul_c(int mod,ND p,int mul) +{ + NM m; int c,c1; - if ( !p ) - return; + if ( !p ) return; + if ( mod == -1 ) + for ( m = BDY(p); m; m = NEXT(m) ) + CM(m) = _mulsf(CM(m),mul); + else + for ( m = BDY(p); m; m = NEXT(m) ) { + c1 = CM(m); DMAR(c1,mul,0,mod,c); CM(m) = c; + } +} + +void nd_mul_c_q(ND p,Q mul) +{ + NM m; + Q c; + + if ( !p ) return; for ( m = BDY(p); m; m = NEXT(m) ) { - c1 = C(m); - DMAR(c1,mul,0,nd_mod,c); - C(m) = c; + mulq(CQ(m),mul,&c); CQ(m) = c; } } +void nd_mul_c_p(VL vl,ND p,P mul) +{ + NM m; + P c; + + if ( !p ) return; + for ( m = BDY(p); m; m = NEXT(m) ) { + mulp(vl,CP(m),mul,&c); CP(m) = c; + } +} + void nd_free(ND p) { NM t,s; - if ( !p ) - return; + if ( !p ) return; t = BDY(p); while ( t ) { s = NEXT(t); @@ -1883,75 +2832,94 @@ void nd_free(ND p) FREEND(p); } -void nd_append_red(unsigned int *d,int td,int i) +void ndv_free(NDV p) { - NM m,m0; + GC_free(BDY(p)); +} + +void nd_append_red(UINT *d,int i) +{ + RHist m,m0; int h; - NEWNM(m); - h = ndl_hash_value(td,d); - m->c = i; - m->td = td; - ndl_copy(d,m->dl); + NEWRHist(m); + h = ndl_hash_value(d); + m->index = i; + ndl_copy(d,DL(m)); NEXT(m) = nd_red[h]; nd_red[h] = m; } -unsigned int *dp_compute_bound(DP p) +UINT *ndv_compute_bound(NDV p) { - unsigned int *d,*d1,*d2,*t; - MP m; - int i,l; + UINT *d1,*d2,*t; + UINT u; + int i,j,k,l,len,ind; + NMV m; if ( !p ) return 0; - d1 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int)); - d2 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int)); - m = BDY(p); - bcopy(m->dl->d,d1,nd_nvar*sizeof(unsigned int)); - for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { - d = m->dl->d; - for ( i = 0; i < nd_nvar; i++ ) - d2[i] = d[i] > d1[i] ? d[i] : d1[i]; + 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); NMV_ADV(m); + for ( i = 1; i < len; i++, NMV_ADV(m) ) { + ndl_lcm(DL(m),d1,d2); t = d1; d1 = d2; d2 = t; } - l = ((nd_nvar+(sizeof(unsigned int)-1)) - /sizeof(unsigned int))*sizeof(unsigned int); - t = (unsigned int *)MALLOC_ATOMIC(l*sizeof(unsigned int)); - bzero(t,l*sizeof(unsigned int)); - bcopy(d1,t,nd_nvar*sizeof(unsigned int)); + 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; } -unsigned int *nd_compute_bound(ND p) +int nd_get_exporigin(struct order_spec *ord) { - unsigned int *d1,*d2,*t; - int i,l; - NM m; - - if ( !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)); - for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) { - ndl_lcm(m->dl,d1,d2); - t = d1; d1 = d2; d2 = t; + switch ( ord->id ) { + case 0: + return 1; + case 1: + /* block order */ + /* d[0]:weight d[1]:w0,...,d[nd_exporigin-1]:w(n-1) */ + return ord->ord.block.length+1; + case 2: + error("nd_get_exporigin : matrix order is not supported yet."); } - l = ((nd_nvar+(sizeof(unsigned int)-1)) - /sizeof(unsigned int))*sizeof(unsigned int); - t = (unsigned int *)MALLOC_ATOMIC(l*sizeof(unsigned int)); - bzero(t,l*sizeof(unsigned int)); - for ( i = 0; i < nd_nvar; i++ ) - t[i] = (d1[i/nd_epw]>>((nd_epw-(i%nd_epw)-1)*nd_bpe))&nd_mask0; - return t; } -void nd_setup_parameters() { - int i; +void nd_setup_parameters(int nvar,int max) { + int i,j,n,elen,ord_o,ord_l,l,s,wpd; + struct order_pair *op; - nd_epw = (sizeof(unsigned int)*8)/nd_bpe; - nd_wpd = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0); + nd_nvar = nvar; + if ( max ) { + /* XXX */ + if ( do_weyl ) nd_bpe = 32; + else if ( max < 2 ) nd_bpe = 1; + else if ( max < 4 ) nd_bpe = 2; + else if ( max < 8 ) nd_bpe = 3; + else if ( max < 16 ) nd_bpe = 4; + else if ( max < 32 ) nd_bpe = 5; + else if ( max < 64 ) nd_bpe = 6; + else if ( max < 256 ) nd_bpe = 8; + else if ( max < 1024 ) nd_bpe = 10; + else if ( max < 65536 ) nd_bpe = 16; + else nd_bpe = 32; + } + nd_epw = (sizeof(UINT)*8)/nd_bpe; + elen = nd_nvar/nd_epw+(nd_nvar%nd_epw?1:0); + nd_exporigin = nd_get_exporigin(nd_ord); + wpd = nd_exporigin+elen; + if ( wpd != nd_wpd ) { + nd_free_private_storage(); + nd_wpd = wpd; + } if ( nd_bpe < 32 ) { nd_mask0 = (1<= 0; i-- ) ndv_realloc(nd_ps[i],obpe,oadv,oepos); + if ( trace ) + for ( i = nd_psn-1; i >= 0; i-- ) + ndv_realloc(nd_ps_trace[i],obpe,oadv,oepos); s0 = 0; for ( t = d; t; t = NEXT(t) ) { NEXTND_pairs(s0,s); s->i1 = t->i1; s->i2 = t->i2; - s->td = t->td; - s->sugar = t->sugar; - ndl_dup(obpe,t->lcm,s->lcm); + SG(s) = SG(t); + ndl_reconstruct(LCM(t),LCM(s),obpe,oepos); } + + old_red = (RHist *)ALLOCA(REDTAB_LEN*sizeof(RHist)); for ( i = 0; i < REDTAB_LEN; i++ ) { - for ( mr0 = 0, m = nd_red[i]; m; m = NEXT(m) ) { - NEXTNM(mr0,mr); - mr->c = m->c; - mr->td = m->td; - ndl_dup(obpe,m->dl,mr->dl); + old_red[i] = nd_red[i]; + nd_red[i] = 0; + } + for ( i = 0; i < REDTAB_LEN; i++ ) + for ( r = old_red[i]; r; r = NEXT(r) ) { + NEWRHist(mr); + mr->index = r->index; + SG(mr) = SG(r); + ndl_reconstruct(DL(r),DL(mr),obpe,oepos); + 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]); + ndl_reconstruct(DL(nd_psh[i]),DL(r),obpe,oepos); + nd_psh[i] = r; } if ( s0 ) NEXT(s) = 0; prev_nm_free_list = 0; prev_ndp_free_list = 0; -#if USE_NDV - BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv); -#endif +#if 0 GC_gcollect(); +#endif return s0; } -void ndl_dup(int obpe,unsigned int *d,unsigned int *r) +void ndl_reconstruct(UINT *d,UINT *r,int obpe,EPOS oepos) { - int n,i,ei,oepw,cepw,cbpe; + int n,i,ei,oepw,omask0,j,s,ord_l,l; + struct order_pair *op; n = nd_nvar; - oepw = (sizeof(unsigned int)*8)/obpe; - cepw = nd_epw; - cbpe = nd_bpe; - if ( is_rlex ) - for ( i = 0; i < n; i++ ) { - ei = (d[(n-1-i)/oepw]>>((oepw-((n-1-i)%oepw)-1)*obpe)) - &((1<n; + op = nd_blockmask->order_pair; + for ( i = 1; i < nd_exporigin; i++ ) + r[i] = d[i]; + for ( j = 0, s = 0; j < l; j++ ) { + ord_l = op[j].length; + for ( i = 0; i < ord_l; i++, s++ ) { + ei = GET_EXP_OLD(d,s); + PUT_EXP(r,s,ei); + } } - else + } else { for ( i = 0; i < n; i++ ) { - ei = (d[i/oepw]>>((oepw-(i%oepw)-1)*obpe)) - &((1<td = m->td; - ndl_dup(obpe,m->dl,mr->dl); + CM(mr) = CM(m); + ndl_copy(DL(m),DL(mr)); } NEXT(mr) = 0; - MKND(NV(p),mr0,r); - r->sugar = p->sugar; + MKND(NV(p),mr0,LEN(p),r); + SG(r) = SG(p); return r; } } -ND nd_copy(ND p) +int nd_sp(int mod,int trace,ND_pairs p,ND *rp) { - NM m,mr,mr0; - int c,n,s; - ND r; + NM m; + NDV p1,p2; + ND t1,t2; + UINT *lcm; + int td; - if ( !p ) + if ( !mod && nd_demand ) { + p1 = ndv_load(p->i1); p2 = ndv_load(p->i2); + } else { + if ( trace ) { + p1 = nd_ps_trace[p->i1]; p2 = nd_ps_trace[p->i2]; + } else { + p1 = nd_ps[p->i1]; p2 = nd_ps[p->i2]; + } + } + lcm = LCM(p); + NEWNM(m); + CQ(m) = HCQ(p2); + ndl_sub(lcm,HDL(p1),DL(m)); + if ( ndl_check_bound2(p->i1,DL(m)) ) return 0; - else { - s = sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int); - for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { - NEXTNM(mr0,mr); - C(mr) = C(m); - mr->td = m->td; - ndl_copy(m->dl,mr->dl); + 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)); + ndl_sub(lcm,HDL(p2),DL(m)); + if ( ndl_check_bound2(p->i2,DL(m)) ) { + nd_free(t1); + return 0; + } + t2 = ndv_mul_nm(mod,m,p2); + *rp = nd_add(mod,t1,t2); + FREENM(m); + return 1; +} + +void ndv_mul_c(int mod,NDV p,int mul) +{ + NMV m; + int c,c1,len,i; + + if ( !p ) return; + len = LEN(p); + if ( mod == -1 ) + for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) + CM(m) = _mulsf(CM(m),mul); + else + for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { + c1 = CM(m); DMAR(c1,mul,0,mod,c); CM(m) = c; } - NEXT(mr) = 0; - MKND(NV(p),mr0,r); - r->sugar = p->sugar; - return r; +} + +void ndv_mul_c_q(NDV p,Q mul) +{ + NMV m; + Q 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; } } -#if USE_NDV -void ndv_mul_nm(NDV p,NM m0,NDV r) +ND weyl_ndv_mul_nm(int mod,NM m0,NDV p) { + int n2,i,j,l,n,tlen; + UINT *d0; + NM *tab,*psum; + ND s,r; + NM t; + NMV m1; + + if ( !p ) return 0; + n = NV(p); n2 = n>>1; + d0 = DL(m0); + l = LEN(p); + for ( i = 0, tlen = 1; i < n2; i++ ) tlen *= (GET_EXP(d0,n2+i)+1); + tab = (NM *)ALLOCA(tlen*sizeof(NM)); + psum = (NM *)ALLOCA(tlen*sizeof(NM)); + for ( i = 0; i < tlen; i++ ) psum[i] = 0; + m1 = (NMV)(((char *)BDY(p))+nmv_adv*(l-1)); + for ( i = l-1; i >= 0; i--, NMV_PREV(m1) ) { + /* m0(NM) * m1(NMV) => tab(NM) */ + weyl_mul_nm_nmv(n,mod,m0,m1,tab,tlen); + for ( j = 0; j < tlen; j++ ) { + if ( tab[j] ) { + NEXT(tab[j]) = psum[j]; psum[j] = tab[j]; + } + } + } + for ( i = tlen-1, r = 0; i >= 0; i-- ) + if ( psum[i] ) { + for ( j = 0, t = psum[i]; t; t = NEXT(t), j++ ); + MKND(n,psum[i],j,s); + r = nd_add(mod,r,s); + } + if ( r ) SG(r) = SG(p)+TD(d0); + return r; +} + +/* product of monomials */ +/* XXX block order is not handled correctly */ + +void weyl_mul_nm_nmv(int n,int mod,NM m0,NMV m1,NM *tab,int tlen) { - NMV m,mr,mr0; - unsigned int *d,*dt,*dm; - int c,n,td,i,c1,c2,len; + 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; + UINT c0,c1,c; + NM *p; + NM m,t; - if ( !p ) - /* XXX */ - r->len = 0; - else { - n = NV(p); m = BDY(p); len = p->len; - d = m0->dl; td = m0->td; c = C(m0); - mr = BDY(r); - for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) { - c1 = C(m); DMAR(c1,c,0,nd_mod,c2); C(mr) = c2; - mr->td = m->td+td; ndl_add(m->dl,d,mr->dl); + for ( i = 0; i < tlen; i++ ) tab[i] = 0; + if ( !m0 || !m1 ) return; + d0 = DL(m0); d1 = DL(m1); n2 = n>>1; + NEWNM(m); d = DL(m); + 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)); + for ( i = 0; i < nd_wpd; i++ ) d[i] = 0; + homo = n&1 ? 1 : 0; + if ( homo ) { + /* offset of h-degree */ + h = GET_EXP(d0,n-1)+GET_EXP(d1,n-1); + PUT_EXP(DL(m),n-1,h); + TD(DL(m)) = h; + if ( nd_blockmask ) ndl_weight_mask(DL(m)); + } + tab[0] = m; + NEWNM(m); d = DL(m); + for ( i = 0, curlen = 1; i < n2; i++ ) { + a = GET_EXP(d0,i); b = GET_EXP(d1,n2+i); + k = GET_EXP(d0,n2+i); l = GET_EXP(d1,i); + /* xi^a*(Di^k*xi^l)*Di^b */ + a += l; b += k; + s = MUL_WEIGHT(a,i)+MUL_WEIGHT(b,n2+i); + if ( !k || !l ) { + for ( j = 0; j < curlen; j++ ) + if ( t = tab[j] ) { + dt = DL(t); + PUT_EXP(dt,i,a); PUT_EXP(dt,n2+i,b); TD(dt) += s; + if ( nd_blockmask ) ndl_weight_mask(dt); + } + curlen *= k+1; + continue; } - NV(r) = NV(p); - r->len = p->len; - r->sugar = p->sugar + td; + min = MIN(k,l); + if ( mod ) { + 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); + } + for ( j = min; j >= 0; j-- ) { + for ( u = 0; u < nd_wpd; u++ ) d[u] = 0; + PUT_EXP(d,i,a-j); PUT_EXP(d,n2+i,b-j); + h = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i); + if ( homo ) { + TD(d) = s; + PUT_EXP(d,n-1,s-h); + } else TD(d) = h; + if ( nd_blockmask ) ndl_weight_mask(d); + if ( mod ) c = ctab[j]; + else q = ctab_q[j]; + p = tab+curlen*j; + if ( j == 0 ) { + for ( u = 0; u < curlen; u++, p++ ) { + if ( tab[u] ) { + ndl_addto(DL(tab[u]),d); + 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; + } + } + } + } else { + for ( u = 0; u < curlen; u++, p++ ) { + if ( tab[u] ) { + NEWNM(t); + ndl_add(DL(tab[u]),d,DL(t)); + if ( mod ) { + c0 = CM(tab[u]); DMAR(c0,c,0,mod,c1); CM(t) = c1; + } else + mulq(CQ(tab[u]),q,&CQ(t)); + *p = t; + } + } + } + } + curlen *= k+1; } + FREENM(m); } -ND ndv_mul_nm_create(NDV p,NM m0) +ND ndv_mul_nm_symbolic(NM m0,NDV p) { NM mr,mr0; NMV m; - unsigned int *d,*dt,*dm; + UINT *d,*dt,*dm; int c,n,td,i,c1,c2,len; + Q q; ND r; - if ( !p ) - return 0; + if ( !p ) return 0; else { n = NV(p); m = BDY(p); - d = m0->dl; td = m0->td; c = C(m0); - len = p->len; + d = DL(m0); + len = LEN(p); mr0 = 0; + td = TD(d); + c = CM(m0); for ( i = 0; i < len; i++, NMV_ADV(m) ) { NEXTNM(mr0,mr); - c1 = C(m); - DMAR(c1,c,0,nd_mod,c2); - C(mr) = c2; - mr->td = m->td+td; - ndl_add(m->dl,d,mr->dl); + CM(mr) = 1; + ndl_add(DL(m),d,DL(mr)); } NEXT(mr) = 0; - MKND(NV(p),mr0,r); - r->sugar = p->sugar + td; + MKND(NV(p),mr0,len,r); + SG(r) = SG(p) + TD(d); return r; } } -ND ndv_add(ND p1,NDV p2) +ND ndv_mul_nm(int mod,NM m0,NDV p) { - register NM prev,cur,new; - int c,c1,c2,t,td,td2,mul,len,i; - NM head; - unsigned int *d; - NMV m2; + NM mr,mr0; + NMV m; + UINT *d,*dt,*dm; + int c,n,td,i,c1,c2,len; + Q q; + ND r; - if ( !p1 ) - return 0; + if ( !p ) return 0; + else if ( do_weyl ) + if ( mod == -1 ) + error("ndv_mul_nm : not implemented (weyl)"); + else + return weyl_ndv_mul_nm(mod,m0,p); else { - prev = 0; head = cur = BDY(p1); - NEWNM(new); len = p2->len; - for ( m2 = BDY(p2), i = 0; cur && i < len; ) { - td2 = new->td = m2->td; - if ( cur->td > td2 ) c = 1; - else if ( cur->td < td2 ) c = -1; - else c = ndl_compare(cur->dl,m2->dl); - switch ( c ) { - case 0: - t = C(m2)+C(cur)-nd_mod; - if ( t < 0 ) t += nd_mod; - if ( t ) C(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(m2->dl,new->dl); - C(new) = C(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; + n = NV(p); m = BDY(p); + d = DL(m0); + len = LEN(p); + mr0 = 0; + td = TD(d); + if ( mod == -1 ) { + c = CM(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + NEXTNM(mr0,mr); + CM(mr) = _mulsf(CM(m),c); + ndl_add(DL(m),d,DL(mr)); } + } else if ( mod ) { + c = CM(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + NEXTNM(mr0,mr); + c1 = CM(m); + DMAR(c1,c,0,mod,c2); + CM(mr) = c2; + ndl_add(DL(m),d,DL(mr)); + } + } else { + q = CQ(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + NEXTNM(mr0,mr); + mulq(CQ(m),q,&CQ(mr)); + ndl_add(DL(m),d,DL(mr)); + } } - for ( ; i < len; i++, NMV_ADV(m2) ) { - td2 = new->td = m2->td; C(new) = C(m2); ndl_copy(m2->dl,new->dl); - if ( !prev ) { - prev = new; NEXT(prev) = 0; head = prev; - } else { - NEXT(prev) = new; NEXT(new) = 0; prev = new; + NEXT(mr) = 0; + MKND(NV(p),mr0,len,r); + SG(r) = SG(p) + TD(d); + return r; + } +} + +void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos) +{ + NMV m,mr,mr0,t; + int len,i,k; + + if ( !p ) return; + m = BDY(p); len = LEN(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); + for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0; + ndl_reconstruct(DL(m),DL(t),obpe,oepos); + CQ(mr) = CQ(t); + ndl_copy(DL(t),DL(mr)); + } + BDY(p) = mr0; +} + +NDV ndv_dup_realloc(NDV p,int obpe,int oadv,EPOS oepos) +{ + NMV m,mr,mr0; + int len,i; + NDV r; + + if ( !p ) return 0; + m = BDY(p); len = LEN(p); + mr0 = mr = (NMV)MALLOC(len*nmv_adv); + 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); + } + MKNDV(NV(p),mr0,len,r); + SG(r) = SG(p); + return r; +} + +/* duplicate p */ + +NDV ndv_dup(int mod,NDV p) +{ + NDV d; + NMV t,m,m0; + int i,len; + + 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; i < len; i++, NMV_ADV(t), NMV_ADV(m) ) { + ndl_copy(DL(t),DL(m)); + CQ(m) = CQ(t); + } + MKNDV(NV(p),m0,len,d); + SG(d) = SG(p); + return d; +} + +ND nd_dup(ND p) +{ + ND d; + NM t,m,m0; + + if ( !p ) return 0; + for ( m0 = 0, t = BDY(p); t; t = NEXT(t) ) { + NEXTNM(m0,m); + ndl_copy(DL(t),DL(m)); + CQ(m) = CQ(t); + } + if ( m0 ) NEXT(m) = 0; + MKND(NV(p),m0,LEN(p),d); + SG(d) = SG(p); + return d; +} + +/* XXX if p->len == 0 then it represents 0 */ + +void ndv_mod(int mod,NDV p) +{ + NMV t,d; + int r; + int i,len,dlen; + Obj gfs; + + if ( !p ) return; + len = LEN(p); + dlen = 0; + if ( mod == -1 ) + for ( t = d = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) { + simp_ff((Obj)CP(t),&gfs); + r = FTOIF(CONT((GFS)gfs)); + CM(d) = r; + ndl_copy(DL(t),DL(d)); + NMV_ADV(d); + dlen++; + } + else + for ( t = d = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) { + r = rem(NM(CQ(t)),mod); + if ( r ) { + if ( SGN(CQ(t)) < 0 ) + r = mod-r; + CM(d) = r; + ndl_copy(DL(t),DL(d)); + NMV_ADV(d); + dlen++; } - NEWNM(new); } - FREENM(new); - if ( head ) { - BDY(p1) = head; p1->sugar = MAX(p1->sugar,p2->sugar); - return p1; + LEN(p) = dlen; +} + +NDV ptondv(VL vl,VL dvl,P p) +{ + ND nd; + + nd = ptond(vl,dvl,p); + return ndtondv(0,nd); +} + +ND ptond(VL vl,VL dvl,P p) +{ + int n,i,j,k,e; + VL tvl; + V v; + DCP dc; + DCP *w; + ND r,s,t,u; + P x; + int c; + UINT *d; + NM m,m0; + + if ( !p ) + return 0; + else if ( NUM(p) ) { + NEWNM(m); + ndl_zero(DL(m)); + CQ(m) = (Q)p; + NEXT(m) = 0; + MKND(nd_nvar,m,1,r); + SG(r) = 0; + return r; + } else { + for ( dc = DC(p), k = 0; dc; dc = NEXT(dc), k++ ); + 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++ ); + if ( !tvl ) { + for ( j = k-1, s = 0, MKV(v,x); j >= 0; j-- ) { + t = ptond(vl,dvl,COEF(w[j])); + pwrp(vl,x,DEG(w[j]),&p); + nd_mul_c_p(CO,t,p); s = nd_add(0,s,t); + } + return s; } else { - FREEND(p1); - return 0; + NEWNM(m0); d = DL(m0); + for ( j = k-1, s = 0; j >= 0; j-- ) { + ndl_zero(d); e = QTOS(DEG(w[j])); PUT_EXP(d,i,e); + TD(d) = MUL_WEIGHT(e,i); + if ( nd_blockmask) ndl_weight_mask(d); + t = ptond(vl,dvl,COEF(w[j])); + for ( m = BDY(t); m; m = NEXT(m) ) + ndl_addto(DL(m),d); + SG(t) += TD(d); + s = nd_add(0,s,t); + } + FREENM(m0); + return s; } - } } -NDV ndtondv(ND p) +P ndvtop(int mod,VL vl,VL dvl,NDV p) { + VL tvl; + int len,n,j,i,e; + NMV m; + Q q; + P c; + UINT *d; + P s,r,u,t,w; + GFS gfs; + + if ( !p ) return 0; + else { + len = LEN(p); + n = NV(p); + m = (NMV)(((char *)BDY(p))+nmv_adv*(len-1)); + for ( j = len-1, s = 0; j >= 0; j--, NMV_PREV(m) ) { + if ( mod == -1 ) { + e = IFTOF(CM(m)); MKGFS(e,gfs); c = (P)gfs; + } else if ( mod ) { + STOQ(CM(m),q); c = (P)q; + } else + c = CP(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); + pwrp(vl,r,q,&u); mulp(vl,t,u,&w); t = w; + } + addp(vl,s,t,&u); s = u; + } + return s; + } +} + +NDV ndtondv(int mod,ND p) +{ NDV d; NMV m,m0; NM t; int i,len; - if ( !p ) - return 0; - len = nd_length(p); - m0 = m = (NMV)MALLOC_ATOMIC(len*nmv_adv); + if ( !p ) return 0; + len = LEN(p); + if ( mod ) + m0 = m = (NMV)GC_malloc_atomic_ignore_off_page(len*nmv_adv); + else + m0 = m = MALLOC(len*nmv_adv); + ndv_alloc += nmv_adv*len; for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, NMV_ADV(m) ) { - m->td = t->td; - ndl_copy(t->dl,m->dl); - m->c = t->c; + ndl_copy(DL(t),DL(m)); + CQ(m) = CQ(t); } MKNDV(NV(p),m0,len,d); - d->sugar = p->sugar; + SG(d) = SG(p); return d; } +ND ndvtond(int mod,NDV p) +{ + ND d; + NM m,m0; + NMV t; + int i,len; + + if ( !p ) return 0; + m0 = 0; + len = p->len; + 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); + } + NEXT(m) = 0; + MKND(NV(p),m0,len,d); + SG(d) = SG(p); + return d; +} + void ndv_print(NDV p) { NMV m; int i,len; - if ( !p ) - printf("0\n"); + if ( !p ) printf("0\n"); else { - len = p->len; + len = LEN(p); for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { - printf("+%d*",m->c); - ndl_print(m->dl); + if ( CM(m) & 0x80000000 ) printf("+@_%d*",IFTOF(CM(m))); + else printf("+%d*",CM(m)); + ndl_print(DL(m)); } printf("\n"); } } -#endif + +void ndv_print_q(NDV p) +{ + NMV m; + int i,len; + + if ( !p ) printf("0\n"); + else { + len = LEN(p); + for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { + printf("+"); + printexpr(CO,(Obj)CQ(m)); + printf("*"); + ndl_print(DL(m)); + } + printf("\n"); + } +} + +NODE ndv_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; +} + +/* XXX incomplete */ + +void nd_init_ord(struct order_spec *ord) +{ + switch ( ord->id ) { + case 0: + switch ( ord->ord.simple ) { + case 0: + nd_dcomp = 1; + nd_isrlex = 1; + break; + case 1: + nd_dcomp = 1; + nd_isrlex = 0; + break; + case 2: + nd_dcomp = 0; + nd_isrlex = 0; + ndl_compare_function = ndl_lex_compare; + break; + case 11: + /* XXX */ + nd_dcomp = 0; + nd_isrlex = 1; + ndl_compare_function = ndl_ww_lex_compare; + break; + default: + error("nd_gr : unsupported order"); + } + break; + case 1: + /* XXX */ + nd_dcomp = -1; + nd_isrlex = 0; + ndl_compare_function = ndl_block_compare; + break; + case 2: + error("nd_init_ord : matrix order is not supported yet."); + break; + } + nd_ord = ord; +} + +BlockMask nd_create_blockmask(struct order_spec *ord) +{ + int n,i,j,s,l; + UINT *t; + BlockMask bm; + + if ( !ord->id ) + return 0; + n = ord->ord.block.length; + bm = (BlockMask)MALLOC(sizeof(struct oBlockMask)); + bm->n = n; + bm->order_pair = ord->ord.block.order_pair; + bm->mask = (UINT **)MALLOC(n*sizeof(UINT *)); + for ( i = 0, s = 0; i < n; i++ ) { + bm->mask[i] = t = (UINT *)MALLOC_ATOMIC(nd_wpd*sizeof(UINT)); + for ( j = 0; j < nd_wpd; j++ ) t[j] = 0; + l = bm->order_pair[i].length; + for ( j = 0; j < l; j++, s++ ) PUT_EXP(t,s,nd_mask0); + } + return bm; +} + +EPOS nd_create_epos(struct order_spec *ord) +{ + int i,j,l,s,ord_l,ord_o; + EPOS epos; + struct order_pair *op; + + epos = (EPOS)MALLOC_ATOMIC(nd_nvar*sizeof(struct oEPOS)); + switch ( ord->id ) { + case 0: + if ( nd_isrlex ) { + for ( i = 0; i < nd_nvar; i++ ) { + epos[i].i = nd_exporigin + (nd_nvar-1-i)/nd_epw; + epos[i].s = (nd_epw-((nd_nvar-1-i)%nd_epw)-1)*nd_bpe; + } + } else { + for ( i = 0; i < nd_nvar; i++ ) { + epos[i].i = nd_exporigin + i/nd_epw; + epos[i].s = (nd_epw-(i%nd_epw)-1)*nd_bpe; + } + } + break; + case 1: + /* block order */ + l = ord->ord.block.length; + op = ord->ord.block.order_pair; + for ( j = 0, s = 0; j < l; j++ ) { + ord_o = op[j].order; + ord_l = op[j].length; + if ( !ord_o ) + for ( i = 0; i < ord_l; i++ ) { + epos[s+i].i = nd_exporigin + (s+ord_l-i-1)/nd_epw; + epos[s+i].s = (nd_epw-((s+ord_l-i-1)%nd_epw)-1)*nd_bpe; + } + else + for ( i = 0; i < ord_l; i++ ) { + epos[s+i].i = nd_exporigin + (s+i)/nd_epw; + epos[s+i].s = (nd_epw-((s+i)%nd_epw)-1)*nd_bpe; + } + s += ord_l; + } + break; + case 2: + error("nd_create_epos : matrix order is not supported yet."); + } + return epos; +} + +/* external interface */ + +void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec *ord,P *rp) +{ + NODE t,in0,in; + ND nd,nf; + 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++ ); + + /* get the degree bound */ + for ( t = BDY(g), max = 0; t; t = NEXT(t) ) + for ( tv = vv; tv; tv = NEXT(tv) ) { + e = getdeg(tv->v,(P)BDY(t)); + max = MAX(e,max); + } + for ( tv = vv; tv; tv = NEXT(tv) ) { + e = getdeg(tv->v,f); + max = MAX(e,max); + } + + nd_init_ord(ord); + nd_setup_parameters(nvar,max); + + /* conversion to ndv */ + for ( in0 = 0, t = BDY(g); t; t = NEXT(t) ) { + NEXTNODE(in0,in); + BDY(in) = (pointer)ptondv(CO,vv,(P)BDY(t)); + if ( m ) ndv_mod(m,(NDV)BDY(in)); + } + NEXTNODE(in0,in); + BDY(in) = (pointer)ptondv(CO,vv,f); + if ( m ) ndv_mod(m,(NDV)BDY(in)); + NEXT(in) = 0; + + ndv_setup(m,0,in0); + nd_psn--; + nd_scale=2; + while ( 1 ) { + nd = (pointer)ndvtond(m,nd_ps[nd_psn]); + stat = nd_nf(m,nd,nd_ps,1,0,&nf); + if ( !stat ) { + nd_psn++; + nd_reconstruct(m,0,0); + nd_psn--; + } else + break; + } + *rp = ndvtop(m,CO,vv,ndtondv(m,nf)); +} + +int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r) +{ + NM m; + UINT *t,*s; + int i; + + for ( i = 0; i < n; i++ ) r[i] = 0; + 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); + } + for ( i = 0; !r[i]; i++ ); + return i; +} + +int ndv_to_vect(int mod,UINT *s0,int n,NDV d,UINT *r) +{ + NMV m; + UINT *t,*s; + int i,j,len; + + 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)) { + t = DL(m); + for ( ; !ndl_equal(t,s); s += nd_wpd, i++ ); + r[i] = CM(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; + NMV mr; + UINT *d,*t,*s; + NDV p; + unsigned char *ivc; + unsigned short *ivs; + UINT *v,*ivi,*s0v; + int i,j,len,prev,diff,cdiff; + IndArray r; + + m = pair->mul; + d = DL(m); + p = nd_ps[pair->index]; + len = LEN(p); + t = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + v = (unsigned int *)ALLOCA(len*sizeof(unsigned int)); + 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++ ); + v[j] = i; + } + r = (IndArray)MALLOC(sizeof(struct oIndArray)); + r->head = v[0]; + diff = 0; + for ( i = 1; i < len; i++ ) { + cdiff = v[i]-v[i-1]; diff = MAX(cdiff,diff); + } + if ( diff < 256 ) { + r->width = 1; + ivc = (unsigned char *)MALLOC_ATOMIC(len*sizeof(unsigned char)); + r->index.c = ivc; + for ( i = 1, ivc[0] = 0; i < len; i++ ) ivc[i] = v[i]-v[i-1]; + } else if ( diff < 65536 ) { + r->width = 2; + ivs = (unsigned short *)MALLOC_ATOMIC(len*sizeof(unsigned short)); + r->index.s = ivs; + for ( i = 1, ivs[0] = 0; i < len; i++ ) ivs[i] = v[i]-v[i-1]; + } else { + r->width = 4; + ivi = (unsigned int *)MALLOC_ATOMIC(len*sizeof(unsigned int)); + r->index.i = ivi; + for ( i = 1, ivi[0] = 0; i < len; i++ ) ivi[i] = v[i]-v[i-1]; + } + return r; +} + + +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; + UINT c,c1,c2,c3,up,lo,dmy; + 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; svect[k] %= m; + if ( c = svect[k] ) { + maxrs = MAX(maxrs,rp0[i]->sugar); + c = m-c; redv = nd_ps[rp0[i]->index]; + len = LEN(redv); mr = BDY(redv); + 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]; c1 = CM(mr); c2 = svect[pos]; + prev = pos; + DMA(c1,c,c2,up,lo); + if ( up ) { DSAB(m,up,lo,dmy,c3); svect[pos] = c3; + } else svect[pos] = lo; + } + break; + case 2: + ivs = ivect->index.s; + for ( j = 1, NMV_ADV(mr); j < len; j++, NMV_ADV(mr) ) { + pos = prev+ivs[j]; c1 = CM(mr); c2 = svect[pos]; + prev = pos; + DMA(c1,c,c2,up,lo); + if ( up ) { DSAB(m,up,lo,dmy,c3); svect[pos] = c3; + } else svect[pos] = lo; + } + break; + case 4: + ivi = ivect->index.i; + for ( j = 1, NMV_ADV(mr); j < len; j++, NMV_ADV(mr) ) { + pos = prev+ivi[j]; c1 = CM(mr); c2 = svect[pos]; + prev = pos; + DMA(c1,c,c2,up,lo); + if ( up ) { DSAB(m,up,lo,dmy,c3); svect[pos] = c3; + } else svect[pos] = lo; + } + break; + } + } + } + for ( i = 0; i < col; i++ ) + if ( svect[i] >= (UINT)m ) svect[i] %= m; + return maxrs; +} + +int ndv_reduce_vect_sf(int m,UINT *svect,int col,IndArray *imat,NM_ind_pair *rp0,int nred) +{ + int i,j,k,len,pos,prev; + UINT c,c1,c2,c3,up,lo,dmy; + 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; svect[k] %= m; + if ( c = svect[k] ) { + maxrs = MAX(maxrs,rp0[i]->sugar); + c = _chsgnsf(c); redv = nd_ps[rp0[i]->index]; + len = LEN(redv); mr = BDY(redv); + 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] = _addsf(_mulsf(CM(mr),c),svect[pos]); + } + 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] = _addsf(_mulsf(CM(mr),c),svect[pos]); + } + 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] = _addsf(_mulsf(CM(mr),c),svect[pos]); + } + break; + } + } + } + return maxrs; +} + +NDV vect_to_ndv(UINT *vect,int spcol,int col,int *rhead,UINT *s0vect) +{ + int j,k,len; + UINT *p; + UINT 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_atomic_ignore_off_page(nmv_adv*len); + ndv_alloc += nmv_adv*len; + 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)); CM(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; + NODE sp0,sp; + int stat; + ND spol; + + for ( t = l; t; t = NEXT(t) ) { + stat = nd_sp(m,0,t,&spol); + if ( !stat ) return 0; + if ( spol ) { + add_pbucket_symbolic(bucket,spol); + } + } + return 1; +} + +int nd_symbolic_preproc(PGeoBucket bucket,UINT **s0vect,NODE *r) +{ + NODE rp0,rp; + NM mul,head,s0,s; + int index,col,i,sugar; + RHist h; + UINT *s0v,*p; + NM_ind_pair pair; + ND red; + + s0 = 0; rp0 = 0; col = 0; + while ( 1 ) { + head = remove_head_pbucket_symbolic(bucket); + if ( !head ) break; + if ( !s0 ) s0 = head; + else NEXT(s) = head; + s = head; + index = ndl_find_reducer(DL(head)); + if ( index >= 0 ) { + h = nd_psh[index]; + NEWNM(mul); + ndl_sub(DL(head),DL(h),DL(mul)); + if ( ndl_check_bound2(index,DL(mul)) ) return 0; + sugar = TD(DL(mul))+SG(nd_ps[index]); + MKNM_ind_pair(pair,mul,index,sugar); + red = ndv_mul_nm_symbolic(mul,nd_ps[index]); + add_pbucket_symbolic(bucket,nd_remove_head(red)); + NEXTNODE(rp0,rp); BDY(rp) = (pointer)pair; + } + col++; + } + if ( rp0 ) NEXT(rp) = 0; + NEXT(s) = 0; + s0v = (UINT *)MALLOC_ATOMIC(col*nd_wpd*sizeof(UINT)); + for ( i = 0, p = s0v, s = s0; i < col; + i++, p += nd_wpd, s = NEXT(s) ) ndl_copy(DL(s),p); + *s0vect = s0v; + *r = rp0; + return col; +} + +NODE nd_f4(int m) +{ + int i,nh,stat,index; + NODE r,g; + ND_pairs d,l,t; + ND spol,red; + NDV nf,redv; + NM s0,s; + NODE rp0,srp0,nflist; + int nsp,nred,col,rank,len,k,j,a; + UINT c; + UINT **spmat; + UINT *s0vect,*svect,*p,*v; + int *colstat; + IndArray *imat; + int *rhead; + int spcol,sprow; + int sugar; + PGeoBucket bucket; + struct oEGT eg0,eg1,eg_f4; + + if ( !m ) + error("nd_f4 : not implemented"); + ndv_alloc = 0; + g = 0; d = 0; + for ( i = 0; i < nd_psn; i++ ) { + d = update_pairs(d,g,i); + g = update_base(g,i); + } + while ( d ) { + get_eg(&eg0); + l = nd_minsugarp(d,&d); + sugar = SG(l); + bucket = create_pbucket(); + stat = nd_sp_f4(m,l,bucket); + if ( !stat ) { + for ( t = l; NEXT(t); t = NEXT(t) ); + NEXT(t) = d; d = l; + d = nd_reconstruct(m,0,d); + continue; + } + col = nd_symbolic_preproc(bucket,&s0vect,&rp0); + if ( !col ) { + for ( t = l; NEXT(t); t = NEXT(t) ); + NEXT(t) = d; d = l; + d = nd_reconstruct(m,0,d); + continue; + } + get_eg(&eg1); init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg1); + if ( DP_Print ) + fprintf(asir_out,"sugar=%d,symb=%fsec,", + sugar,eg_f4.exectime+eg_f4.gctime); + if ( 1 ) + nflist = nd_f4_red(m,l,s0vect,col,rp0); + else + nflist = nd_f4_red_dist(m,l,s0vect,col,rp0); + /* adding new bases */ + for ( r = nflist; r; r = NEXT(r) ) { + nf = (NDV)BDY(r); + ndv_removecont(m,nf); + nh = ndv_newps(m,nf,0); + d = update_pairs(d,g,nh); + g = update_base(g,nh); + } + } + for ( r = g; r; r = NEXT(r) ) BDY(r) = (pointer)nd_ps[(int)BDY(r)]; + fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); + 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 *rhead; + int i,j,k,l,rank; + NODE rp,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; + 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; + imat = (IndArray *)ALLOCA(nred*sizeof(IndArray)); + rhead = (int *)ALLOCA(col*sizeof(int)); + for ( i = 0; i < col; i++ ) rhead[i] = 0; + + /* construction of index arrays */ + rvect = (NM_ind_pair *)ALLOCA(nred*sizeof(NM_ind_pair)); + for ( rp = rp0, i = 0; rp; i++, rp = NEXT(rp) ) { + rvect[i] = (NM_ind_pair)BDY(rp); + imat[i] = nm_ind_pair_to_vect_compress(m,s0vect,col,rvect[i]); + rhead[imat[i]->head] = 1; + } + + /* elimination (1st step) */ + spmat = (int **)ALLOCA(nsp*sizeof(UINT *)); + svect = (UINT *)ALLOCA(col*sizeof(UINT)); + spsugar = (int *)ALLOCA(nsp*sizeof(UINT)); + for ( a = sprow = 0, sp = sp0; a < nsp; a++, sp = NEXT(sp) ) { + nd_sp(m,0,sp,&spol); + if ( !spol ) continue; + nd_to_vect(m,s0vect,col,spol,svect); + if ( m == -1 ) + maxrs = ndv_reduce_vect_sf(m,svect,col,imat,rvect,nred); + else + maxrs = ndv_reduce_vect(m,svect,col,imat,rvect,nred); + for ( i = 0; i < col; i++ ) if ( svect[i] ) break; + if ( i < col ) { + spmat[sprow] = v = (UINT *)MALLOC_ATOMIC(spcol*sizeof(UINT)); + 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)); + if ( m == -1 ) + rank = nd_gauss_elim_sf(spmat,spsugar,sprow,spcol,m,colstat); + else + rank = nd_gauss_elim_mod(spmat,spsugar,sprow,spcol,m,colstat); + r0 = 0; + for ( i = 0; i < rank; i++ ) { + NEXTNODE(r0,r); BDY(r) = + (pointer)vect_to_ndv(spmat[i],spcol,col,rhead,s0vect); + SG((NDV)BDY(r)) = spsugar[i]; + GC_free(spmat[i]); + } + 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) { + write_int(nd_write,&a); +} + +void nd_send_intarray(int *p,int len) { + write_intarray(nd_write,p,len); +} + +int nd_recv_int() { + int a; + + read_int(nd_read,&a); + return a; +} + +void nd_recv_intarray(int *p,int len) { + read_intarray(nd_read,p,len); +} + +void nd_send_ndv(NDV p) { + int len,i; + NMV m; + + if ( !p ) nd_send_int(0); + else { + len = LEN(p); + nd_send_int(len); + m = BDY(p); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + nd_send_int(CM(m)); + nd_send_intarray(DL(m),nd_wpd); + } + } +} + +void nd_send_nd(ND p) { + int len,i; + NM m; + + if ( !p ) nd_send_int(0); + else { + len = LEN(p); + nd_send_int(len); + m = BDY(p); + for ( i = 0; i < len; i++, m = NEXT(m) ) { + nd_send_int(CM(m)); + nd_send_intarray(DL(m),nd_wpd); + } + } +} + +NDV nd_recv_ndv() +{ + int len,i; + NMV m,m0; + NDV r; + + len = nd_recv_int(); + if ( !len ) return 0; + else { + m0 = m = (NMV)GC_malloc_atomic_ignore_off_page(nmv_adv*len); + ndv_alloc += len*nmv_adv; + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + CM(m) = nd_recv_int(); + nd_recv_intarray(DL(m),nd_wpd); + } + MKNDV(nd_nvar,m0,len,r); + return r; + } +} + +int ox_exec_f4_red(Q proc) +{ + Obj obj; + STRING fname; + NODE arg; + int s; + extern int ox_need_conv,ox_file_io; + + MKSTR(fname,"nd_exec_f4_red"); + arg = mknode(2,proc,fname); + Pox_cmo_rpc(arg,&obj); + s = get_ox_server_id(QTOS(proc)); + nd_write = iofp[s].out; + nd_read = iofp[s].in; + ox_need_conv = ox_file_io = 0; + return s; +} + +NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0) +{ + int nsp,nred; + int i,rank,s; + NODE rp,r0,r; + ND_pairs sp; + NM_ind_pair pair; + NMV nmv; + NM nm; + NDV nf; + Obj proc,dmy; + + ox_launch_main(0,0,&proc); + s = ox_exec_f4_red((Q)proc); + + nd_send_int(m); + nd_send_int(nd_nvar); + nd_send_int(nd_bpe); + nd_send_int(nd_wpd); + nd_send_int(nmv_adv); + + saveobj(nd_write,dp_current_spec.obj); fflush(nd_write); + + nd_send_int(nd_psn); + for ( i = 0; i < nd_psn; i++ ) nd_send_ndv(nd_ps[i]); + + for ( sp = sp0, nsp = 0; sp; sp = NEXT(sp), nsp++ ); + nd_send_int(nsp); + for ( i = 0, sp = sp0; i < nsp; i++, sp = NEXT(sp) ) { + nd_send_int(sp->i1); nd_send_int(sp->i2); + } + + nd_send_int(col); nd_send_intarray(s0vect,col*nd_wpd); + + nred = length(rp0); nd_send_int(nred); + for ( i = 0, rp = rp0; i < nred; i++, rp = NEXT(rp) ) { + pair = (NM_ind_pair)BDY(rp); + nd_send_int(pair->index); + nd_send_intarray(pair->mul->dl,nd_wpd); + } + fflush(nd_write); + rank = nd_recv_int(); + fprintf(asir_out,"rank=%d\n",rank); + r0 = 0; + for ( i = 0; i < rank; i++ ) { + nf = nd_recv_ndv(); + NEXTNODE(r0,r); BDY(r) = (pointer)nf; + } + Pox_shutdown(mknode(1,proc),&dmy); + return r0; +} + +/* server side */ + +void nd_exec_f4_red_dist() +{ + int m,i,nsp,col,s0size,nred,spcol,j,k; + NM_ind_pair *rp0; + NDV nf; + UINT *s0vect; + IndArray *imat; + int *rhead; + int **spmat; + UINT *svect,*v; + ND_pairs *sp0; + int *colstat; + int a,sprow,rank; + struct order_spec ord; + Obj ordspec; + ND spol; + int maxrs; + int *spsugar; + + nd_read = iofp[0].in; + nd_write = iofp[0].out; + m = nd_recv_int(); + nd_nvar = nd_recv_int(); + nd_bpe = nd_recv_int(); + nd_wpd = nd_recv_int(); + nmv_adv = nd_recv_int(); + + loadobj(nd_read,&ordspec); + create_order_spec(ordspec,&ord); + nd_init_ord(&ord); + nd_setup_parameters(nd_nvar,0); + + nd_psn = nd_recv_int(); + nd_ps = (NDV *)MALLOC(nd_psn*sizeof(NDV)); + nd_bound = (UINT **)MALLOC(nd_psn*sizeof(UINT *)); + for ( i = 0; i < nd_psn; i++ ) { + nd_ps[i] = nd_recv_ndv(); + nd_bound[i] = ndv_compute_bound(nd_ps[i]); + } + + nsp = nd_recv_int(); + sp0 = (ND_pairs *)MALLOC(nsp*sizeof(ND_pairs)); + for ( i = 0; i < nsp; i++ ) { + NEWND_pairs(sp0[i]); + sp0[i]->i1 = nd_recv_int(); sp0[i]->i2 = nd_recv_int(); + ndl_lcm(HDL(nd_ps[sp0[i]->i1]),HDL(nd_ps[sp0[i]->i2]),LCM(sp0[i])); + } + + col = nd_recv_int(); + s0size = col*nd_wpd; + s0vect = (UINT *)MALLOC(s0size*sizeof(UINT)); + nd_recv_intarray(s0vect,s0size); + + nred = nd_recv_int(); + rp0 = (NM_ind_pair *)MALLOC(nred*sizeof(NM_ind_pair)); + for ( i = 0; i < nred; i++ ) { + rp0[i] = (NM_ind_pair)MALLOC(sizeof(struct oNM_ind_pair)); + rp0[i]->index = nd_recv_int(); + rp0[i]->mul = (NM)MALLOC(sizeof(struct oNM)+(nd_wpd-1)*sizeof(UINT)); + nd_recv_intarray(rp0[i]->mul->dl,nd_wpd); + } + + spcol = col-nred; + imat = (IndArray *)MALLOC(nred*sizeof(IndArray)); + rhead = (int *)MALLOC(col*sizeof(int)); + for ( i = 0; i < col; i++ ) rhead[i] = 0; + + /* construction of index arrays */ + for ( i = 0; i < nred; i++ ) { + imat[i] = nm_ind_pair_to_vect_compress(m,s0vect,col,rp0[i]); + rhead[imat[i]->head] = 1; + } + + /* elimination (1st step) */ + spmat = (int **)MALLOC(nsp*sizeof(UINT *)); + svect = (UINT *)MALLOC(col*sizeof(UINT)); + spsugar = (int *)ALLOCA(nsp*sizeof(UINT)); + for ( a = sprow = 0; a < nsp; a++ ) { + nd_sp(m,0,sp0[a],&spol); + if ( !spol ) continue; + nd_to_vect(m,s0vect,col,spol,svect); + if ( m == -1 ) + maxrs = ndv_reduce_vect_sf(m,svect,col,imat,rp0,nred); + else + maxrs = ndv_reduce_vect(m,svect,col,imat,rp0,nred); + for ( i = 0; i < col; i++ ) if ( svect[i] ) break; + if ( i < col ) { + spmat[sprow] = v = (UINT *)MALLOC(spcol*sizeof(UINT)); + for ( j = k = 0; j < col; j++ ) + if ( !rhead[j] ) v[k++] = svect[j]; + spsugar[sprow] = MAX(maxrs,SG(spol)); + sprow++; + } + nd_free(spol); + } + /* elimination (2nd step) */ + colstat = (int *)ALLOCA(spcol*sizeof(int)); + if ( m == -1 ) + rank = nd_gauss_elim_sf(spmat,spsugar,sprow,spcol,m,colstat); + else + rank = nd_gauss_elim_mod(spmat,spsugar,sprow,spcol,m,colstat); + nd_send_int(rank); + for ( i = 0; i < rank; i++ ) { + nf = vect_to_ndv(spmat[i],spcol,col,rhead,s0vect); + nd_send_ndv(nf); + } + fflush(nd_write); +} + +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; + unsigned int *t,*pivot,*pk; + unsigned int **mat; + + mat = (unsigned int **)mat0; + for ( rank = 0, j = 0; j < col; j++ ) { + for ( i = rank; i < row; i++ ) + mat[i][j] %= md; + for ( i = rank; i < row; i++ ) + if ( mat[i][j] ) + break; + if ( i == row ) { + colstat[j] = 0; + continue; + } else + colstat[j] = 1; + if ( i != rank ) { + t = mat[i]; mat[i] = mat[rank]; mat[rank] = t; + s = sugar[i]; sugar[i] = sugar[rank]; sugar[rank] = s; + } + pivot = mat[rank]; + s = sugar[rank]; + inv = invm(pivot[j],md); + for ( k = j, pk = pivot+k; k < col; k++, pk++ ) + if ( *pk ) { + if ( *pk >= (unsigned int)md ) + *pk %= md; + DMAR(*pk,inv,0,md,*pk) + } + for ( i = rank+1; i < row; i++ ) { + t = mat[i]; + if ( a = t[j] ) { + sugar[i] = MAX(sugar[i],s); + red_by_vect(md,t+j,pivot+j,md-a,col-j); + } + } + rank++; + } + for ( j = col-1, l = rank-1; j >= 0; j-- ) + if ( colstat[j] ) { + pivot = mat[l]; + s = sugar[l]; + for ( i = 0; i < l; i++ ) { + t = mat[i]; + t[j] %= md; + if ( a = t[j] ) { + sugar[i] = MAX(sugar[i],s); + red_by_vect(md,t+j,pivot+j,md-a,col-j); + } + } + l--; + } + for ( j = 0, l = 0; l < rank; j++ ) + if ( colstat[j] ) { + t = mat[l]; + for ( k = j; k < col; k++ ) + if ( t[k] >= (unsigned int)md ) + t[k] %= md; + l++; + } + return rank; +} + +int nd_gauss_elim_sf(int **mat0,int *sugar,int row,int col,int md,int *colstat) +{ + int i,j,k,l,inv,a,rank,s; + unsigned int *t,*pivot,*pk; + unsigned int **mat; + + mat = (unsigned int **)mat0; + for ( rank = 0, j = 0; j < col; j++ ) { + for ( i = rank; i < row; i++ ) + if ( mat[i][j] ) + break; + if ( i == row ) { + colstat[j] = 0; + continue; + } else + colstat[j] = 1; + if ( i != rank ) { + t = mat[i]; mat[i] = mat[rank]; mat[rank] = t; + s = sugar[i]; sugar[i] = sugar[rank]; sugar[rank] = s; + } + pivot = mat[rank]; + s = sugar[rank]; + inv = _invsf(pivot[j]); + for ( k = j, pk = pivot+k; k < col; k++, pk++ ) + if ( *pk ) + *pk = _mulsf(*pk,inv); + for ( i = rank+1; i < row; i++ ) { + t = mat[i]; + if ( a = t[j] ) { + sugar[i] = MAX(sugar[i],s); + red_by_vect_sf(md,t+j,pivot+j,_chsgnsf(a),col-j); + } + } + rank++; + } + for ( j = col-1, l = rank-1; j >= 0; j-- ) + if ( colstat[j] ) { + pivot = mat[l]; + s = sugar[l]; + for ( i = 0; i < l; i++ ) { + t = mat[i]; + if ( a = t[j] ) { + sugar[i] = MAX(sugar[i],s); + red_by_vect_sf(md,t+j,pivot+j,_chsgnsf(a),col-j); + } + } + l--; + } + return rank; +} + +int ndv_ishomo(NDV p) +{ + NMV m; + int len,h; + + if ( !p ) return 1; + len = LEN(p); + m = BDY(p); + h = TD(DL(m)); + NMV_ADV(m); + for ( len--; len; len--, NMV_ADV(m) ) + if ( TD(DL(m)) != h ) return 0; + return 1; +} + +void ndv_save(NDV p,int index) +{ + FILE *s; + char name[BUFSIZ]; + short id; + int nv,sugar,len,n,i,td,e,j; + NMV m; + unsigned int *dl; + + sprintf(name,"%s/%d",Demand,index); + s = fopen(name,"w"); + savevl(s,0); + if ( !p ) { + saveobj(s,0); + return; + } + id = O_DP; + nv = NV(p); + sugar = SG(p); + len = LEN(p); + write_short(s,&id); write_int(s,&nv); write_int(s,&sugar); + write_int(s,&len); + + for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) { + saveobj(s,(Obj)CQ(m)); + dl = DL(m); + td = TD(dl); + write_int(s,&td); + for ( j = 0; j < nv; j++ ) { + e = GET_EXP(dl,j); + write_int(s,&e); + } + } + fclose(s); +} + +NDV ndv_load(int index) +{ + FILE *s; + char name[BUFSIZ]; + short id; + int nv,sugar,len,n,i,td,e,j; + NDV d; + NMV m0,m; + unsigned int *dl; + Obj obj; + + sprintf(name,"%s/%d",Demand,index); + s = fopen(name,"r"); + if ( !s ) return 0; + + skipvl(s); + read_short(s,&id); + if ( !id ) return 0; + read_int(s,&nv); + read_int(s,&sugar); + read_int(s,&len); + + m0 = m = MALLOC(len*nmv_adv); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + loadobj(s,&obj); CQ(m) = (Q)obj; + dl = DL(m); + ndl_zero(dl); + read_int(s,&td); TD(dl) = td; + for ( j = 0; j < nv; j++ ) { + read_int(s,&e); + PUT_EXP(dl,j,e); + } + if ( nd_blockmask ) ndl_weight_mask(dl); + } + fclose(s); + MKNDV(nv,m0,len,d); + SG(d) = sugar; + return d; +}