=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.84 retrieving revision 1.137 diff -u -p -r1.84 -r1.137 --- OpenXM_contrib2/asir2000/engine/nd.c 2003/10/18 01:39:42 1.84 +++ OpenXM_contrib2/asir2000/engine/nd.c 2006/06/11 06:57:54 1.137 @@ -1,123 +1,24 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.83 2003/10/17 05:15:20 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.136 2006/06/11 06:01:55 noro Exp $ */ -#include "ca.h" -#include "parse.h" -#include "ox.h" -#include "inline.h" -#include +#include "nd.h" -#if defined(__GNUC__) -#define INLINE inline -#elif defined(VISUAL) -#define INLINE __inline -#else -#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 len; - int sugar; -} *NDV; - -typedef union oNDC { - int m; - Q z; - P p; -} *NDC; - -/* monomial; linked list rep. */ -typedef struct oNM { - struct oNM *next; - union oNDC c; - UINT dl[1]; -} *NM; - -/* monomial; array rep. */ -typedef struct oNMV { - 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 sugar; - UINT lcm[1]; -} *ND_pairs; - -/* index and shift count for each exponent */ -typedef struct oEPOS { - int i; /* index */ - int s; /* shift */ -} *EPOS; - -typedef struct oBlockMask { - int n; - struct order_pair *order_pair; - UINT **mask; -} *BlockMask; - -typedef struct oBaseSet { - int len; - NDV *ps; - UINT **bound; -} *BaseSet; - -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 diag_period = 6; int (*ndl_compare_function)(UINT *a1,UINT *a2); +int nd_dcomp; +NM _nm_free_list; +ND _nd_free_list; +ND_pairs _ndp_free_list; +static int nd_ntrans; +static int nd_nalg; +#if 0 static int ndv_alloc; +#endif +#if 1 static int nd_f4_nsp=0x7fffffff; +#else +static int nd_f4_nsp=50; +#endif static double nd_scale=2; static UINT **nd_bound; static struct order_spec *nd_ord; @@ -129,253 +30,26 @@ 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_work_vector; +static int **nd_matrix; +static int nd_matrix_len; +static struct weight_or_block *nd_worb; +static int nd_worb_len; static int nd_found,nd_create,nd_notfirst; -static int 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; +NumberField get_numberfield(); +UINT *nd_det_compute_bound(NDV **dm,int n,int j); +void nd_det_reconstruct(NDV **dm,int n,int j,NDV d); +int nd_monic(int m,ND *p); +NDV plain_vect_to_ndv_q(Q *mat,int col,UINT *s0vect); -/* fundamental macros */ -#define TD(d) (d[0]) -#define HDL(d) ((d)->body->dl) -#define HTD(d) (TD(HDL(d))) -#define HCM(d) ((d)->body->c.m) -#define HCQ(d) ((d)->body->c.z) -#define 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)<>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) - -/* 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)) - -/* 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); -ND_pairs update_pairs( ND_pairs d, NODE /* of index */ g, int t); -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(); -void nd_free(ND p); -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_append_red(UINT *d,int i); -UINT *ndv_compute_bound(NDV p); -ND nd_copy(ND p); -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); - -/* 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); - -/* 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); - -/* 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() { _nm_free_list = 0; @@ -762,6 +436,84 @@ int ndl_block_compare(UINT *d1,UINT *d2) return 0; } +int ndl_matrix_compare(UINT *d1,UINT *d2) +{ + int i,j,s; + int *v; + + for ( j = 0; j < nd_nvar; j++ ) + nd_work_vector[j] = GET_EXP(d1,j)-GET_EXP(d2,j); + for ( i = 0; i < nd_matrix_len; i++ ) { + v = nd_matrix[i]; + for ( j = 0, s = 0; j < nd_nvar; j++ ) + s += v[j]*nd_work_vector[j]; + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + } + return 0; +} + +int ndl_composite_compare(UINT *d1,UINT *d2) +{ + int i,j,s,start,end,len,o; + int *v; + struct sparse_weight *sw; + + for ( j = 0; j < nd_nvar; j++ ) + nd_work_vector[j] = GET_EXP(d1,j)-GET_EXP(d2,j); + for ( i = 0; i < nd_worb_len; i++ ) { + len = nd_worb[i].length; + switch ( nd_worb[i].type ) { + case IS_DENSE_WEIGHT: + v = nd_worb[i].body.dense_weight; + for ( j = 0, s = 0; j < len; j++ ) + s += v[j]*nd_work_vector[j]; + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + break; + case IS_SPARSE_WEIGHT: + sw = nd_worb[i].body.sparse_weight; + for ( j = 0, s = 0; j < len; j++ ) + s += sw[j].value*nd_work_vector[sw[j].pos]; + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + break; + case IS_BLOCK: + o = nd_worb[i].body.block.order; + start = nd_worb[i].body.block.start; + switch ( o ) { + case 0: + end = start+len; + for ( j = start, s = 0; j < end; j++ ) + s += MUL_WEIGHT(nd_work_vector[j],j); + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + for ( j = end-1; j >= start; j-- ) + if ( nd_work_vector[j] < 0 ) return 1; + else if ( nd_work_vector[j] > 0 ) return -1; + break; + case 1: + end = start+len; + for ( j = start, s = 0; j < end; j++ ) + s += MUL_WEIGHT(nd_work_vector[j],j); + if ( s > 0 ) return 1; + else if ( s < 0 ) return -1; + for ( j = start; j < end; j++ ) + if ( nd_work_vector[j] > 0 ) return 1; + else if ( nd_work_vector[j] < 0 ) return -1; + break; + case 2: + for ( j = start; j < end; j++ ) + if ( nd_work_vector[j] > 0 ) return 1; + else if ( nd_work_vector[j] < 0 ) return -1; + break; + } + break; + } + } + return 0; +} + /* TDH -> WW -> TD-> RL */ int ndl_ww_lex_compare(UINT *d1,UINT *d2) @@ -981,13 +733,11 @@ int ndl_disjoint(UINT *d1,UINT *d2) #endif } -int ndl_check_bound2(int index,UINT *d2) +int ndl_check_bound(UINT *d1,UINT *d2) { UINT u2; - UINT *d1; int i,j,ind,k; - d1 = nd_bound[index]; ind = 0; #if USE_UNROLL switch ( nd_bpe ) { @@ -1076,6 +826,11 @@ int ndl_check_bound2(int index,UINT *d2) #endif } +int ndl_check_bound2(int index,UINT *d2) +{ + return ndl_check_bound(nd_bound[index],d2); +} + INLINE int ndl_hash_value(UINT *d) { int i; @@ -1213,6 +968,28 @@ ND nd_add(int mod,ND p1,ND p2) } } +/* XXX on opteron, the inlined manipulation of destructive additon of + * two NM seems to make gcc optimizer get confused, so the part is + * done in a function. + */ + +int nm_destructive_add_q(NM *m1,NM *m2,NM *mr0,NM *mr) +{ + NM s; + Q t; + int can; + + addq(CQ(*m1),CQ(*m2),&t); + s = *m1; *m1 = NEXT(*m1); + if ( t ) { + can = 1; NEXTNM2(*mr0,*mr,s); CQ(*mr) = (t); + } else { + can = 2; FREENM(s); + } + s = *m2; *m2 = NEXT(*m2); FREENM(s); + return can; +} + ND nd_add_q(ND p1,ND p2) { int n,c,can; @@ -1228,6 +1005,9 @@ ND nd_add_q(ND p1,ND p2) c = DL_COMPARE(DL(m1),DL(m2)); switch ( c ) { case 0: +#if defined(__x86_64__) + can += nm_destructive_add_q(&m1,&m2,&mr0,&mr); +#else addq(CQ(m1),CQ(m2),&t); s = m1; m1 = NEXT(m1); if ( t ) { @@ -1236,6 +1016,7 @@ ND nd_add_q(ND p1,ND p2) can += 2; FREENM(s); } s = m2; m2 = NEXT(m2); FREENM(s); +#endif break; case 1: s = m1; m1 = NEXT(m1); NEXTNM2(mr0,mr,s); @@ -1505,7 +1286,7 @@ int ndv_check_candidate(NODE input,int obpe,int oadv,E NODE t,s; union oNDC dn; - ndv_setup(0,0,cand); + ndv_setup(0,0,cand,0); n = length(cand); /* membercheck : list is a subset of Id(cand) ? */ @@ -1518,7 +1299,7 @@ again: d = ndvtond(0,r); stat = nd_nf(0,d,nd_ps,0,0,&nf); if ( !stat ) { - nd_reconstruct(0,0,0); + nd_reconstruct(0,0); goto again; } else if ( nf ) return 0; if ( DP_Print ) { printf("."); fflush(stdout); } @@ -1758,6 +1539,47 @@ ND normalize_pbucket(int mod,PGeoBucket g) return r; } +int do_diagonalize(int sugar,int m) +{ + int i,nh,stat; + NODE r,g,t; + ND h,nf,s,head; + NDV nfv; + Q q,num,den; + union oNDC dn; + + for ( i = nd_psn-1; i >= 0 && 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); + stat = nd_nf(m,s,nd_ps,1,&dn,&nf); + if ( !stat ) return 0; + if ( !m ) { + NTOQ(NM(dn.z),SGN(dn.z),num); + mulq(HCQ(head),num,&q); HCQ(head) = q; + if ( DN(dn.z) ) { + NTOQ(DN(dn.z),1,den); + nd_mul_c_q(nf,den); + } + } + 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; + } + return 1; +} + /* return value = 0 => input is not a GB */ NODE nd_gb(int m,int ishomo,int checkonly) @@ -1766,9 +1588,9 @@ NODE nd_gb(int m,int ishomo,int checkonly) NODE r,g,t; ND_pairs d; ND_pairs l; - ND h,nf,s,head; + ND h,nf,s,head,nf1; NDV nfv; - Q q; + Q q,num,den; union oNDC dn; g = 0; d = 0; @@ -1782,26 +1604,11 @@ 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; + stat = do_diagonalize(sugar,m); + if ( !stat ) { + NEXT(l) = d; d = l; + d = nd_reconstruct(0,d); + goto again; } } sugar = SG(l); @@ -1810,7 +1617,7 @@ again: stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); goto again; } #if USE_GEOBUCKET @@ -1820,12 +1627,16 @@ again: #endif if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); goto again; } else if ( nf ) { if ( checkonly ) return 0; if ( DP_Print ) { printf("+"); fflush(stdout); } nd_removecont(m,nf); + if ( !m && nd_nalg ) { + nd_monic(0,&nf); + nd_removecont(m,nf); + } nfv = ndtondv(m,nf); nd_free(nf); nh = ndv_newps(m,nfv,0); d = update_pairs(d,g,nh); @@ -1845,6 +1656,59 @@ again: return g; } +int do_diagonalize_trace(int sugar,int m) +{ + int i,nh,stat; + NODE r,g,t; + ND h,nf,nfq,s,head; + NDV nfv,nfqv; + Q q,den,num; + union oNDC dn; + + for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) { + /* for nd_ps */ + s = ndvtond(m,nd_ps[i]); + s = nd_separate_head(s,&head); + stat = nd_nf_pbucket(m,s,nd_ps,1,&nf); + if ( !stat ) return 0; + 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); + stat = nd_nf(0,s,nd_ps_trace,1,&dn,&nf); + if ( !stat ) return 0; + NTOQ(NM(dn.z),SGN(dn.z),num); + mulq(HCQ(head),num,&q); HCQ(head) = q; + if ( DN(dn.z) ) { + NTOQ(DN(dn.z),1,den); + nd_mul_c_q(nf,den); + } + 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; + } + return 1; +} + +static struct oEGT eg_invdalg; +struct oEGT eg_le; + NODE nd_gb_trace(int m,int ishomo) { int i,nh,sugar,stat; @@ -1853,9 +1717,14 @@ NODE nd_gb_trace(int m,int ishomo) ND_pairs l; ND h,nf,nfq,s,head; NDV nfv,nfqv; - Q q; + Q q,den,num; union oNDC dn; + struct oEGT eg_monic,egm0,egm1; + int diag_count = 0; + init_eg(&eg_monic); + init_eg(&eg_invdalg); + init_eg(&eg_le); g = 0; d = 0; for ( i = 0; i < nd_psn; i++ ) { d = update_pairs(d,g,i); @@ -1866,46 +1735,24 @@ NODE nd_gb_trace(int m,int ishomo) again: l = nd_minp(d,&d); if ( SG(l) != sugar ) { +#if 1 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; + stat = do_diagonalize_trace(sugar,m); + diag_count = 0; + if ( !stat ) { + NEXT(l) = d; d = l; + d = nd_reconstruct(1,d); + goto again; } } +#endif sugar = SG(l); if ( DP_Print ) fprintf(asir_out,"%d",sugar); } stat = nd_sp(m,0,l,&h); if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,1,d); + d = nd_reconstruct(1,d); goto again; } #if USE_GEOBUCKET @@ -1915,7 +1762,7 @@ again: #endif if ( !stat ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,1,d); + d = nd_reconstruct(1,d); goto again; } else if ( nf ) { if ( nd_demand ) { @@ -1926,7 +1773,7 @@ again: if ( !nfq ) { if ( !nd_sp(0,1,l,&h) || !nd_nf(0,h,nd_ps_trace,!Top,0,&nfq) ) { NEXT(l) = d; d = l; - d = nd_reconstruct(m,1,d); + d = nd_reconstruct(1,d); goto again; } } @@ -1935,9 +1782,27 @@ again: 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); + if ( nd_nalg ) { + /* m|DN(HC(nf)^(-1)) => failure */ + get_eg(&egm0); + if ( !nd_monic(m,&nfq) ) return 0; + get_eg(&egm1); add_eg(&eg_monic,&egm0,&egm1); + nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq); + nfv = ndv_dup(0,nfqv); ndv_mod(m,nfv); nd_free(nf); + } else { + nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq); + nd_removecont(m,nf); nfv = ndtondv(m,nf); nd_free(nf); + } nh = ndv_newps(0,nfv,nfqv); + if ( ishomo && ++diag_count == diag_period ) { + diag_count = 0; + stat = do_diagonalize_trace(sugar,m); + if ( !stat ) { + NEXT(l) = d; d = l; + d = nd_reconstruct(1,d); + goto again; + } + } d = update_pairs(d,g,nh); g = update_base(g,nh); } else { @@ -1954,6 +1819,11 @@ again: else for ( t = g; t; t = NEXT(t) ) BDY(t) = (pointer)nd_ps_trace[(int)BDY(t)]; + if ( nd_nalg ) { + print_eg("monic",&eg_monic); + print_eg("invdalg",&eg_invdalg); + print_eg("le",&eg_le); + } return g; } @@ -1974,7 +1844,7 @@ NODE ndv_reduceall(int m,NODE f) NODE t,a0,a; union oNDC dn; NDV *w; - Q q; + Q q,num,den; n = length(f); #if 0 @@ -1984,16 +1854,23 @@ NODE ndv_reduceall(int m,NODE f) (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); + ndv_setup(m,0,f,0); 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); + nd_reconstruct(0,0); else { if ( DP_Print ) { printf("."); fflush(stdout); } - if ( !m ) { mulq(HCQ(head),dn.z,&q); HCQ(head) = q; } + if ( !m ) { + NTOQ(NM(dn.z),SGN(dn.z),num); + mulq(HCQ(head),num,&q); HCQ(head) = q; + if ( DN(dn.z) ) { + NTOQ(DN(dn.z),1,den); + nd_mul_c_q(nf,den); + } + } nf = nd_add(m,head,nf); ndv_free(nd_ps[i]); nd_removecont(m,nf); @@ -2317,7 +2194,7 @@ int ndv_newps(int m,NDV a,NDV aq) return nd_psn++; } -void ndv_setup(int mod,int trace,NODE f) +void ndv_setup(int mod,int trace,NODE f,int dont_sort) { int i,j,td,len,max; NODE s,s0,f0; @@ -2331,8 +2208,9 @@ void ndv_setup(int mod,int trace,NODE f) 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); + if ( !dont_sort ) + 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)); @@ -2368,20 +2246,156 @@ void ndv_setup(int mod,int trace,NODE f) } } +struct order_spec *append_block(struct order_spec *spec, + int nv,int nalg,int ord); + +extern VECT current_dl_weight_vector_obj; +static VECT prev_weight_vector_obj; + +void preprocess_algcoef(VL vv,VL av,struct order_spec *ord,LIST f, + struct order_spec **ord1p,LIST *f1p,NODE *alistp) +{ + NODE alist,t,s,r0,r,arg; + VL tv; + P poly; + DP d; + Alg alpha,dp; + DAlg inv,da,hc; + MP m; + int i,nvar,nalg,n; + NumberField nf; + LIST f1,f2; + struct order_spec *current_spec; + VECT obj,obj0; + Obj tmp; + + for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++); + for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++); + + for ( alist = 0, tv = av; tv; tv = NEXT(tv) ) { + NEXTNODE(alist,t); MKV(tv->v,poly); + MKAlg(poly,alpha); BDY(t) = (pointer)alpha; + tv->v = tv->v->priv; + } + NEXT(t) = 0; + + /* simplification, makeing polynomials monic */ + setfield_dalg(alist); + obj_algtodalg(f,&f1); + for ( t = BDY(f); t; t = NEXT(t) ) { + initd(ord); ptod(vv,vv,(P)BDY(t),&d); + hc = (DAlg)BDY(d)->c; + if ( NID(hc) == N_DA ) { + invdalg(hc,&inv); + for ( m = BDY(d); m; m = NEXT(m) ) { + muldalg(inv,(DAlg)m->c,&da); m->c = (P)da; + } + } + initd(ord); dtop(vv,vv,d,&poly); BDY(f) = (pointer)poly; + } + obj_dalgtoalg(f1,&f); + + /* append alg vars to the var list */ + for ( tv = vv; NEXT(tv); tv = NEXT(tv) ); + NEXT(tv) = av; + + /* append a block to ord */ + *ord1p = append_block(ord,nvar,nalg,2); + + /* create generator list */ + nf = get_numberfield(); + for ( i = nalg-1, t = BDY(f); i >= 0; i-- ) { + MKAlg(nf->defpoly[i],dp); + MKNODE(s,dp,t); t = s; + } + MKLIST(f1,t); + *alistp = alist; + algobjtorat(f1,f1p); + + /* creating a new weight vector */ + prev_weight_vector_obj = obj0 = current_dl_weight_vector_obj; + n = nvar+nalg+1; + MKVECT(obj,n); + if ( obj0 && obj0->len == nvar ) + for ( i = 0; i < nvar; i++ ) BDY(obj)[i] = BDY(obj0)[i]; + else + for ( i = 0; i < nvar; i++ ) BDY(obj)[i] = (pointer)ONE; + for ( i = 0; i < nalg; i++ ) BDY(obj)[i+nvar] = 0; + BDY(obj)[n-1] = (pointer)ONE; + arg = mknode(1,obj); + Pdp_set_weight(arg,&tmp); +} + +NODE postprocess_algcoef(VL av,NODE alist,NODE r) +{ + NODE s,t,u0,u; + P p; + VL tv; + Obj obj,tmp; + NODE arg; + + u0 = 0; + for ( t = r; t; t = NEXT(t) ) { + p = (P)BDY(t); + for ( tv = av, s = alist; tv; tv = NEXT(tv), s = NEXT(s) ) { + substr(CO,0,(Obj)p,tv->v,(Obj)BDY(s),&obj); p = (P)obj; + } + if ( OID(p) == O_P || (OID(p) == O_N && NID((Num)p) != N_A) ) { + NEXTNODE(u0,u); + BDY(u) = (pointer)p; + } + } + arg = mknode(1,prev_weight_vector_obj); + Pdp_set_weight(arg,&tmp); + + return u0; +} + void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp) { - VL tv,fv,vv,vc; - NODE fd,fd0,r,r0,t,x,s,xx; - int e,max,nvar; + VL tv,fv,vv,vc,av; + NODE fd,fd0,r,r0,t,x,s,xx,alist; + int e,max,nvar,i; NDV b; - int ishomo; + int ishomo,nalg; + Alg alpha,dp; + P p; + LIST f1,f2; + Obj obj; + NumberField nf; + struct order_spec *ord1; if ( !m && Demand ) nd_demand = 1; else nd_demand = 0; +#if 0 ndv_alloc = 0; +#endif get_vars((Obj)f,&fv); pltovl(v,&vv); for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); + switch ( ord->id ) { + case 1: + if ( ord->nv != nvar ) + error("nd_{gr,f4} : invalid order specification"); + break; + default: + break; + } + nd_nalg = 0; + av = 0; + if ( !m ) { + get_algtree((Obj)f,&av); + for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++ ); + nd_ntrans = nvar; + nd_nalg = nalg; + /* #i -> t#i */ + if ( nalg ) { + preprocess_algcoef(vv,av,ord,f,&ord1,&f1,&alist); + ord = ord1; + f = f1; + } + nvar += nalg; + } nd_init_ord(ord); for ( t = BDY(f), max = 0; t; t = NEXT(t) ) for ( tv = vv; tv; tv = NEXT(tv) ) { @@ -2398,7 +2412,7 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe if ( b ) { NEXTNODE(fd0,fd); BDY(fd) = (pointer)b; } } if ( fd0 ) NEXT(fd) = 0; - ndv_setup(m,0,fd0); + ndv_setup(m,0,fd0,0); x = f4?nd_f4(m):nd_gb(m,ishomo,0); nd_demand = 0; x = ndv_reducebase(x); @@ -2408,24 +2422,134 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe BDY(r) = ndvtop(m,CO,vv,BDY(t)); } if ( r0 ) NEXT(r) = 0; + if ( nalg ) + r0 = postprocess_algcoef(av,alist,r0); MKLIST(*rp,r0); +#if 0 fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); +#endif } -void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp) +void nd_gr_postproc(LIST f,LIST v,int m,struct order_spec *ord,int do_check,LIST *rp) { - struct order_spec ord1; - VL tv,fv,vv,vc; - NODE fd,fd0,in0,in,r,r0,t,s,cand; + VL tv,fv,vv,vc,av; + NODE fd,fd0,r,r0,t,x,s,xx,alist; + int e,max,nvar,i; + NDV b; + int ishomo,nalg; + Alg alpha,dp; + P p; + LIST f1,f2; + Obj obj; + NumberField nf; + struct order_spec *ord1; + + get_vars((Obj)f,&fv); pltovl(v,&vv); + for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); + switch ( ord->id ) { + case 1: + if ( ord->nv != nvar ) + error("nd_check : invalid order specification"); + break; + default: + break; + } + nd_nalg = 0; + av = 0; + if ( !m ) { + get_algtree((Obj)f,&av); + for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++ ); + nd_ntrans = nvar; + nd_nalg = nalg; + /* #i -> t#i */ + if ( nalg ) { + preprocess_algcoef(vv,av,ord,f,&ord1,&f1,&alist); + ord = ord1; + f = f1; + } + nvar += nalg; + } + 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; + ndv_setup(m,0,fd0,0); + for ( x = 0, i = 0; i < nd_psn; i++ ) + x = update_base(x,i); + if ( do_check ) { + x = nd_gb(m,ishomo,1); + if ( !x ) { + *rp = 0; + return; + } + } else { + for ( t = x; t; t = NEXT(t) ) + BDY(t) = (pointer)nd_ps[(int)BDY(t)]; + } + x = ndv_reducebase(x); + x = ndv_reduceall(m,x); + for ( r0 = 0, t = x; t; t = NEXT(t) ) { + NEXTNODE(r0,r); + BDY(r) = ndvtop(m,CO,vv,BDY(t)); + } + if ( r0 ) NEXT(r) = 0; + if ( nalg ) + r0 = postprocess_algcoef(av,alist,r0); + MKLIST(*rp,r0); +} + +void nd_gr_trace(LIST f,LIST v,int trace,int homo,int f4,struct order_spec *ord,LIST *rp) +{ + VL tv,fv,vv,vc,av; + NODE fd,fd0,in0,in,r,r0,t,s,cand,alist; int m,nocheck,nvar,mindex,e,max; NDV c; NMV a; P p; EPOS oepos; - int obpe,oadv,wmax,i,len,cbpe,ishomo; + int obpe,oadv,wmax,i,len,cbpe,ishomo,nalg; + Alg alpha,dp; + P poly; + LIST f1,f2; + Obj obj; + NumberField nf; + struct order_spec *ord1; get_vars((Obj)f,&fv); pltovl(v,&vv); for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); + switch ( ord->id ) { + case 1: + if ( ord->nv != nvar ) + error("nd_gr_trace : invalid order specification"); + break; + default: + break; + } + + get_algtree((Obj)f,&av); + for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++ ); + nd_ntrans = nvar; + nd_nalg = nalg; + /* #i -> t#i */ + if ( nalg ) { + preprocess_algcoef(vv,av,ord,f,&ord1,&f1,&alist); + ord = ord1; + f = f1; + } + nvar += nalg; + nocheck = 0; mindex = 0; @@ -2459,13 +2583,13 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru if ( in0 ) NEXT(in) = 0; if ( fd0 ) NEXT(fd) = 0; if ( !ishomo && homo ) { - for ( t = in0, wmax = 0; t; t = NEXT(t) ) { + for ( t = in0, wmax = max; 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_init_ord(ord1); nd_setup_parameters(nvar+1,wmax); for ( t = fd0; t; t = NEXT(t) ) ndv_homogenize((NDV)BDY(t),obpe,oadv,oepos); @@ -2473,8 +2597,8 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru while ( 1 ) { if ( Demand ) nd_demand = 1; - ndv_setup(m,1,fd0); - cand = nd_gb_trace(m,ishomo || homo); + ndv_setup(m,1,fd0,0); + cand = f4?nd_f4_trace(m):nd_gb_trace(m,ishomo || homo); if ( !cand ) { /* failure */ if ( trace > 1 ) { *rp = 0; return; } @@ -2504,7 +2628,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru m = get_lprime(++mindex); /* reset the parameters */ if ( !ishomo && homo ) { - nd_init_ord(&ord1); + nd_init_ord(ord1); nd_setup_parameters(nvar+1,wmax); } else { nd_init_ord(ord); @@ -2515,7 +2639,10 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru /* 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)); + for ( r = cand; r; r = NEXT(r) ) + BDY(r) = (pointer)ndvtop(0,CO,vv,BDY(r)); + if ( nalg ) + cand = postprocess_algcoef(av,alist,cand); MKLIST(*rp,cand); } @@ -2735,7 +2862,7 @@ void ndv_dehomogenize(NDV p,struct order_spec *ord) 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); + newadv = ROUND_FOR_ALIGN(sizeof(struct oNMV)+(newwpd-1)*sizeof(UINT)); for ( m = r = BDY(p), i = 0; i < len; NMV_ADV(m), NDV_NADV(r), i++ ) { CQ(r) = CQ(m); for ( j = 0; j < newexporigin; j++ ) DL(r)[j] = DL(m)[j]; @@ -2750,7 +2877,7 @@ void removecont_array(Q *c,int n) { struct oVECT v; Q d0,d1,a,u,u1,gcd; - int i; + int i,j; N qn,rn,gn; Q *q,*r; @@ -2787,6 +2914,7 @@ void nd_mul_c(int mod,ND p,int mul) int c,c1; if ( !p ) return; + if ( mul == 1 ) return; if ( mod == -1 ) for ( m = BDY(p); m; m = NEXT(m) ) CM(m) = _mulsf(CM(m),mul); @@ -2802,6 +2930,7 @@ void nd_mul_c_q(ND p,Q mul) Q c; if ( !p ) return; + if ( UNIQ(mul) ) return; for ( m = BDY(p); m; m = NEXT(m) ) { mulq(CQ(m),mul,&c); CQ(m) = c; } @@ -2879,17 +3008,46 @@ UINT *ndv_compute_bound(NDV p) return t; } +UINT *nd_compute_bound(ND p) +{ + UINT *d1,*d2,*t; + UINT u; + int i,j,k,l,len,ind; + NM m; + + if ( !p ) + return 0; + d1 = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + d2 = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + len = LEN(p); + m = BDY(p); ndl_copy(DL(m),d1); m = NEXT(m); + for ( m = NEXT(m); m; m = NEXT(m) ) { + ndl_lcm(DL(m),d1,d2); + t = d1; d1 = d2; d2 = t; + } + l = nd_nvar+31; + t = (UINT *)MALLOC_ATOMIC(l*sizeof(UINT)); + for ( i = nd_exporigin, ind = 0; i < nd_wpd; i++ ) { + u = d1[i]; + k = (nd_epw-1)*nd_bpe; + for ( j = 0; j < nd_epw; j++, k -= nd_bpe, ind++ ) + t[ind] = (u>>k)&nd_mask0; + } + for ( ; ind < l; ind++ ) t[ind] = 0; + return t; +} + int nd_get_exporigin(struct order_spec *ord) { switch ( ord->id ) { - case 0: + case 0: case 2: 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."); + case 3: + error("nd_get_exporigin : composite order is not supported yet."); } } @@ -2931,13 +3089,13 @@ void nd_setup_parameters(int nvar,int max) { nd_mask[nd_epw-i-1] = (nd_mask0<<(i*nd_bpe)); nd_mask1 |= (1<<(nd_bpe-1))<<(i*nd_bpe); } - nm_adv = sizeof(struct oNM)+(nd_wpd-1)*sizeof(UINT); - nmv_adv = sizeof(struct oNMV)+(nd_wpd-1)*sizeof(UINT); + nmv_adv = ROUND_FOR_ALIGN(sizeof(struct oNMV)+(nd_wpd-1)*sizeof(UINT)); nd_epos = nd_create_epos(nd_ord); nd_blockmask = nd_create_blockmask(nd_ord); + nd_work_vector = (int *)REALLOC(nd_work_vector,nd_nvar*sizeof(int)); } -ND_pairs nd_reconstruct(int mod,int trace,ND_pairs d) +ND_pairs nd_reconstruct(int trace,ND_pairs d) { int i,obpe,oadv,h; static NM prev_nm_free_list; @@ -3344,6 +3502,54 @@ ND ndv_mul_nm(int mod,NM m0,NDV p) } } +ND nd_quo(int mod,PGeoBucket bucket,NDV d) +{ + NM mq0,mq; + NMV tm; + Q q; + int i,nv,sg,c,c1,c2,hindex; + ND p,t,r; + N tnm; + + if ( bucket->m < 0 ) return 0; + else { + nv = NV(d); + mq0 = 0; + tm = (NMV)ALLOCA(nmv_adv); + while ( 1 ) { + hindex = mod?head_pbucket(mod,bucket):head_pbucket_q(bucket); + if ( hindex < 0 ) break; + p = bucket->body[hindex]; + NEXTNM(mq0,mq); + ndl_sub(HDL(p),HDL(d),DL(mq)); + ndl_copy(DL(mq),DL(tm)); + if ( mod ) { + c1 = invm(HCM(d),mod); c2 = HCM(p); + DMAR(c1,c2,0,mod,c); CM(mq) = c; + CM(tm) = mod-c; + } else { + divsn(NM(HCQ(p)),NM(HCQ(d)),&tnm); + NTOQ(tnm,SGN(HCQ(p))*SGN(HCQ(d)),CQ(mq)); + chsgnq(CQ(mq),&CQ(tm)); + } + t = ndv_mul_nmv_trunc(mod,tm,d,HDL(d)); + bucket->body[hindex] = nd_remove_head(p); + t = nd_remove_head(t); + add_pbucket(mod,bucket,t); + } + if ( !mq0 ) + r = 0; + else { + NEXT(mq) = 0; + for ( i = 0, mq = mq0; mq; mq = NEXT(mq), i++ ); + MKND(nv,mq0,i,r); + /* XXX */ + SG(r) = HTD(r); + } + return r; + } +} + void ndv_realloc(NDV p,int obpe,int oadv,EPOS oepos) { NMV m,mr,mr0,t; @@ -3426,7 +3632,7 @@ ND nd_dup(ND p) void ndv_mod(int mod,NDV p) { NMV t,d; - int r; + int r,s,u; int i,len,dlen; Obj gfs; @@ -3448,6 +3654,13 @@ void ndv_mod(int mod,NDV p) if ( r ) { if ( SGN(CQ(t)) < 0 ) r = mod-r; + if ( DN(CQ(t)) ) { + s = rem(DN(CQ(t)),mod); + if ( !s ) + error("ndv_mod : division by 0"); + s = invm(s,mod); + DMAR(r,s,0,mod,u); r = u; + } CM(d) = r; ndl_copy(DL(t),DL(d)); NMV_ADV(d); @@ -3493,7 +3706,7 @@ ND ptond(VL vl,VL dvl,P p) w = (DCP *)ALLOCA(k*sizeof(DCP)); for ( dc = DC(p), j = 0; j < k; dc = NEXT(dc), j++ ) w[j] = dc; for ( i = 0, tvl = dvl, v = VR(p); - vl && tvl->v != v; tvl = NEXT(tvl), i++ ); + tvl && tvl->v != v; tvl = NEXT(tvl), i++ ); if ( !tvl ) { for ( j = k-1, s = 0, MKV(v,x); j >= 0; j-- ) { t = ptond(vl,dvl,COEF(w[j])); @@ -3566,7 +3779,9 @@ NDV ndtondv(int mod,ND p) m0 = m = (NMV)GC_malloc_atomic_ignore_off_page(len*nmv_adv); else m0 = m = MALLOC(len*nmv_adv); +#if 0 ndv_alloc += nmv_adv*len; +#endif for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, NMV_ADV(m) ) { ndl_copy(DL(t),DL(m)); CQ(m) = CQ(t); @@ -3686,14 +3901,29 @@ void nd_init_ord(struct order_spec *ord) } break; case 1: + /* block order */ /* 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."); + /* matrix order */ + /* XXX */ + nd_dcomp = -1; + nd_isrlex = 0; + nd_matrix_len = ord->ord.matrix.row; + nd_matrix = ord->ord.matrix.matrix; + ndl_compare_function = ndl_matrix_compare; break; + case 3: + /* composite order */ + nd_dcomp = -1; + nd_isrlex = 0; + nd_worb_len = ord->ord.composite.length; + nd_worb = ord->ord.composite.w_or_b; + ndl_compare_function = ndl_composite_compare; + break; } nd_ord = ord; } @@ -3704,7 +3934,8 @@ BlockMask nd_create_blockmask(struct order_spec *ord) UINT *t; BlockMask bm; - if ( !ord->id ) + /* we only create mask table for block order */ + if ( ord->id != 1 ) return 0; n = ord->ord.block.length; bm = (BlockMask)MALLOC(sizeof(struct oBlockMask)); @@ -3762,7 +3993,14 @@ EPOS nd_create_epos(struct order_spec *ord) } break; case 2: - error("nd_create_epos : matrix order is not supported yet."); + /* matrix order */ + case 3: + /* composite order */ + 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; } return epos; } @@ -3778,6 +4016,10 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec int stat,nvar,max,e; union oNDC dn; + if ( !f ) { + *rp = 0; + return; + } pltovl(v,&vv); for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ ); @@ -3806,7 +4048,8 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec if ( m ) ndv_mod(m,(NDV)BDY(in)); NEXT(in) = 0; - ndv_setup(m,0,in0); + /* dont sort */ + ndv_setup(m,0,in0,1); nd_psn--; nd_scale=2; while ( 1 ) { @@ -3814,7 +4057,7 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec stat = nd_nf(m,nd,nd_ps,1,0,&nf); if ( !stat ) { nd_psn++; - nd_reconstruct(m,0,0); + nd_reconstruct(0,0); nd_psn--; } else break; @@ -3838,45 +4081,43 @@ int nd_to_vect(int mod,UINT *s0,int n,ND d,UINT *r) return i; } -int ndv_to_vect(int mod,UINT *s0,int n,NDV d,UINT *r) +int nd_to_vect_q(UINT *s0,int n,ND d,Q *r) { - NMV m; + NM m; UINT *t,*s; - int i,j,len; + int i; for ( i = 0; i < n; i++ ) r[i] = 0; - m = BDY(d); - len = LEN(d); - for ( i = j = 0, s = s0; j < len; j++, NMV_ADV(m)) { + for ( i = 0, s = s0, m = BDY(d); m; m = NEXT(m) ) { t = DL(m); for ( ; !ndl_equal(t,s); s += nd_wpd, i++ ); - r[i] = CM(m); + r[i] = CQ(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) +Q *nm_ind_pair_to_vect(int mod,UINT *s0,int n,NM_ind_pair pair) { NM m; NMV mr; UINT *d,*t,*s; NDV p; int i,j,len; + Q *r; 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); + r = (Q *)CALLOC(n,sizeof(Q)); + t = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); 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); + r[i] = CQ(mr); } - for ( i = 0; !r[i]; i++ ); - return i; + return r; } IndArray nm_ind_pair_to_vect_compress(int mod,UINT *s0,int n,NM_ind_pair pair) @@ -3927,7 +4168,100 @@ IndArray nm_ind_pair_to_vect_compress(int mod,UINT *s0 return r; } +int compress_array(Q *svect,Q *cvect,int n) +{ + int i,j; + for ( i = j = 0; i < n; i++ ) + if ( svect[i] ) cvect[j++] = svect[i]; + return j; +} + +void expand_array(Q *svect,Q *cvect,int n) +{ + int i,j; + + for ( i = j = 0; j < n; i++ ) + if ( svect[i] ) svect[i] = cvect[j++]; +} + +int ndv_reduce_vect_q(Q *svect,int trace,int col,IndArray *imat,NM_ind_pair *rp0,int nred) +{ + int i,j,k,len,pos,prev,nz; + Q cs,mcs,c1,c2,cr,gcd,t; + IndArray ivect; + unsigned char *ivc; + unsigned short *ivs; + unsigned int *ivi; + NDV redv; + NMV mr; + NODE rp; + int maxrs; + double hmag; + Q *cvect; + + maxrs = 0; + for ( i = 0; i < col && !svect[i]; i++ ); + if ( i == col ) return maxrs; + hmag = p_mag((P)svect[i])*nd_scale; + cvect = (Q *)ALLOCA(col*sizeof(Q)); + for ( i = 0; i < nred; i++ ) { + ivect = imat[i]; + k = ivect->head; + if ( svect[k] ) { + maxrs = MAX(maxrs,rp0[i]->sugar); + redv = trace?nd_ps_trace[rp0[i]->index]:nd_ps[rp0[i]->index]; + len = LEN(redv); mr = BDY(redv); + igcd_cofactor(svect[k],CQ(mr),&gcd,&cs,&cr); + chsgnq(cs,&mcs); + if ( !UNIQ(cr) ) { + for ( j = 0; j < col; j++ ) { + mulq(svect[j],cr,&c1); svect[j] = c1; + } + } + 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; + mulq(CQ(mr),mcs,&c2); addq(svect[pos],c2,&t); svect[pos] = t; + } + 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; + mulq(CQ(mr),mcs,&c2); addq(svect[pos],c2,&t); svect[pos] = t; + } + 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; + mulq(CQ(mr),mcs,&c2); addq(svect[pos],c2,&t); svect[pos] = t; + } + break; + } + for ( j = k+1; j < col && !svect[j]; j++ ); + if ( j == col ) break; + if ( hmag && ((double)p_mag((P)svect[j]) > hmag) ) { + nz = compress_array(svect,cvect,col); + removecont_array(cvect,nz); + expand_array(svect,cvect,nz); + hmag = ((double)p_mag((P)svect[j]))*nd_scale; + } + } + } + nz = compress_array(svect,cvect,col); + removecont_array(cvect,nz); + expand_array(svect,cvect,nz); + if ( DP_Print ) { + fprintf(asir_out,"-"); fflush(asir_out); + } + return maxrs; +} + int ndv_reduce_vect(int m,UINT *svect,int col,IndArray *imat,NM_ind_pair *rp0,int nred) { int i,j,k,len,pos,prev; @@ -4051,7 +4385,9 @@ NDV vect_to_ndv(UINT *vect,int spcol,int col,int *rhea if ( !len ) return 0; else { mr0 = (NMV)GC_malloc_atomic_ignore_off_page(nmv_adv*len); +#if 0 ndv_alloc += nmv_adv*len; +#endif mr = mr0; p = s0vect; for ( j = k = 0; j < col; j++, p += nd_wpd ) @@ -4065,15 +4401,77 @@ NDV vect_to_ndv(UINT *vect,int spcol,int col,int *rhea } } -int nd_sp_f4(int m,ND_pairs l,PGeoBucket bucket) +/* for preprocessed vector */ + +NDV vect_to_ndv_q(Q *vect,int spcol,int col,int *rhead,UINT *s0vect) { + int j,k,len; + UINT *p; + Q c; + NDV r; + NMV mr0,mr; + + for ( j = 0, len = 0; j < spcol; j++ ) if ( vect[j] ) len++; + if ( !len ) return 0; + else { + mr0 = (NMV)GC_malloc(nmv_adv*len); +#if 0 + ndv_alloc += nmv_adv*len; +#endif + mr = mr0; + p = s0vect; + for ( j = k = 0; j < col; j++, p += nd_wpd ) + if ( !rhead[j] ) { + if ( c = vect[k++] ) { + if ( DN(c) ) + error("afo"); + ndl_copy(p,DL(mr)); CQ(mr) = c; NMV_ADV(mr); + } + } + MKNDV(nd_nvar,mr0,len,r); + return r; + } +} + +/* for plain vector */ + +NDV plain_vect_to_ndv_q(Q *vect,int col,UINT *s0vect) +{ + int j,k,len; + UINT *p; + Q c; + NDV r; + NMV mr0,mr; + + for ( j = 0, len = 0; j < col; j++ ) if ( vect[j] ) len++; + if ( !len ) return 0; + else { + mr0 = (NMV)GC_malloc(nmv_adv*len); +#if 0 + ndv_alloc += nmv_adv*len; +#endif + mr = mr0; + p = s0vect; + for ( j = k = 0; j < col; j++, p += nd_wpd, k++ ) + if ( c = vect[k] ) { + if ( DN(c) ) + error("afo"); + ndl_copy(p,DL(mr)); CQ(mr) = c; NMV_ADV(mr); + } + MKNDV(nd_nvar,mr0,len,r); + return r; + } +} + +int nd_sp_f4(int m,int trace,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); + stat = nd_sp(m,trace,t,&spol); if ( !stat ) return 0; if ( spol ) { add_pbucket_symbolic(bucket,spol); @@ -4082,7 +4480,7 @@ int nd_sp_f4(int m,ND_pairs l,PGeoBucket bucket) return 1; } -int nd_symbolic_preproc(PGeoBucket bucket,UINT **s0vect,NODE *r) +int nd_symbolic_preproc(PGeoBucket bucket,int trace,UINT **s0vect,NODE *r) { NODE rp0,rp; NM mul,head,s0,s; @@ -4091,8 +4489,10 @@ int nd_symbolic_preproc(PGeoBucket bucket,UINT **s0vec UINT *s0v,*p; NM_ind_pair pair; ND red; + NDV *ps; s0 = 0; rp0 = 0; col = 0; + ps = trace?nd_ps_trace:nd_ps; while ( 1 ) { head = remove_head_pbucket_symbolic(bucket); if ( !head ) break; @@ -4105,9 +4505,9 @@ int nd_symbolic_preproc(PGeoBucket bucket,UINT **s0vec 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]); + sugar = TD(DL(mul))+SG(ps[index]); MKNM_ind_pair(pair,mul,index,sugar); - red = ndv_mul_nm_symbolic(mul,nd_ps[index]); + red = ndv_mul_nm_symbolic(mul,ps[index]); add_pbucket_symbolic(bucket,nd_remove_head(red)); NEXTNODE(rp0,rp); BDY(rp) = (pointer)pair; } @@ -4144,9 +4544,9 @@ NODE nd_f4(int m) PGeoBucket bucket; struct oEGT eg0,eg1,eg_f4; - if ( !m ) - error("nd_f4 : not implemented"); +#if 0 ndv_alloc = 0; +#endif g = 0; d = 0; for ( i = 0; i < nd_psn; i++ ) { d = update_pairs(d,g,i); @@ -4157,18 +4557,19 @@ NODE nd_f4(int m) l = nd_minsugarp(d,&d); sugar = SG(l); bucket = create_pbucket(); - stat = nd_sp_f4(m,l,bucket); + stat = nd_sp_f4(m,0,l,bucket); if ( !stat ) { for ( t = l; NEXT(t); t = NEXT(t) ); NEXT(t) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); continue; } - col = nd_symbolic_preproc(bucket,&s0vect,&rp0); + if ( bucket->m < 0 ) continue; + col = nd_symbolic_preproc(bucket,0,&s0vect,&rp0); if ( !col ) { for ( t = l; NEXT(t); t = NEXT(t) ); NEXT(t) = d; d = l; - d = nd_reconstruct(m,0,d); + d = nd_reconstruct(0,d); continue; } get_eg(&eg1); init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg1); @@ -4176,43 +4577,144 @@ NODE nd_f4(int m) 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); + nflist = nd_f4_red(m,l,0,s0vect,col,rp0,0); else - nflist = nd_f4_red_dist(m,l,s0vect,col,rp0); + nflist = nd_f4_red_dist(m,l,s0vect,col,rp0,0); /* adding new bases */ for ( r = nflist; r; r = NEXT(r) ) { nf = (NDV)BDY(r); ndv_removecont(m,nf); + if ( !m && nd_nalg ) { + ND nf1; + + nf1 = ndvtond(m,nf); + nd_monic(0,&nf1); + nd_removecont(m,nf1); + nf = ndtondv(m,nf1); + } 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)]; +#if 0 fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); +#endif return g; } -NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col,NODE rp0) +NODE nd_f4_trace(int m) { + int i,nh,stat,index; + NODE r,g; + ND_pairs d,l,l0,t; + ND spol,red; + NDV nf,redv,nfqv,nfv; + 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 nsp,nred,spcol,sprow,a; int *rhead; - int i,j,k,l,rank; - NODE rp,r0,r; + int spcol,sprow; + int sugar; + PGeoBucket bucket; + struct oEGT eg0,eg1,eg_f4; + + 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,0,l,bucket); + if ( !stat ) { + for ( t = l; NEXT(t); t = NEXT(t) ); + NEXT(t) = d; d = l; + d = nd_reconstruct(1,d); + continue; + } + if ( bucket->m < 0 ) continue; + col = nd_symbolic_preproc(bucket,0,&s0vect,&rp0); + if ( !col ) { + for ( t = l; NEXT(t); t = NEXT(t) ); + NEXT(t) = d; d = l; + d = nd_reconstruct(1,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); + nflist = nd_f4_red(m,l,0,s0vect,col,rp0,&l0); + if ( !l0 ) continue; + l = l0; + + /* over Q */ + bucket = create_pbucket(); + stat = nd_sp_f4(0,1,l,bucket); + if ( !stat ) { + for ( t = l; NEXT(t); t = NEXT(t) ); + NEXT(t) = d; d = l; + d = nd_reconstruct(1,d); + continue; + } + if ( bucket->m < 0 ) continue; + col = nd_symbolic_preproc(bucket,1,&s0vect,&rp0); + if ( !col ) { + for ( t = l; NEXT(t); t = NEXT(t) ); + NEXT(t) = d; d = l; + d = nd_reconstruct(1,d); + continue; + } + nflist = nd_f4_red(0,l,1,s0vect,col,rp0,0); + /* adding new bases */ + for ( r = nflist; r; r = NEXT(r) ) { + nfqv = (NDV)BDY(r); + ndv_removecont(0,nfqv); + if ( !rem(NM(HCQ(nfqv)),m) ) return 0; + if ( nd_nalg ) { + ND nf1; + + nf1 = ndvtond(m,nfqv); + nd_monic(0,&nf1); + nd_removecont(0,nf1); + nfqv = ndtondv(0,nf1); nd_free(nf1); + } + nfv = ndv_dup(0,nfqv); + ndv_mod(m,nfv); + ndv_removecont(m,nfv); + nh = ndv_newps(0,nfv,nfqv); + d = update_pairs(d,g,nh); + g = update_base(g,nh); + } + } + for ( r = g; r; r = NEXT(r) ) BDY(r) = (pointer)nd_ps_trace[(int)BDY(r)]; +#if 0 + fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); +#endif + return g; +} + +NODE nd_f4_red(int m,ND_pairs sp0,int trace,UINT *s0vect,int col,NODE rp0,ND_pairs *nz) +{ + IndArray *imat; + int nsp,nred,i; + int *rhead; + NODE r0,rp; ND_pairs sp; - ND spol; - int **spmat; - UINT *svect,*v; - int *colstat; - struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2; NM_ind_pair *rvect; - int maxrs; - int *spsugar; - get_eg(&eg0); for ( sp = sp0, nsp = 0; sp; sp = NEXT(sp), nsp++ ); - nred = length(rp0); spcol = col-nred; + nred = length(rp0); imat = (IndArray *)ALLOCA(nred*sizeof(IndArray)); rhead = (int *)ALLOCA(col*sizeof(int)); for ( i = 0; i < col; i++ ) rhead[i] = 0; @@ -4224,11 +4726,36 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col imat[i] = nm_ind_pair_to_vect_compress(m,s0vect,col,rvect[i]); rhead[imat[i]->head] = 1; } + if ( m ) + r0 = nd_f4_red_main(m,sp0,nsp,s0vect,col,rvect,rhead,imat,nred,nz); + else + r0 = nd_f4_red_q_main(sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred); + return r0; +} +NODE nd_f4_red_main(int m,ND_pairs sp0,int nsp,UINT *s0vect,int col, + NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred,ND_pairs *nz) +{ + int spcol,sprow,a; + int i,j,k,l,rank; + NODE r0,r; + ND_pairs sp; + ND spol; + int **spmat; + UINT *svect,*v; + int *colstat; + struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2; + int maxrs; + int *spsugar; + ND_pairs *spactive; + + spcol = col-nred; + get_eg(&eg0); /* elimination (1st step) */ spmat = (int **)ALLOCA(nsp*sizeof(UINT *)); svect = (UINT *)ALLOCA(col*sizeof(UINT)); spsugar = (int *)ALLOCA(nsp*sizeof(UINT)); + spactive = !nz?0:(ND_pairs *)ALLOCA(nsp*sizeof(ND_pairs)); for ( a = sprow = 0, sp = sp0; a < nsp; a++, sp = NEXT(sp) ) { nd_sp(m,0,sp,&spol); if ( !spol ) continue; @@ -4243,6 +4770,8 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col for ( j = k = 0; j < col; j++ ) if ( !rhead[j] ) v[k++] = svect[j]; spsugar[sprow] = MAX(maxrs,SG(spol)); + if ( nz ) + spactive[sprow] = sp; sprow++; } nd_free(spol); @@ -4260,7 +4789,7 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col 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); + rank = nd_gauss_elim_mod(spmat,spsugar,spactive,sprow,spcol,m,colstat); r0 = 0; for ( i = 0; i < rank; i++ ) { NEXTNODE(r0,r); BDY(r) = @@ -4268,6 +4797,8 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col SG((NDV)BDY(r)) = spsugar[i]; GC_free(spmat[i]); } + if ( r0 ) NEXT(r) = 0; + for ( ; i < sprow; i++ ) GC_free(spmat[i]); get_eg(&eg2); init_eg(&eg_f4_2); add_eg(&eg_f4_2,&eg1,&eg2); init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg2); @@ -4277,9 +4808,152 @@ NODE nd_f4_red(int m,ND_pairs sp0,UINT *s0vect,int col nsp,nred,sprow,spcol,rank); fprintf(asir_out,"%fsec\n",eg_f4.exectime+eg_f4.gctime); } + if ( nz ) { + for ( i = 0; i < rank-1; i++ ) NEXT(spactive[i]) = spactive[i+1]; + if ( rank > 0 ) { + NEXT(spactive[rank-1]) = 0; + *nz = spactive[0]; + } else + *nz = 0; + } return r0; } +#if 1 +NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,int trace,UINT *s0vect,int col, + NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred) +{ + int spcol,sprow,a; + int i,j,k,l,rank; + NODE r0,r; + ND_pairs sp; + ND spol; + Q **spmat; + Q *svect,*v; + int *colstat; + struct oEGT eg0,eg1,eg2,eg_f4,eg_f4_1,eg_f4_2; + int maxrs; + int *spsugar; + pointer *w; + + spcol = col-nred; + get_eg(&eg0); + /* elimination (1st step) */ + spmat = (Q **)ALLOCA(nsp*sizeof(Q *)); + svect = (Q *)ALLOCA(col*sizeof(Q)); + spsugar = (int *)ALLOCA(nsp*sizeof(Q)); + for ( a = sprow = 0, sp = sp0; a < nsp; a++, sp = NEXT(sp) ) { + nd_sp(0,trace,sp,&spol); + if ( !spol ) continue; + nd_to_vect_q(s0vect,col,spol,svect); + maxrs = ndv_reduce_vect_q(svect,trace,col,imat,rvect,nred); + for ( i = 0; i < col; i++ ) if ( svect[i] ) break; + if ( i < col ) { + spmat[sprow] = v = (Q *)MALLOC(spcol*sizeof(Q)); + for ( j = k = 0; j < col; j++ ) + if ( !rhead[j] ) v[k++] = svect[j]; + spsugar[sprow] = MAX(maxrs,SG(spol)); + sprow++; + } +/* nd_free(spol); */ + } + get_eg(&eg1); init_eg(&eg_f4_1); add_eg(&eg_f4_1,&eg0,&eg1); + if ( DP_Print ) { + fprintf(asir_out,"elim1=%fsec,",eg_f4_1.exectime+eg_f4_1.gctime); + fflush(asir_out); + } + /* free index arrays */ +/* for ( i = 0; i < nred; i++ ) GC_free(imat[i]->index.c); */ + + /* elimination (2nd step) */ + colstat = (int *)ALLOCA(spcol*sizeof(int)); + rank = nd_gauss_elim_q(spmat,spsugar,sprow,spcol,colstat); + w = (pointer *)ALLOCA(rank*sizeof(pointer)); + for ( i = 0; i < rank; i++ ) { + w[rank-i-1] = (pointer)vect_to_ndv_q(spmat[i],spcol,col,rhead,s0vect); + SG((NDV)w[rank-i-1]) = spsugar[i]; +/* GC_free(spmat[i]); */ + } +#if 1 + qsort(w,rank,sizeof(NDV), + (int (*)(const void *,const void *))ndv_compare); +#endif + r0 = 0; + for ( i = 0; i < rank; i++ ) { + NEXTNODE(r0,r); BDY(r) = w[i]; + } + if ( r0 ) NEXT(r) = 0; + +/* for ( ; i < sprow; i++ ) GC_free(spmat[i]); */ + get_eg(&eg2); init_eg(&eg_f4_2); add_eg(&eg_f4_2,&eg1,&eg2); + init_eg(&eg_f4); add_eg(&eg_f4,&eg0,&eg2); + if ( DP_Print ) { + fprintf(asir_out,"elim2=%fsec\n",eg_f4_2.exectime+eg_f4_2.gctime); + fprintf(asir_out,"nsp=%d,nred=%d,spmat=(%d,%d),rank=%d ", + nsp,nred,sprow,spcol,rank); + fprintf(asir_out,"%fsec\n",eg_f4.exectime+eg_f4.gctime); + } + return r0; +} +#else +void printm(Q **mat,int row,int col) +{ + int i,j; + printf("["); + for ( i = 0; i < row; i++ ) { + for ( j = 0; j < col; j++ ) { + printexpr(CO,mat[i][j]); printf(" "); + } + printf("]\n"); + } +} + +NODE nd_f4_red_q_main(ND_pairs sp0,int nsp,UINT *s0vect,int col, + NM_ind_pair *rvect,int *rhead,IndArray *imat,int nred) +{ + int row,a; + int i,j,rank; + NODE r0,r; + ND_pairs sp; + ND spol; + Q **mat; + int *colstat; + int *sugar; + + row = nsp+nred; + /* make the matrix */ + mat = (Q **)ALLOCA(row*sizeof(Q *)); + sugar = (int *)ALLOCA(row*sizeof(int)); + for ( row = a = 0, sp = sp0; a < nsp; a++, sp = NEXT(sp) ) { + nd_sp(0,0,sp,&spol); + if ( !spol ) continue; + mat[row] = (Q *)MALLOC(col*sizeof(Q)); + nd_to_vect_q(s0vect,col,spol,mat[row]); + sugar[row] = SG(spol); + row++; + } + for ( i = 0; i < nred; i++, row++ ) { + mat[row] = nm_ind_pair_to_vect(0,s0vect,col,rvect[i]); + sugar[row] = rvect[i]->sugar; + } + /* elimination */ + colstat = (int *)ALLOCA(col*sizeof(int)); + rank = nd_gauss_elim_q(mat,sugar,row,col,colstat); + r0 = 0; + for ( i = 0; i < rank; i++ ) { + for ( j = 0; j < col; j++ ) if ( mat[i][j] ) break; + if ( j == col ) error("nd_f4_red_q_main : cannot happen"); + if ( rhead[j] ) continue; + NEXTNODE(r0,r); BDY(r) = + (pointer)plain_vect_to_ndv_q(mat[i],col,s0vect); + SG((NDV)BDY(r)) = sugar[i]; + } + if ( r0 ) NEXT(r) = 0; + printf("\n"); + return r0; +} +#endif + FILE *nd_write,*nd_read; void nd_send_int(int a) { @@ -4343,7 +5017,9 @@ NDV nd_recv_ndv() if ( !len ) return 0; else { m0 = m = (NMV)GC_malloc_atomic_ignore_off_page(nmv_adv*len); +#if 0 ndv_alloc += len*nmv_adv; +#endif for ( i = 0; i < len; i++, NMV_ADV(m) ) { CM(m) = nd_recv_int(); nd_recv_intarray(DL(m),nd_wpd); @@ -4371,7 +5047,7 @@ int ox_exec_f4_red(Q proc) return s; } -NODE nd_f4_red_dist(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,ND_pairs *nz) { int nsp,nred; int i,rank,s; @@ -4392,7 +5068,7 @@ NODE nd_f4_red_dist(int m,ND_pairs sp0,UINT *s0vect,in nd_send_int(nd_wpd); nd_send_int(nmv_adv); - saveobj(nd_write,dp_current_spec.obj); fflush(nd_write); + 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]); @@ -4438,7 +5114,7 @@ void nd_exec_f4_red_dist() ND_pairs *sp0; int *colstat; int a,sprow,rank; - struct order_spec ord; + struct order_spec *ord; Obj ordspec; ND spol; int maxrs; @@ -4453,8 +5129,8 @@ void nd_exec_f4_red_dist() nmv_adv = nd_recv_int(); loadobj(nd_read,&ordspec); - create_order_spec(ordspec,&ord); - nd_init_ord(&ord); + create_order_spec(0,ordspec,&ord); + nd_init_ord(ord); nd_setup_parameters(nd_nvar,0); nd_psn = nd_recv_int(); @@ -4525,7 +5201,7 @@ void nd_exec_f4_red_dist() 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); + rank = nd_gauss_elim_mod(spmat,spsugar,0,sprow,spcol,m,colstat); nd_send_int(rank); for ( i = 0; i < rank; i++ ) { nf = vect_to_ndv(spmat[i],spcol,col,rhead,s0vect); @@ -4534,11 +5210,64 @@ void nd_exec_f4_red_dist() fflush(nd_write); } -int nd_gauss_elim_mod(int **mat0,int *sugar,int row,int col,int md,int *colstat) +int nd_gauss_elim_q(Q **mat0,int *sugar,int row,int col,int *colstat) { + int mod,i,j,t,c,rank,rank0,inv; + int *ci,*ri; + Q dn; + MAT m,nm; + int **wmat; + + /* XXX */ + mod = 99999989; + wmat = (int **)ALLOCA(row*sizeof(int *)); + for ( i = 0; i < row; i++ ) { + wmat[i] = (int *)ALLOCA(col*sizeof(int)); + for ( j = 0; j < col; j++ ) { + if ( mat0[i][j] ) { + t = rem(NM(mat0[i][j]),mod); + if ( SGN(mat0[i][j]) < 0 ) t = mod-t; + wmat[i][j] = t; + } else + wmat[i][j] = 0; + } + } + rank0 = nd_gauss_elim_mod(wmat,sugar,0,row,col,mod,colstat); + NEWMAT(m); m->row = row; m->col = col; m->body = (pointer **)mat0; + rank = generic_gauss_elim(m,&nm,&dn,&ri,&ci); + if ( rank != rank0 ) + error("afo"); + for ( i = 0; i < row; i++ ) + for ( j = 0; j < col; j++ ) + mat0[i][j] = 0; + c = col-rank; + for ( i = 0; i < rank; i++ ) { + mat0[i][ri[i]] = dn; + for ( j = 0; j < c; j++ ) + mat0[i][ci[j]] = (Q)BDY(nm)[i][j]; + } + inv = invm(rem(NM(dn),mod),mod); + if ( SGN(dn) < 0 ) inv = mod-inv; + for ( i = 0; i < row; i++ ) + for ( j = 0; j < col; j++ ) { + if ( mat0[i][j] ) { + t = rem(NM(mat0[i][j]),mod); + if ( SGN(mat0[i][j]) < 0 ) t = mod-t; + } else + t = 0; + c = dmar(t,inv,0,mod); + if ( wmat[i][j] != c ) + error("afo"); + } + return rank; +} + +int nd_gauss_elim_mod(int **mat0,int *sugar,ND_pairs *spactive,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; + ND_pairs pair; mat = (unsigned int **)mat0; for ( rank = 0, j = 0; j < col; j++ ) { @@ -4555,6 +5284,10 @@ int nd_gauss_elim_mod(int **mat0,int *sugar,int row,in if ( i != rank ) { t = mat[i]; mat[i] = mat[rank]; mat[rank] = t; s = sugar[i]; sugar[i] = sugar[rank]; sugar[rank] = s; + if ( spactive ) { + pair = spactive[i]; spactive[i] = spactive[rank]; + spactive[rank] = pair; + } } pivot = mat[rank]; s = sugar[rank]; @@ -4739,4 +5472,385 @@ NDV ndv_load(int index) MKNDV(nv,m0,len,d); SG(d) = sugar; return d; +} + +void nd_det(int mod,MAT f,P *rp) +{ + VL fv,tv; + int n,i,j,max,e,nvar,sgn,k0,l0,len0,len,k,l,a; + pointer **m; + Q mone; + P **w; + P mp,r; + NDV **dm; + NDV *t,*mi,*mj; + NDV d,s,mij,mjj; + ND u; + NMV nmv; + UINT *bound; + PGeoBucket bucket; + struct order_spec *ord; + Q dq,dt,ds; + N gn,qn,dn0,nm,dn; + + create_order_spec(0,0,&ord); + nd_init_ord(ord); + get_vars((Obj)f,&fv); + if ( f->row != f->col ) + error("nd_det : non-square matrix"); + n = f->row; + m = f->body; + for ( nvar = 0, tv = fv; tv; tv = NEXT(tv), nvar++ ); + + if ( !nvar ) { + if ( !mod ) + detp(CO,(P **)m,n,rp); + else { + w = (P **)almat_pointer(n,n); + for ( i = 0; i < n; i++ ) + for ( j = 0; j < n; j++ ) + ptomp(mod,(P)m[i][j],&w[i][j]); + detmp(CO,mod,w,n,&mp); + mptop(mp,rp); + } + return; + } + + if ( !mod ) { + w = (P **)almat_pointer(n,n); + dq = ONE; + for ( i = 0; i < n; i++ ) { + dn0 = ONEN; + for ( j = 0; j < n; j++ ) { + if ( !m[i][j] ) continue; + lgp(m[i][j],&nm,&dn); + gcdn(dn0,dn,&gn); divsn(dn0,gn,&qn); muln(qn,dn,&dn0); + } + if ( !UNIN(dn0) ) { + NTOQ(dn0,1,ds); + for ( j = 0; j < n; j++ ) + mulp(CO,(P)m[i][j],(P)ds,&w[i][j]); + mulq(dq,ds,&dt); dq = dt; + } else + for ( j = 0; j < n; j++ ) + w[i][j] = (P)m[i][j]; + } + m = (pointer **)w; + } + + for ( i = 0, max = 0; i < n; i++ ) + for ( j = 0; j < n; j++ ) + for ( tv = fv; tv; tv = NEXT(tv) ) { + e = getdeg(tv->v,(P)m[i][j]); + max = MAX(e,max); + } + nd_setup_parameters(nvar,max); + dm = (NDV **)almat_pointer(n,n); + for ( i = 0, max = 0; i < n; i++ ) + for ( j = 0; j < n; j++ ) { + dm[i][j] = ptondv(CO,fv,m[i][j]); + if ( mod ) ndv_mod(mod,dm[i][j]); + if ( dm[i][j] && !LEN(dm[i][j]) ) dm[i][j] = 0; + } + d = ptondv(CO,fv,(P)ONE); + if ( mod ) ndv_mod(mod,d); + chsgnq(ONE,&mone); + for ( j = 0, sgn = 1; j < n; j++ ) { + if ( DP_Print ) fprintf(stderr,".",j); + for ( i = j; i < n && !dm[i][j]; i++ ); + if ( i == n ) { + *rp = 0; + return; + } + k0 = i; l0 = j; len0 = LEN(dm[k0][l0]); + for ( k = j; k < n; k++ ) + for ( l = j; l < n; l++ ) + if ( dm[k][l] && LEN(dm[k][l]) < len0 ) { + k0 = k; l0 = l; len0 = LEN(dm[k][l]); + } + if ( k0 != j ) { + t = dm[j]; dm[j] = dm[k0]; dm[k0] = t; + sgn = -sgn; + } + if ( l0 != j ) { + for ( k = j; k < n; k++ ) { + s = dm[k][j]; dm[k][j] = dm[k][l0]; dm[k][l0] = s; + } + sgn = -sgn; + } + bound = nd_det_compute_bound(dm,n,j); + if ( ndl_check_bound(bound,bound) ) + nd_det_reconstruct(dm,n,j,d); + + for ( i = j+1, mj = dm[j], mjj = mj[j]; i < n; i++ ) { +/* if ( DP_Print ) fprintf(stderr," i=%d\n ",i); */ + mi = dm[i]; mij = mi[j]; + if ( mod ) + ndv_mul_c(mod,mij,mod-1); + else + ndv_mul_c_q(mij,mone); + for ( k = j+1; k < n; k++ ) { +/* if ( DP_Print ) fprintf(stderr,"k=%d ",k); */ + bucket = create_pbucket(); + if ( mi[k] ) { + nmv = BDY(mjj); len = LEN(mjj); + for ( a = 0; a < len; a++, NMV_ADV(nmv) ) { + u = ndv_mul_nmv_trunc(mod,nmv,mi[k],DL(BDY(d))); + add_pbucket(mod,bucket,u); + } + } + if ( mj[k] && mij ) { + nmv = BDY(mij); len = LEN(mij); + for ( a = 0; a < len; a++, NMV_ADV(nmv) ) { + u = ndv_mul_nmv_trunc(mod,nmv,mj[k],DL(BDY(d))); + add_pbucket(mod,bucket,u); + } + } + u = nd_quo(mod,bucket,d); + mi[k] = ndtondv(mod,u); + } +/* if ( DP_Print ) fprintf(stderr,"\n",k); */ + } + d = mjj; + } + if ( DP_Print ) fprintf(stderr,"\n",k); + if ( sgn < 0 ) + if ( mod ) + ndv_mul_c(mod,d,mod-1); + else + ndv_mul_c_q(d,mone); + r = ndvtop(mod,CO,fv,d); + if ( !mod && !UNIQ(dq) ) + divsp(CO,r,(P)dq,rp); + else + *rp = r; +} + +ND ndv_mul_nmv_trunc(int mod,NMV m0,NDV p,UINT *d) +{ + NM mr,mr0; + NM tnm; + NMV m; + UINT *d0,*dt,*dm; + int c,n,td,i,c1,c2,len; + Q q; + ND r; + + if ( !p ) return 0; + else { + n = NV(p); m = BDY(p); len = LEN(p); + d0 = DL(m0); + td = TD(d); + mr0 = 0; + NEWNM(tnm); + if ( mod ) { + c = CM(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + ndl_add(DL(m),d0,DL(tnm)); + if ( ndl_reducible(DL(tnm),d) ) { + NEXTNM(mr0,mr); + c1 = CM(m); DMAR(c1,c,0,mod,c2); CM(mr) = c2; + ndl_copy(DL(tnm),DL(mr)); + } + } + } else { + q = CQ(m0); + for ( i = 0; i < len; i++, NMV_ADV(m) ) { + ndl_add(DL(m),d0,DL(tnm)); + if ( ndl_reducible(DL(tnm),d) ) { + NEXTNM(mr0,mr); + mulq(CQ(m),q,&CQ(mr)); + ndl_copy(DL(tnm),DL(mr)); + } + } + } + if ( !mr0 ) + return 0; + else { + NEXT(mr) = 0; + for ( len = 0, mr = mr0; mr; mr = NEXT(mr), len++ ); + MKND(NV(p),mr0,len,r); + SG(r) = SG(p) + TD(d0); + return r; + } + } +} + +void nd_det_reconstruct(NDV **dm,int n,int j,NDV d) +{ + int i,obpe,oadv,h,k,l; + static NM prev_nm_free_list; + EPOS oepos; + + obpe = nd_bpe; + oadv = nmv_adv; + oepos = nd_epos; + if ( obpe < 2 ) nd_bpe = 2; + else if ( obpe < 3 ) nd_bpe = 3; + else if ( obpe < 4 ) nd_bpe = 4; + else if ( obpe < 5 ) nd_bpe = 5; + else if ( obpe < 6 ) nd_bpe = 6; + else if ( obpe < 8 ) nd_bpe = 8; + else if ( obpe < 10 ) nd_bpe = 10; + else if ( obpe < 16 ) nd_bpe = 16; + else if ( obpe < 32 ) nd_bpe = 32; + else error("nd_det_reconstruct : exponent too large"); + + nd_setup_parameters(nd_nvar,0); + prev_nm_free_list = _nm_free_list; + _nm_free_list = 0; + for ( k = j; k < n; k++ ) + for (l = j; l < n; l++ ) + ndv_realloc(dm[k][l],obpe,oadv,oepos); + ndv_realloc(d,obpe,oadv,oepos); + prev_nm_free_list = 0; +#if 0 + GC_gcollect(); +#endif +} + +UINT *nd_det_compute_bound(NDV **dm,int n,int j) +{ + UINT *d0,*d1,*d,*t,*r; + int k,l; + + d0 = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + d1 = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + for ( k = 0; k < nd_wpd; k++ ) d0[k] = 0; + for ( k = j; k < n; k++ ) + for ( l = j; l < n; l++ ) + if ( dm[k][l] ) { + d = ndv_compute_bound(dm[k][l]); + ndl_lcm(d,d0,d1); + t = d1; d1 = d0; d0 = t; + } + r = (UINT *)ALLOCA(nd_wpd*sizeof(UINT)); + for ( k = 0; k < nd_wpd; k++ ) r[k] = d0[k]; + return r; +} + +DL nd_separate_d(UINT *d,UINT *trans) +{ + int n,td,i,e,j; + DL a; + + ndl_zero(trans); + td = 0; + for ( i = 0; i < nd_ntrans; i++ ) { + e = GET_EXP(d,i); + PUT_EXP(trans,i,e); + td += MUL_WEIGHT(e,i); + } + if ( nd_ntrans+nd_nalg < nd_nvar ) { + /* homogenized */ + i = nd_nvar-1; + e = GET_EXP(d,i); + PUT_EXP(trans,i,e); + td += MUL_WEIGHT(e,i); + } + TD(trans) = td; + if ( nd_blockmask) ndl_weight_mask(trans); + NEWDL(a,nd_nalg); + td = 0; + for ( i = 0; i < nd_nalg; i++ ) { + j = nd_ntrans+i; + e = GET_EXP(d,j); + a->d[i] = e; + td += e; + } + a->td = td; + return a; +} + +int nd_monic(int mod,ND *p) +{ + UINT *trans,*t; + DL alg; + MP mp0,mp; + NM m,m0,m1,ma0,ma,mb,mr0,mr; + ND r; + DL dl; + DP nm; + NDV ndv; + DAlg inv,cd; + ND s,c; + Q l,mul; + N ln; + int n,ntrans,i,e,td,is_lc,len; + NumberField nf; + struct oEGT eg0,eg1; + + if ( !(nf = get_numberfield()) ) + error("nd_monic : current_numberfield is not set"); + + /* Q coef -> DAlg coef */ + NEWNM(ma0); ma = ma0; + m = BDY(*p); + is_lc = 1; + while ( 1 ) { + NEWMP(mp0); mp = mp0; + mp->c = (P)CQ(m); + mp->dl = nd_separate_d(DL(m),DL(ma)); + NEWNM(mb); + for ( m = NEXT(m); m; m = NEXT(m) ) { + alg = nd_separate_d(DL(m),DL(mb)); + if ( !ndl_equal(DL(ma),DL(mb)) ) + break; + NEXTMP(mp0,mp); mp->c = (P)CQ(m); mp->dl = alg; + } + NEXT(mp) = 0; + MKDP(nd_nalg,mp0,nm); + MKDAlg(nm,ONE,cd); + if ( is_lc == 1 ) { + /* if the lc is a rational number, we have nothing to do */ + if ( !mp0->dl->td ) + return 1; + + get_eg(&eg0); + invdalg(cd,&inv); + get_eg(&eg1); add_eg(&eg_invdalg,&eg0,&eg1); + /* check the validity of inv */ + if ( mod && !rem(NM(inv->dn),mod) ) + return 0; + CA(ma) = nf->one; + is_lc = 0; + ln = ONEN; + } else { + muldalg(cd,inv,&CA(ma)); + lcmn(ln,NM(CA(ma)->dn),&ln); + } + if ( m ) { + NEXT(ma) = mb; ma = mb; + } else { + NEXT(ma) = 0; + break; + } + } + /* l = lcm(denoms) */ + NTOQ(ln,1,l); + for ( mr0 = 0, m = ma0; m; m = NEXT(m) ) { + divq(l,CA(m)->dn,&mul); + for ( mp = BDY(CA(m)->nm); mp; mp = NEXT(mp) ) { + NEXTNM(mr0,mr); + mulq((Q)mp->c,mul,&CQ(mr)); + dl = mp->dl; + td = TD(DL(m)); + ndl_copy(DL(m),DL(mr)); + for ( i = 0; i < nd_nalg; i++ ) { + e = dl->d[i]; + PUT_EXP(DL(mr),i+nd_ntrans,e); + td += MUL_WEIGHT(e,i+nd_ntrans); + } + TD(DL(mr)) = td; + if ( nd_blockmask) ndl_weight_mask(DL(mr)); + } + } + NEXT(mr) = 0; + for ( len = 0, mr = mr0; mr; mr = NEXT(mr), len++ ); + MKND(NV(*p),mr0,len,r); + /* XXX */ + SG(r) = SG(*p); + nd_free(*p); + *p = r; + return 1; }