=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v retrieving revision 1.169 retrieving revision 1.174 diff -u -p -r1.169 -r1.174 --- OpenXM_contrib2/asir2000/engine/nd.c 2009/02/10 06:33:08 1.169 +++ OpenXM_contrib2/asir2000/engine/nd.c 2009/06/01 07:31:54 1.174 @@ -1,4 +1,4 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.168 2009/02/09 10:21:29 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.173 2009/02/15 09:22:07 noro Exp $ */ #include "nd.h" @@ -46,9 +46,10 @@ static int nd_worb_len; static int nd_found,nd_create,nd_notfirst; static int nmv_adv; static int nd_demand; -static int nd_module,nd_ispot,nd_mpos; +static int nd_module,nd_ispot,nd_mpos,nd_pot_nelim; static NODE nd_tracelist; static NODE nd_alltracelist; +static int nd_gentrace,nd_gensyz,nd_nora; NumberField get_numberfield(); UINT *nd_det_compute_bound(NDV **dm,int n,int j); @@ -67,6 +68,7 @@ P ndc_div(int mod,union oNDC a,union oNDC b); P ndctop(int mod,union oNDC c); void finalize_tracelist(int i,P cont); void conv_ilist(int demand,int trace,NODE g,int **indp); +void parse_nd_option(NODE opt); extern int Denominator,DP_Multiple; @@ -579,6 +581,14 @@ int ndl_module_grlex_compare(UINT *d1,UINT *d2) int i,c; if ( nd_ispot ) { + if ( nd_pot_nelim && MPOS(d1)>=nd_pot_nelim+1 && MPOS(d2) >= nd_pot_nelim+1 ) { + if ( TD(d1) > TD(d2) ) return 1; + else if ( TD(d1) < TD(d2) ) return -1; + if ( c = ndl_lex_compare(d1,d2) ) return c; + if ( MPOS(d1) < MPOS(d2) ) return 1; + else if ( MPOS(d1) > MPOS(d2) ) return -1; + return 0; + } if ( MPOS(d1) < MPOS(d2) ) return 1; else if ( MPOS(d1) > MPOS(d2) ) return -1; } @@ -1325,7 +1335,7 @@ int nd_nf(int mod,ND d,ND g,NDV *ps,int full,NDC dn,ND p = nd_demand ? ndv_load(index) : ps[index]; /* d+g -> div*(d+g)+mul*p */ g = nd_reduce2(mod,d,g,p,mul,dn,&div); - if ( GenTrace ) { + if ( nd_gentrace ) { /* Trace=[div,index,mul,ONE] */ STOQ(index,iq); nmtodp(mod,mul,&dmul); @@ -1335,7 +1345,7 @@ int nd_nf(int mod,ND d,ND g,NDV *ps,int full,NDC dn,ND if ( !mod && g && ((double)(p_mag(HCP(g))) > hmag) ) { hg = HCU(g); nd_removecont2(d,g); - if ( dn || GenTrace ) { + if ( dn || nd_gentrace ) { /* overwrite cont : Trace=[div,index,mul,cont] */ cont = ndc_div(mod,hg,HCU(g)); if ( dn ) { @@ -1344,7 +1354,7 @@ int nd_nf(int mod,ND d,ND g,NDV *ps,int full,NDC dn,ND reductr(nd_vc,(Obj)tr,&tr1); dn->r = (R)tr1; } else divq(dn->z,(Q)cont,&dn->z); } - if ( GenTrace && !UNIQ(cont) ) ARG3(node) = (pointer)cont; + if ( nd_gentrace && !UNIQ(cont) ) ARG3(node) = (pointer)cont; } hmag = ((double)p_mag(HCP(g)))*nd_scale; } @@ -1476,7 +1486,7 @@ int nd_nf_pbucket(int mod,ND g,NDV *ps,int full,ND *rp /* input : list of NDV, cand : list of NDV */ -int ndv_check_candidate(NODE input,int obpe,int oadv,EPOS oepos,NODE cand) +int ndv_check_membership(int m,NODE input,int obpe,int oadv,EPOS oepos,NODE cand) { int n,i,stat; ND nf,d; @@ -1486,10 +1496,10 @@ int ndv_check_candidate(NODE input,int obpe,int oadv,E Q q; LIST list; - ndv_setup(0,0,cand,GenTrace?1:0,1); + ndv_setup(m,0,cand,nd_gentrace?1:0,1); n = length(cand); - if ( GenTrace ) { nd_alltracelist = 0; nd_tracelist = 0; } + if ( nd_gentrace ) { nd_alltracelist = 0; nd_tracelist = 0; } /* membercheck : list is a subset of Id(cand) ? */ for ( t = input, i = 0; t; t = NEXT(t), i++ ) { again: @@ -1498,13 +1508,13 @@ again: r = ndv_dup_realloc((NDV)BDY(t),obpe,oadv,oepos); else r = (NDV)BDY(t); - d = ndvtond(0,r); - stat = nd_nf(0,0,d,nd_ps,0,0,&nf); + d = ndvtond(m,r); + stat = nd_nf(m,0,d,nd_ps,0,0,&nf); if ( !stat ) { nd_reconstruct(0,0); goto again; } else if ( nf ) return 0; - if ( GenTrace ) { + if ( nd_gentrace ) { nd_tracelist = reverse_node(nd_tracelist); MKLIST(list,nd_tracelist); STOQ(i,q); s = mknode(2,q,list); MKLIST(list,s); @@ -1821,7 +1831,7 @@ int do_diagonalize(int sugar,int m) Q iq; for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) { - if ( GenTrace ) { + if ( nd_gentrace ) { /* Trace = [1,index,1,1] */ STOQ(i,iq); node = mknode(4,ONE,iq,ONE,ONE); MKLIST(l,node); MKNODE(nd_tracelist,l,0); @@ -1837,7 +1847,7 @@ int do_diagonalize(int sugar,int m) ndv_free(nfv); hc = HCU(nf); nd_removecont(m,nf); cont = ndc_div(m,hc,HCU(nf)); - if ( GenTrace ) finalize_tracelist(i,cont); + if ( nd_gentrace ) finalize_tracelist(i,cont); nfv = ndtondv(m,nf); nd_free(nf); nd_bound[i] = ndv_compute_bound(nfv); @@ -1896,7 +1906,7 @@ again: goto again; } #if USE_GEOBUCKET - stat = (m&&!GenTrace)?nd_nf_pbucket(m,h,nd_ps,!Top,&nf) + stat = (m&&!nd_gentrace)?nd_nf_pbucket(m,h,nd_ps,!Top,&nf) :nd_nf(m,0,h,nd_ps,!Top,0,&nf); #else stat = nd_nf(m,0,h,nd_ps,!Top,0,&nf); @@ -1914,7 +1924,7 @@ again: nd_monic(0,&nf); nd_removecont(m,nf); } - if ( GenTrace ) { + if ( nd_gentrace ) { cont = ndc_div(m,hc,HCU(nf)); if ( m || !UNIQ(cont) ) { t = mknode(4,0,0,0,cont); @@ -1937,7 +1947,7 @@ again: g = update_base(g,nh); FREENDP(l); } else { - if ( GenTrace && gensyz ) { + if ( nd_gentrace && gensyz ) { nd_tracelist = reverse_node(nd_tracelist); MKLIST(list,nd_tracelist); STOQ(-1,q); t = mknode(2,q,list); MKLIST(list,t); @@ -1967,7 +1977,7 @@ int do_diagonalize_trace(int sugar,int m) P cont,cont1; for ( i = nd_psn-1; i >= 0 && SG(nd_psh[i]) == sugar; i-- ) { - if ( GenTrace ) { + if ( nd_gentrace ) { /* Trace = [1,index,1,1] */ STOQ(i,iq); node = mknode(4,ONE,iq,ONE,ONE); MKLIST(l,node); MKNODE(nd_tracelist,l,0); @@ -1994,7 +2004,7 @@ int do_diagonalize_trace(int sugar,int m) ndv_free(nfv); hc = HCU(nf); nd_removecont(0,nf); cont = ndc_div(0,hc,HCU(nf)); - if ( GenTrace ) finalize_tracelist(i,cont); + if ( nd_gentrace ) finalize_tracelist(i,cont); nfv = ndtondv(0,nf); nd_free(nf); nd_bound[i] = ndv_compute_bound(nfv); @@ -2116,7 +2126,7 @@ again: nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq); nd_removecont(m,nf); nfv = ndtondv(m,nf); nd_free(nf); } - if ( GenTrace ) { + if ( nd_gentrace ) { cont = ndc_div(0,hnfq,HCU(nfqv)); if ( !UNIQ(cont) ) { t = mknode(4,0,0,0,cont); @@ -2190,15 +2200,16 @@ NODE ndv_reduceall(int m,NODE f) union oNDC hc; P cont,cont1; + if ( nd_nora ) return f; n = length(f); ndv_setup(m,0,f,0,1); perm = (int *)MALLOC(n*sizeof(int)); - if ( GenTrace ) { + if ( nd_gentrace ) { for ( t = nd_tracelist, i = 0; i < n; i++, t = NEXT(t) ) perm[i] = QTOS((Q)ARG1(BDY((LIST)BDY(t)))); } for ( i = 0; i < n; ) { - if ( GenTrace ) { + if ( nd_gentrace ) { /* Trace = [1,index,1,1] */ STOQ(i,iq); node = mknode(4,ONE,iq,ONE,ONE); MKLIST(l,node); MKNODE(nd_tracelist,l,0); @@ -2212,7 +2223,7 @@ NODE ndv_reduceall(int m,NODE f) if ( DP_Print ) { printf("."); fflush(stdout); } ndv_free(nd_ps[i]); hc = HCU(nf); nd_removecont(m,nf); - if ( GenTrace ) { + if ( nd_gentrace ) { for ( t = nd_tracelist; t; t = NEXT(t) ) { jq = ARG1(BDY((LIST)BDY(t))); j = QTOS(jq); STOQ(perm[j],jq); ARG1(BDY((LIST)BDY(t))) = jq; @@ -2228,7 +2239,7 @@ NODE ndv_reduceall(int m,NODE f) if ( DP_Print ) { printf("\n"); } for ( a0 = 0, i = 0; i < n; i++ ) { NEXTNODE(a0,a); - if ( !GenTrace ) BDY(a) = (pointer)nd_ps[i]; + if ( !nd_gentrace ) BDY(a) = (pointer)nd_ps[i]; else { for ( j = 0; j < n; j++ ) if ( perm[j] == i ) break; BDY(a) = (pointer)nd_ps[j]; @@ -2244,7 +2255,7 @@ ND_pairs update_pairs( ND_pairs d, NODE /* of index */ if ( !g ) return d; /* for testing */ - if ( gensyz && GenSyz == 2 ) { + if ( gensyz && nd_gensyz == 2 ) { d1 = nd_newpairs(g,t); if ( !d ) return d1; @@ -2573,7 +2584,7 @@ int ndv_newps(int m,NDV a,NDV aq) nd_ps[nd_psn] = 0; } } - if ( GenTrace ) { + if ( nd_gentrace ) { /* reverse the tracelist and append it to alltracelist */ nd_tracelist = reverse_node(nd_tracelist); MKLIST(l,nd_tracelist); STOQ(nd_psn,iq); tn = mknode(2,iq,l); MKLIST(l,tn); @@ -2644,7 +2655,7 @@ void ndv_setup(int mod,int trace,NODE f,int dont_sort, if ( mod || !dont_removecont ) ndv_removecont(mod,a); if ( !mod ) register_hcf(a); } - if ( GenTrace ) { + if ( nd_gentrace ) { STOQ(i,iq); STOQ(w[i].i,jq); node = mknode(3,iq,jq,ONE); if ( !dont_removecont ) ARG2(node) = (pointer)ndc_div(trace?0:mod,hc,HCU(a)); @@ -2663,7 +2674,7 @@ void ndv_setup(int mod,int trace,NODE f,int dont_sort, } } } - if ( GenTrace && nd_tracelist ) NEXT(tn) = 0; + if ( nd_gentrace && nd_tracelist ) NEXT(tn) = 0; } struct order_spec *append_block(struct order_spec *spec, @@ -2785,15 +2796,18 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe Obj obj; NumberField nf; struct order_spec *ord1; - NODE tr,tl1,tl2; - LIST l1,l2,l3; + NODE tr,tl1,tl2,tl3,tl4; + LIST l1,l2,l3,l4,l5; int j; Q jq; int *perm; + EPOS oepos; + int obpe,oadv,ompos; nd_module = 0; if ( !m && Demand ) nd_demand = 1; else nd_demand = 0; + parse_nd_option(current_option); if ( DP_Multiple ) nd_scale = ((double)DP_Multiple)/(double)(Denominator?Denominator:1); @@ -2843,14 +2857,15 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe } } nd_setup_parameters(nvar,max); + obpe = nd_bpe; oadv = nmv_adv; oepos = nd_epos; ompos = nd_mpos; ishomo = 1; for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { if ( nd_module ) { - if ( !m && !GenTrace ) pltozpl((LIST)BDY(t),&dmy,&zpl); + if ( !m && !nd_gentrace ) pltozpl((LIST)BDY(t),&dmy,&zpl); else zpl = (LIST)BDY(t); b = (pointer)pltondv(CO,vv,zpl); } else { - if ( !m && !GenTrace ) ptozp((P)BDY(t),1,&dmy,&zp); + if ( !m && !nd_gentrace ) ptozp((P)BDY(t),1,&dmy,&zp); else zp = (P)BDY(t); b = (pointer)ptondv(CO,vv,zp); } @@ -2861,14 +2876,25 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe } if ( fd0 ) NEXT(fd) = 0; ndv_setup(m,0,fd0,0,0); - if ( GenTrace ) { + if ( nd_gentrace ) { MKLIST(l1,nd_tracelist); MKNODE(nd_alltracelist,l1,0); } x = f4?nd_f4(m,&perm):nd_gb(m,ishomo,0,0,&perm); nd_demand = 0; x = ndv_reducebase(x,perm); - if ( GenTrace ) { tl1 = nd_alltracelist; nd_alltracelist = 0; } + if ( nd_gentrace ) { tl1 = nd_alltracelist; nd_alltracelist = 0; } x = ndv_reduceall(m,x); + if ( nd_gentrace ) { + tl2 = nd_alltracelist; nd_alltracelist = 0; + ndv_check_membership(m,fd0,obpe,oadv,oepos,x); + if ( nd_gentrace ) { + tl3 = nd_alltracelist; nd_alltracelist = 0; + } else tl3 = 0; + nd_gb(m,0,1,nd_gensyz?1:0,0)!=0; + if ( nd_gentrace && nd_gensyz ) { + tl4 = nd_alltracelist; nd_alltracelist = 0; + } else tl4 = 0; + } for ( r0 = 0, t = x; t; t = NEXT(t) ) { NEXTNODE(r0,r); if ( nd_module ) BDY(r) = ndvtopl(m,CO,vv,BDY(t),mrank); @@ -2878,9 +2904,9 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe if ( nalg ) r0 = postprocess_algcoef(av,alist,r0); MKLIST(*rp,r0); - if ( GenTrace ) { - tl2 = nd_alltracelist; nd_alltracelist = 0; + if ( nd_gentrace ) { tl1 = reverse_node(tl1); tl2 = reverse_node(tl2); + tl3 = reverse_node(tl3); /* tl2 = [[i,[[*,j,*,*],...]],...] */ for ( t = tl2; t; t = NEXT(t) ) { /* s = [i,[*,j,*,*],...] */ @@ -2894,8 +2920,9 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe for ( j = length(x)-1, t = 0; j >= 0; j-- ) { STOQ(perm[j],jq); MKNODE(s,jq,t); t = s; } - MKLIST(l1,tl1); MKLIST(l2,tl2); MKLIST(l3,t); - tr = mknode(5,*rp,0,l1,l2,l3); MKLIST(*rp,tr); + MKLIST(l1,tl1); MKLIST(l2,tl2); MKLIST(l3,t); MKLIST(l4,tl3); + MKLIST(l5,tl4); + tr = mknode(7,*rp,0,l1,l2,l3,l4,l5); MKLIST(*rp,tr); } #if 0 fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc); @@ -3010,6 +3037,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int Q jq; nd_module = 0; + parse_nd_option(current_option); if ( DP_Multiple ) nd_scale = ((double)DP_Multiple)/(double)(Denominator?Denominator:1); @@ -3070,11 +3098,11 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int ishomo = 1; for ( in0 = 0, fd0 = 0, t = BDY(f); t; t = NEXT(t) ) { if ( nd_module ) { - if ( !GenTrace ) pltozpl((LIST)BDY(t),&dmy,&zpl); + if ( !nd_gentrace ) pltozpl((LIST)BDY(t),&dmy,&zpl); else zpl = (LIST)BDY(t); c = (pointer)pltondv(CO,vv,zpl); } else { - if ( !GenTrace ) ptozp((P)BDY(t),1,&dmy,&zp); + if ( !nd_gentrace ) ptozp((P)BDY(t),1,&dmy,&zp); else zp = (P)BDY(t); c = (pointer)ptondv(CO,vv,zp); } @@ -3103,7 +3131,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int if ( Demand ) nd_demand = 1; ndv_setup(m,1,fd0,0,0); - if ( GenTrace ) { + if ( nd_gentrace ) { MKLIST(l1,nd_tracelist); MKNODE(nd_alltracelist,l1,0); } cand = f4?nd_f4_trace(m,&perm):nd_gb_trace(m,ishomo || homo,&perm); @@ -3121,20 +3149,20 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int } nd_demand = 0; cand = ndv_reducebase(cand,perm); - if ( GenTrace ) { tl1 = nd_alltracelist; nd_alltracelist = 0; } + if ( nd_gentrace ) { tl1 = nd_alltracelist; nd_alltracelist = 0; } cand = ndv_reduceall(0,cand); cbpe = nd_bpe; - if ( GenTrace ) { tl2 = nd_alltracelist; nd_alltracelist = 0; } + if ( nd_gentrace ) { tl2 = nd_alltracelist; nd_alltracelist = 0; } + get_eg(&eg0); if ( nocheck ) break; - get_eg(&eg0); - if ( ret = ndv_check_candidate(in0,obpe,oadv,oepos,cand) ) { - if ( GenTrace ) { + if ( ret = ndv_check_membership(0,in0,obpe,oadv,oepos,cand) ) { + if ( nd_gentrace ) { tl3 = nd_alltracelist; nd_alltracelist = 0; } else tl3 = 0; /* gbcheck : cand is a GB of Id(cand) ? */ - ret = nd_gb(0,0,1,GenSyz?1:0,0)!=0; - if ( GenTrace && GenSyz ) { + ret = nd_gb(0,0,1,nd_gensyz?1:0,0)!=0; + if ( nd_gentrace && nd_gensyz ) { tl4 = nd_alltracelist; nd_alltracelist = 0; } else tl4 = 0; } @@ -3168,7 +3196,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int if ( nalg ) cand = postprocess_algcoef(av,alist,cand); MKLIST(*rp,cand); - if ( GenTrace ) { + if ( nd_gentrace ) { tl1 = reverse_node(tl1); tl2 = reverse_node(tl2); tl3 = reverse_node(tl3); /* tl2 = [[i,[[*,j,*,*],...]],...] */ @@ -3914,7 +3942,7 @@ int nd_sp(int mod,int trace,ND_pairs p,ND *rp) } t1 = ndv_mul_nm(mod,m1,p1); t2 = ndv_mul_nm(mod,m2,p2); *rp = nd_add(mod,t1,t2); - if ( GenTrace ) { + if ( nd_gentrace ) { /* nd_tracelist is initialized */ STOQ(p->i1,iq); nmtodp(mod,m1,&d); node = mknode(4,ONE,iq,d,ONE); MKLIST(hist,node); MKNODE(nd_tracelist,hist,0); @@ -4720,6 +4748,7 @@ void nd_init_ord(struct order_spec *ord) /* module order */ case 256: nd_ispot = ord->ispot; + nd_pot_nelim = ord->pot_nelim; nd_dcomp = -1; switch ( ord->ord.simple ) { case 0: @@ -4740,16 +4769,28 @@ void nd_init_ord(struct order_spec *ord) break; case 257: /* block order */ + nd_ispot = ord->ispot; + nd_pot_nelim = ord->pot_nelim; + nd_dcomp = -1; + nd_isrlex = 0; ndl_compare_function = ndl_module_block_compare; break; case 258: /* matrix order */ + nd_ispot = ord->ispot; + nd_pot_nelim = ord->pot_nelim; + nd_dcomp = -1; + nd_isrlex = 0; nd_matrix_len = ord->ord.matrix.row; nd_matrix = ord->ord.matrix.matrix; ndl_compare_function = ndl_module_matrix_compare; break; case 259: /* composite order */ + nd_ispot = ord->ispot; + nd_pot_nelim = ord->pot_nelim; + 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_module_composite_compare; @@ -6773,4 +6814,24 @@ void conv_ilist(int demand,int trace,NODE g,int **indp BDY(t) = (pointer)(demand?ndv_load(j):(trace?nd_ps_trace[j]:nd_ps[j])); } if ( indp ) *indp = ind; +} + +void parse_nd_option(NODE opt) +{ + NODE t,p; + char *key; + Obj value; + + nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; + for ( t = opt; t; t = NEXT(t) ) { + p = BDY((LIST)BDY(t)); + key = BDY((STRING)BDY(p)); + value = (Obj)BDY(NEXT(p)); + if ( !strcmp(key,"gentrace") ) + nd_gentrace = value?1:0; + else if ( !strcmp(key,"gensyz") ) + nd_gensyz = value?1:0; + else if ( !strcmp(key,"nora") ) + nd_nora = value?1:0; + } }