=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp.c,v retrieving revision 1.87 retrieving revision 1.96 diff -u -p -r1.87 -r1.96 --- OpenXM_contrib2/asir2000/builtin/dp.c 2012/08/27 05:38:00 1.87 +++ OpenXM_contrib2/asir2000/builtin/dp.c 2015/09/24 04:43:12 1.96 @@ -44,7 +44,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.86 2012/04/10 07:15:07 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp.c,v 1.95 2015/01/26 13:48:31 noro Exp $ */ #include "ca.h" #include "base.h" @@ -56,6 +56,7 @@ extern int dp_order_pair_length; extern struct order_pair *dp_order_pair; extern struct order_spec *dp_current_spec; extern struct modorder_spec *dp_current_modspec; +extern int nd_rref2; int do_weyl; @@ -89,14 +90,14 @@ void Pdp_weyl_sp(); void Pdp_weyl_nf(),Pdp_weyl_nf_mod(); void Pdp_weyl_gr_main(),Pdp_weyl_gr_mod_main(),Pdp_weyl_gr_f_main(); void Pdp_weyl_f4_main(),Pdp_weyl_f4_mod_main(),Pdp_weyl_f4_f_main(); -void Pdp_weyl_mul(),Pdp_weyl_mul_mod(); +void Pdp_weyl_mul(),Pdp_weyl_mul_mod(),Pdp_weyl_act(); void Pdp_weyl_set_weight(); void Pdp_set_weight(),Pdp_set_top_weight(),Pdp_set_module_weight(); void Pdp_nf_f(),Pdp_weyl_nf_f(); void Pdp_lnf_f(); void Pnd_gr(),Pnd_gr_trace(),Pnd_f4(),Pnd_f4_trace(); void Pnd_gr_postproc(), Pnd_weyl_gr_postproc(); -void Pnd_gr_recompute_trace(); +void Pnd_gr_recompute_trace(), Pnd_btog(); void Pnd_weyl_gr(),Pnd_weyl_gr_trace(); void Pnd_nf(),Pnd_weyl_nf(); void Pdp_initial_term(); @@ -109,11 +110,13 @@ void Pdp_get_denomlist(); void Pdp_symb_add(); void Pdp_mono_raddec(); void Pdp_mono_reduce(); +void Pdp_rref2(),Psumi_updatepairs(),Psumi_symbolic(); LIST dp_initial_term(); LIST dp_order(); void parse_gr_option(LIST f,NODE opt,LIST *v,Num *homo, int *modular,struct order_spec **ord); +NODE dp_inv_or_split(NODE gb,DP f,struct order_spec *spec, DP *inv); LIST remove_zero_from_list(LIST); @@ -165,6 +168,7 @@ struct ftab dp_tab[] = { {"nd_f4_trace",Pnd_f4_trace,5}, {"nd_gr_postproc",Pnd_gr_postproc,5}, {"nd_gr_recompute_trace",Pnd_gr_recompute_trace,5}, + {"nd_btog",Pnd_btog,-6}, {"nd_weyl_gr_postproc",Pnd_weyl_gr_postproc,5}, {"nd_weyl_gr",Pnd_weyl_gr,4}, {"nd_weyl_gr_trace",Pnd_weyl_gr_trace,5}, @@ -179,6 +183,7 @@ struct ftab dp_tab[] = { /* multiplication */ {"dp_weyl_mul",Pdp_weyl_mul,2}, {"dp_weyl_mul_mod",Pdp_weyl_mul_mod,3}, + {"dp_weyl_act",Pdp_weyl_act,2}, /* s-poly */ {"dp_weyl_sp",Pdp_weyl_sp,2}, @@ -273,6 +278,10 @@ struct ftab dp_supp_tab[] = { {"dp_mono_raddec",Pdp_mono_raddec,2}, {"dp_mono_reduce",Pdp_mono_reduce,2}, + {"dp_rref2",Pdp_rref2,2}, + {"sumi_updatepairs",Psumi_updatepairs,3}, + {"sumi_symbolic",Psumi_symbolic,5}, + {0,0,0} }; @@ -1280,6 +1289,8 @@ DP *rp; p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); asir_assert(p1,O_DP,"dp_symb_add"); asir_assert(p2,O_DP,"dp_symb_add"); + if ( !p1 ) { *rp = p2; return; } + else if ( !p2 ) { *rp = p1; return; } if ( p1->nv != p2->nv ) error("dp_sumb_add : invalid input"); nv = p1->nv; @@ -1330,6 +1341,18 @@ DP *rp; do_weyl = 0; } +void Pdp_weyl_act(arg,rp) +NODE arg; +DP *rp; +{ + DP p1,p2; + + p1 = (DP)ARG0(arg); p2 = (DP)ARG1(arg); + asir_assert(p1,O_DP,"dp_weyl_act"); asir_assert(p2,O_DP,"dp_weyl_act"); + weyl_actd(CO,p1,p2,rp); +} + + void Pdp_weyl_mul_mod(arg,rp) NODE arg; DP *rp; @@ -2142,6 +2165,7 @@ LIST *rp; struct order_spec *ord; do_weyl = 0; + nd_rref2 = 0; asir_assert(ARG0(arg),O_LIST,"nd_f4"); asir_assert(ARG1(arg),O_LIST,"nd_f4"); asir_assert(ARG2(arg),O_N,"nd_f4"); @@ -2155,6 +2179,7 @@ LIST *rp; homo = retdp = 0; if ( get_opt("homo",&val) && val ) homo = 1; if ( get_opt("dp",&val) && val ) retdp = 1; + if ( get_opt("rref2",&val) && val ) nd_rref2 = 1; nd_gr(f,v,m,homo,retdp,1,ord,rp); } @@ -2226,6 +2251,35 @@ LIST *rp; nd_gr_recompute_trace(f,v,m,ord,tlist,rp); } +Obj nd_btog_one(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist,int pos); +Obj nd_btog(LIST f,LIST v,int m,struct order_spec *ord,LIST tlist); + +void Pnd_btog(arg,rp) +NODE arg; +Obj *rp; +{ + LIST f,v,tlist; + int m,ac,pos; + struct order_spec *ord; + + do_weyl = 0; + asir_assert(ARG0(arg),O_LIST,"nd_btog"); + asir_assert(ARG1(arg),O_LIST,"nd_btog"); + asir_assert(ARG2(arg),O_N,"nd_btog"); + f = (LIST)ARG0(arg); v = (LIST)ARG1(arg); + m = QTOS((Q)ARG2(arg)); + create_order_spec(0,ARG3(arg),&ord); + tlist = (LIST)ARG4(arg); + if ( (ac = argc(arg)) == 6 ) { + asir_assert(ARG5(arg),O_N,"nd_btog"); + pos = QTOS((Q)ARG5(arg)); + *rp = nd_btog_one(f,v,m,ord,tlist,pos); + } else if ( ac == 5 ) + *rp = nd_btog(f,v,m,ord,tlist); + else + error("nd_btog : argument mismatch"); +} + void Pnd_weyl_gr_postproc(arg,rp) NODE arg; LIST *rp; @@ -2605,44 +2659,51 @@ VECT *rp; } } -VECT current_top_weight_vector_obj; -N *current_top_weight_vector; +extern Obj current_top_weight; +extern Obj nd_top_weight; -void Pdp_set_top_weight(arg,rp) -NODE arg; -VECT *rp; +void Pdp_set_top_weight(NODE arg,Obj *rp) { VECT v; - int i,n; + MAT m; + Obj obj; + int i,j,n,id,row,col; + Q *mi; NODE node; if ( !arg ) - *rp = current_top_weight_vector_obj; + *rp = current_top_weight; else if ( !ARG0(arg) ) { - current_top_weight_vector = 0; - current_top_weight_vector_obj = 0; + reset_top_weight(); *rp = 0; } else { - if ( OID(ARG0(arg)) != O_VECT && OID(ARG0(arg)) != O_LIST ) + id = OID(ARG0(arg)); + if ( id != O_VECT && id != O_MAT && id != O_LIST ) error("dp_set_top_weight : invalid argument"); - if ( OID(ARG0(arg)) == O_VECT ) - v = (VECT)ARG0(arg); - else { + if ( id == O_LIST ) { node = (NODE)BDY((LIST)ARG0(arg)); n = length(node); MKVECT(v,n); for ( i = 0; i < n; i++, node = NEXT(node) ) BDY(v)[i] = BDY(node); + obj = v; + } else + obj = ARG0(arg); + if ( OID(obj) == O_VECT ) { + v = (VECT)obj; + for ( i = 0; i < v->len; i++ ) + if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) ) + error("dp_set_top_weight : each element must be a non-negative integer"); + } else { + m = (MAT)obj; row = m->row; col = m->col; + for ( i = 0; i < row; i++ ) + for ( j = 0, mi = (Q *)BDY(m)[i]; j < col; j++ ) + if ( !INT(mi[j]) || (mi[j] && SGN((Q)mi[j]) < 0) ) + error("dp_set_top_weight : each element must be a non-negative integer"); } - for ( i = 0; i < v->len; i++ ) - if ( !INT(BDY(v)[i]) || (BDY(v)[i] && SGN((Q)BDY(v)[i]) < 0) ) - error("dp_set_top_weight : each element must be a non-negative integer"); - current_top_weight_vector_obj = v; - current_top_weight_vector = (N *)MALLOC(v->len*sizeof(N)); - for ( i = 0; i < v->len; i++ ) { - current_top_weight_vector[i] = !BDY(v)[i]?0:NM((Q)BDY(v)[i]); - } - *rp = current_top_weight_vector_obj; + current_top_weight = obj; + nd_top_weight = obj; + *rp = current_top_weight; } } @@ -2755,6 +2816,355 @@ void Pdp_mono_reduce(NODE arg,LIST *rp) MKLIST(*rp,r0); } +#define BLEN (8*sizeof(unsigned long)) + +void showmat2(unsigned long **a,int row,int col) +{ + int i,j; + + for ( i = 0; i < row; i++, putchar('\n') ) + for ( j = 0; j < col; j++ ) + if ( a[i][j/BLEN] & (1L<<(j%BLEN)) ) putchar('1'); + else putchar('0'); +} + +int rref2(unsigned long **a,int row,int col) +{ + int i,j,k,l,s,wcol,wj; + unsigned long bj; + unsigned long *ai,*ak,*as,*t; + int *pivot; + + wcol = (col+BLEN-1)/BLEN; + pivot = (int *)MALLOC_ATOMIC(row*sizeof(int)); + i = 0; + for ( j = 0; j < col; j++ ) { + wj = j/BLEN; bj = 1L<<(j%BLEN); + for ( k = i; k < row; k++ ) + if ( a[k][wj] & bj ) break; + if ( k == row ) continue; + pivot[i] = j; + if ( k != i ) { + t = a[i]; a[i] = a[k]; a[k] = t; + } + ai = a[i]; + for ( k = i+1; k < row; k++ ) { + ak = a[k]; + if ( ak[wj] & bj ) { + for ( l = wj; l < wcol; l++ ) + ak[l] ^= ai[l]; + } + } + i++; + } + for ( k = i-1; k >= 0; k-- ) { + j = pivot[k]; wj = j/BLEN; bj = 1L<<(j%BLEN); + ak = a[k]; + for ( s = 0; s < k; s++ ) { + as = a[s]; + if ( as[wj] & bj ) { + for ( l = wj; l < wcol; l++ ) + as[l] ^= ak[l]; + } + } + } + return i; +} + +void Pdp_rref2(NODE arg,VECT *rp) +{ + VECT f,term,ret; + int row,col,wcol,size,nv,i,j,rank,td; + unsigned long **mat; + unsigned long *v; + DL d; + DL *t; + DP dp; + MP m,m0; + + f = (VECT)ARG0(arg); + row = f->len; + term = (VECT)ARG1(arg); + col = term->len; + mat = (unsigned long **)MALLOC(row*sizeof(unsigned long *)); + size = sizeof(unsigned long)*((col+BLEN-1)/BLEN); + nv = ((DP)term->body[0])->nv; + t = (DL *)MALLOC(col*sizeof(DL)); + for ( i = 0; i < col; i++ ) t[i] = BDY((DP)BDY(term)[i])->dl; + for ( i = 0; i < row; i++ ) { + v = mat[i] = (unsigned long *)MALLOC_ATOMIC_IGNORE_OFF_PAGE(size); + bzero(v,size); + for ( j = 0, m = BDY((DP)BDY(f)[i]); m; m = NEXT(m) ) { + d = m->dl; + for ( ; !dl_equal(nv,d,t[j]); j++ ); + v[j/BLEN] |= 1L <<(j%BLEN); + } + } + rank = rref2(mat,row,col); + MKVECT(ret,rank); + *rp = ret; + for ( i = 0; i < rank; i++ ) { + v = mat[i]; + m0 = 0; + td = 0; + for ( j = 0; j < col; j++ ) { + if ( v[j/BLEN] & (1L<<(j%BLEN)) ) { + NEXTMP(m0,m); + m->dl = t[j]; + m->c = (P)ONE; + td = MAX(td,m->dl->td); + } + } + NEXT(m) = 0; + MKDP(nv,m0,dp); + dp->sugar = td; + BDY(ret)[i] = (pointer)dp; + } +} + +#define HDL(f) (BDY(f)->dl) + +NODE sumi_criB(int nv,NODE d,DP *f,int m) +{ + LIST p; + NODE r0,r; + int p0,p1; + DL p2,lcm; + + NEWDL(lcm,nv); + r0 = 0; + for ( ; d; d = NEXT(d) ) { + p = (LIST)BDY(d); + p0 = QTOS((Q)ARG0(BDY(p))); + p1 = QTOS((Q)ARG1(BDY(p))); + p2 = HDL((DP)ARG2(BDY(p))); + if(!_dl_redble(HDL((DP)f[m]),p2,nv) || + dl_equal(nv,lcm_of_DL(nv,HDL(f[p0]),HDL(f[m]),lcm),p2) || + dl_equal(nv,lcm_of_DL(nv,HDL(f[p1]),HDL(f[m]),lcm),p2) ) { + NEXTNODE(r0,r); + BDY(r) = p; + } + } + if ( r0 ) NEXT(r) = 0; + return r0; +} + +NODE sumi_criFMD(int nv,DP *f,int m) +{ + DL *a; + DL l1,dl1,dl2; + int i,j,k,k2; + NODE r,r1,nd; + MP mp; + DP u; + Q iq,mq; + LIST list; + + /* a[i] = lcm(LT(f[i]),LT(f[m])) */ + a = (DL *)ALLOCA(m*sizeof(DL)); + for ( i = 0; i < m; i++ ) { + a[i] = lcm_of_DL(nv,HDL(f[i]),HDL(f[m]),0); + } + r = 0; + for( i = 0; i < m; i++) { + l1 = a[i]; + if ( !l1 ) continue; + /* Tkm = Tim (kd[k2] && dl2->d[k2] ) break; + if ( k2 < nv ) { + NEWMP(mp); mp->dl = l1; C(mp) = (P)ONE; + NEXT(mp) = 0; MKDP(nv,mp,u); u->sugar = l1->td; + STOQ(i,iq); STOQ(m,mq); + nd = mknode(3,iq,mq,u); + MKLIST(list,nd); + MKNODE(r1,list,r); + r = r1; + } + } + } + } + return r; +} + +LIST sumi_updatepairs(LIST d,DP *f,int m) +{ + NODE old,new,t; + LIST l; + int nv; + + nv = f[0]->nv; + old = sumi_criB(nv,BDY(d),f,m); + new = sumi_criFMD(nv,f,m); + if ( !new ) new = old; + else { + for ( t = new ; NEXT(t); t = NEXT(t) ); + NEXT(t) = old; + } + MKLIST(l,new); + return l; +} + +VECT ltov(LIST l) +{ + NODE n; + int i,len; + VECT v; + + n = BDY(l); + len = length(n); + MKVECT(v,len); + for ( i = 0; i < len; i++, n = NEXT(n) ) + BDY(v)[i] = BDY(n); + return v; +} + +DL subdl(int nv,DL d1,DL d2) +{ + int i; + DL d; + + NEWDL(d,nv); + d->td = d1->td-d2->td; + for ( i = 0; i < nv; i++ ) + d->d[i] = d1->d[i]-d2->d[i]; + return d; +} + +DP dltodp(int nv,DL d) +{ + MP mp; + DP dp; + + NEWMP(mp); mp->dl = d; C(mp) = (P)ONE; + NEXT(mp) = 0; MKDP(nv,mp,dp); dp->sugar = d->td; + return dp; +} + +LIST sumi_simplify(int nv,DL t,DP p,NODE f2,int simp) +{ + DL d,h,hw; + DP u,w,dp; + int n,i,last; + LIST *v; + LIST list; + NODE s,r; + + d = t; u = p; + /* only the last history is used */ + if ( f2 && simp && t->td != 0 ) { + adddl(nv,t,HDL(p),&h); + n = length(f2); + last = 1; + if ( simp > 1 ) last = n; + v = (LIST *)ALLOCA(n*sizeof(LIST)); + for ( r = f2, i = 0; r; r = NEXT(r), i++ ) v[n-i-1] = BDY(r); + for ( i = 0; i < last; i++ ) { + for ( s = BDY((LIST)v[i]); s; s = NEXT(s) ) { + w = (DP)BDY(s); hw = HDL(w); + if ( _dl_redble(hw,h,nv) ) { + u = w; + d = subdl(nv,h,hw); + goto fin; + } + } + } + } +fin: + dp = dltodp(nv,d); + r = mknode(2,dp,u); + MKLIST(list,r); + return list; +} + +LIST sumi_symbolic(NODE l,int q,NODE f2,DP *g,int simp) +{ + int nv; + NODE t,r; + NODE f0,f,fd0,fd,done0,done,red0,red; + DL h,d; + DP mul; + int m; + LIST tp,l0,l1,l2,l3,list; + VECT v0,v1,v2,v3; + + nv = ((DP)BDY(l))->nv; + t = 0; + + f0 = 0; fd0 = 0; done0 = 0; red0 = 0; + + for ( ; l; l = NEXT(l) ) { + t = symb_merge(t,dp_dllist((DP)BDY(l)),nv); + NEXTNODE(fd0,fd); BDY(fd) = BDY(l); + } + + while ( t ) { + h = (DL)BDY(t); + NEXTNODE(done0,done); BDY(done) = dltodp(nv,h); + t = NEXT(t); + for(m = 0; m < q; m++) + if ( _dl_redble(HDL(g[m]),h,nv) ) break; + if ( m == q ) { + } else { + d = subdl(nv,h,HDL(g[m])); + tp = sumi_simplify(nv,d,g[m],f2,simp); + + muldm(CO,ARG1(BDY(tp)),BDY((DP)ARG0(BDY(tp))),&mul); + t = symb_merge(t,NEXT(dp_dllist(mul)),nv); + + NEXTNODE(f0,f); BDY(f) = tp; + NEXTNODE(fd0,fd); BDY(fd) = mul; + NEXTNODE(red0,red); BDY(red) = mul; + } + } + if ( fd0 ) NEXT(fd) = 0; MKLIST(l0,fd0); + v0 = ltov(l0); + if ( done0 ) NEXT(done) = 0; MKLIST(l1,done0); + v1 = ltov(l1); + if ( f0 ) NEXT(f) = 0; MKLIST(l2,f0); + v2 = ltov(l2); + if ( red0 ) NEXT(red) = 0; MKLIST(l3,red0); + v3 = ltov(l3); + r = mknode(4,v0,v1,v2,v3); + MKLIST(list,r); + return list; +} + +void Psumi_symbolic(NODE arg,LIST *rp) +{ + NODE l,f2; + DP *g; + int q,simp; + + l = BDY((LIST)ARG0(arg)); + q = QTOS((Q)ARG1(arg)); + f2 = BDY((LIST)ARG2(arg)); + g = (DP *)BDY((VECT)ARG3(arg)); + simp = QTOS((Q)ARG4(arg)); + *rp = sumi_symbolic(l,q,f2,g,simp); +} + +void Psumi_updatepairs(NODE arg,LIST *rp) +{ + LIST d,l; + DP *f; + int m; + + d = (LIST)ARG0(arg); + f = (DP *)BDY((VECT)ARG1(arg)); + m = QTOS((Q)ARG2(arg)); + *rp = sumi_updatepairs(d,f,m); +} + LIST remove_zero_from_list(LIST l) { NODE n,r0,r; @@ -2937,4 +3347,3 @@ int get_opt(char *key0,Obj *r) { } return 0; } -