=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gf.c,v retrieving revision 1.1.1.1 retrieving revision 1.8 diff -u -p -r1.1.1.1 -r1.8 --- OpenXM_contrib2/asir2000/builtin/gf.c 1999/12/03 07:39:07 1.1.1.1 +++ OpenXM_contrib2/asir2000/builtin/gf.c 2001/06/25 10:01:27 1.8 @@ -1,4 +1,52 @@ -/* $OpenXM: OpenXM/src/asir99/builtin/gf.c,v 1.1.1.1 1999/11/10 08:12:25 noro Exp $ */ +/* + * Copyright (c) 1994-2000 FUJITSU LABORATORIES LIMITED + * All rights reserved. + * + * FUJITSU LABORATORIES LIMITED ("FLL") hereby grants you a limited, + * non-exclusive and royalty-free license to use, copy, modify and + * redistribute, solely for non-commercial and non-profit purposes, the + * computer program, "Risa/Asir" ("SOFTWARE"), subject to the terms and + * conditions of this Agreement. For the avoidance of doubt, you acquire + * only a limited right to use the SOFTWARE hereunder, and FLL or any + * third party developer retains all rights, including but not limited to + * copyrights, in and to the SOFTWARE. + * + * (1) FLL does not grant you a license in any way for commercial + * purposes. You may use the SOFTWARE only for non-commercial and + * non-profit purposes only, such as academic, research and internal + * business use. + * (2) The SOFTWARE is protected by the Copyright Law of Japan and + * international copyright treaties. If you make copies of the SOFTWARE, + * with or without modification, as permitted hereunder, you shall affix + * to all such copies of the SOFTWARE the above copyright notice. + * (3) An explicit reference to this SOFTWARE and its copyright owner + * shall be made on your publication or presentation in any form of the + * results obtained by use of the SOFTWARE. + * (4) In the event that you modify the SOFTWARE, you shall notify FLL by + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification + * for such modification or the source code of the modified part of the + * SOFTWARE. + * + * THE SOFTWARE IS PROVIDED AS IS WITHOUT ANY WARRANTY OF ANY KIND. FLL + * MAKES ABSOLUTELY NO WARRANTIES, EXPRESSED, IMPLIED OR STATUTORY, AND + * EXPRESSLY DISCLAIMS ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT OF THIRD PARTIES' + * RIGHTS. NO FLL DEALER, AGENT, EMPLOYEES IS AUTHORIZED TO MAKE ANY + * MODIFICATIONS, EXTENSIONS, OR ADDITIONS TO THIS WARRANTY. + * UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, + * OR OTHERWISE, SHALL FLL BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY + * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE OR CONSEQUENTIAL + * DAMAGES OF ANY CHARACTER, INCLUDING, WITHOUT LIMITATION, DAMAGES + * ARISING OUT OF OR RELATING TO THE SOFTWARE OR THIS AGREEMENT, DAMAGES + * FOR LOSS OF GOODWILL, WORK STOPPAGE, OR LOSS OF DATA, OR FOR ANY + * DAMAGES, EVEN IF FLL SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF + * SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. EVEN IF A PART + * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY + * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, + * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. + * + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gf.c,v 1.7 2001/06/25 04:11:41 noro Exp $ +*/ #include "ca.h" #include "parse.h" @@ -18,6 +66,7 @@ void nullspace(UM **,UM,int,int,int *); void nullspace_lm(LM **,int,int *); void nullspace_gf2n(GF2N **,int,int *); void nullspace_gfpn(GFPN **,int,int *); +void nullspace_gfs(GFS **,int,int *); void null_to_sol(int **,int *,int,int,UM *); void showgfmat(UM **,int); @@ -25,6 +74,7 @@ void pwr_mod(P,P,V,P,int,N,P *); void rem_mod(P,P,V,P,int,P *); void Pnullspace(),Pgcda_mod(),Pftest(),Presfmain(),Ppwr_mod(),Puhensel(); +void Psfuhensel(); void Pnullspace_ff(); @@ -34,6 +84,7 @@ void Plinear_form_to_vect(),Pvect_to_linear_form(); void solve_linear_equation_gf2n(GF2N **,int,int,int *); void linear_form_to_array(P,VL,int,Num *); void array_to_linear_form(Num *,VL,int,P *); +void sfuhensel(P,V,V,GFS *,NODE *); extern int current_ff; @@ -46,6 +97,7 @@ struct ftab gf_tab[] = { {"resfmain",Presfmain,4}, {"pwr_mod",Ppwr_mod,6}, {"uhensel",Puhensel,4}, + {"sfuhensel",Psfuhensel,3}, {0,0,0}, }; @@ -130,6 +182,48 @@ NODE *rp; *rp = top; } +void Psfuhensel(arg,rp) +NODE arg; +LIST *rp; +{ + P f; + V x,y; + NODE n,r; + GFS ev; + + f = (P)ARG0(arg); + x = VR((P)ARG1(arg)); + y = VR((P)ARG2(arg)); + sfuhensel(f,x,y,&ev,&r); + MKNODE(n,ev,r); + MKLIST(*rp,n); +} + +void sfuhensel(f,x,y,evp,rp) +P f; +V x,y; +GFS *evp; +NODE *rp; +{ + ML lift; + int i; + P s,u,sf; + NODE t,top; + struct oVL vl1,vl; + + sfhensel(5,f,x,evp,&sf,&lift); + + vl1.v = y; vl1.next = 0; + vl.v = x; vl.next = &vl1; + + for ( i = lift->n-1, top = 0; i >= 0; i-- ) { + sfbmtop(lift->bound,lift->c[i],x,y,&s); + reorderp(CO,&vl,s,&u); + MKNODE(t,u,top); top = t; + } + *rp = top; +} + void Presfmain(arg,rp) NODE arg; LIST *rp; @@ -180,19 +274,42 @@ P *mfl; ML *listp; { register int i,j; - int q,n,bound; + int q,n,bound,inv,lc; int *p; int **pp; ML blist,clist,bqlist,cqlist,rlist; UM *b; LUM fl,tl; LUM *l; + UM w; + w = W_UMALLOC(UDEG(f)); blist = MLALLOC(nf); blist->n = nf; blist->mod = mod; - for ( i = 0; i < nf; i++ ) { + + /* c[0] must have lc(f) */ + blist->c[0] = (pointer)UMALLOC(UDEG(mfl[0])); + ptoum(mod,mfl[0],w); + inv = invm(w->c[UDEG(mfl[0])],mod); + lc = rem(NM((Q)LC(f)),mod); + if ( SGN((Q)LC(f)) < 0 ) + lc = (mod-lc)%mod; + lc = dmar(inv,lc,0,mod); + if ( lc == 1 ) + copyum(w,blist->c[0]); + else + mulsum(mod,w,lc,blist->c[0]); + + /* c[i] (i=1,...,nf-1) must be monic */ + for ( i = 1; i < nf; i++ ) { blist->c[i] = (pointer)UMALLOC(UDEG(mfl[i])); - ptoum(mod,mfl[i],blist->c[i]); + ptoum(mod,mfl[i],w); + inv = invm(w->c[UDEG(mfl[i])],mod); + if ( inv == 1 ) + copyum(w,blist->c[i]); + else + mulsum(mod,w,inv,blist->c[i]); } + gcdgen(f,blist,&clist); henprep(f,blist,clist,&bqlist,&cqlist); n = bqlist->n; q = bqlist->mod; bqlist->bound = cqlist->bound = bound = mignotte(q,f); @@ -738,6 +855,8 @@ LIST *rp; nullspace_gf2n((GF2N **)w,n,ind); break; case FF_GFPN: nullspace_gfpn((GFPN **)w,n,ind); break; + case FF_GFS: + nullspace_gfs((GFS **)w,n,ind); break; default: error("nullspace_ff : current_ff is not set"); } @@ -876,6 +995,49 @@ int *ind; } } } + +void nullspace_gfs(mat,n,ind) +GFS **mat; +int n; +int *ind; +{ + int i,j,l,s; + GFS w,w1,h,inv; + GFS *t,*u; + GFS one; + + bzero(ind,n*sizeof(int)); + ind[0] = 0; + mqtogfs(ONEM,&one); + + for ( i = j = 0; j < n; i++, j++ ) { + for ( ; j < n; j++ ) { + for ( l = i; l < n; l++ ) + if ( mat[l][j] ) + break; + if ( l < n ) { + t = mat[i]; mat[i] = mat[l]; mat[l] = t; break; + } else + ind[j] = 1; + } + if ( j == n ) + break; + divgfs(one,mat[i][j],&inv); + for ( s = j, t = mat[i]; s < n; s++ ) { + mulgfs(t[s],inv,&w); t[s] = w; + } + for ( l = 0; l < n; l++ ) { + if ( l == i ) + continue; + u = mat[l]; + chsgngfs(u[j],&h); + for ( s = j; s < n; s++ ) { + mulgfs(h,t[s],&w); addgfs(w,u[s],&w1); u[s] = w1; + } + } + } +} + /* p = a(0)vl[0]+a(1)vl[1]+...+a(m-1)vl[m-1]+a(m) -> array = [a(0) a(1) ... a(m)] */ void linear_form_to_array(p,vl,m,array)