=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/F.c,v retrieving revision 1.2 retrieving revision 1.9 diff -u -p -r1.2 -r1.9 --- OpenXM_contrib2/asir2000/engine/F.c 2000/02/17 03:02:40 1.2 +++ OpenXM_contrib2/asir2000/engine/F.c 2001/07/04 07:19:19 1.9 @@ -1,9 +1,60 @@ -/* $OpenXM: OpenXM_contrib2/asir2000/engine/F.c,v 1.1.1.1 1999/12/03 07:39:08 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/engine/F.c,v 1.8 2001/05/28 08:25:31 noro Exp $ +*/ #include "ca.h" #include void homfctr(); +void mfctr_wrt_v(); +int use_new_hensel; + void fctrp(vl,f,dcp) VL vl; P f; @@ -27,6 +78,30 @@ DCP *dcp; } } +void fctr_wrt_v_p(vl,f,v,dcp) +VL vl; +P f; +V v; +DCP *dcp; +{ + VL nvl; + DCP dc; + + if ( !f || NUM(f) ) { + NEWDC(dc); COEF(dc) = f; DEG(dc) = ONE; + NEXT(dc) = 0; *dcp = dc; + return; + } else if ( !qpcheck((Obj)f) ) + error("fctrp : invalid argument"); + else { + clctv(vl,f,&nvl); + if ( !NEXT(nvl) ) + ufctr(f,1,dcp); + else + mfctr_wrt_v(nvl,f,v,dcp); + } +} + void homfctr(vl,g,dcp) VL vl; P g; @@ -90,6 +165,45 @@ DCP *dcp; adjsgn(f,dc0); *dcp = dc0; } +void mfctr_wrt_v(vl,f,v,dcp) +VL vl; +P f; +V v; +DCP *dcp; +{ + DCP dc,dc0,dct,dcs,dcr; + P p,pmin,ppmin,cmin,t; + VL nvl,mvl; + Q c; + + ptozp(f,1,&c,&p); + NEWDC(dc0); dc = dc0; COEF(dc) = (P)c; DEG(dc) = ONE; NEXT(dc) = 0; + msqfr(vl,p,&dct); + for ( ; dct; dct = NEXT(dct) ) { + clctv(vl,f,&nvl); + reordvar(nvl,v,&mvl); + reorderp(mvl,vl,f,&pmin); + pcp(mvl,pmin,&ppmin,&cmin); + if ( !NUM(cmin) ) { + mfctrmain(mvl,cmin,&dcs); + for ( dcr = dcs; dcr; dcr = NEXT(dcr) ) { + DEG(dcr) = DEG(dct); + reorderp(vl,mvl,COEF(dcr),&t); COEF(dcr) = t; + } + for ( ; NEXT(dc); dc = NEXT(dc) ); + NEXT(dc) = dcs; + } + mfctrmain(mvl,ppmin,&dcs); + for ( dcr = dcs; dcr; dcr = NEXT(dcr) ) { + DEG(dcr) = DEG(dct); + reorderp(vl,mvl,COEF(dcr),&t); COEF(dcr) = t; + } + for ( ; NEXT(dc); dc = NEXT(dc) ); + NEXT(dc) = dcs; + } + adjsgn(f,dc0); *dcp = dc0; +} + #if 0 void adjsgn(p,dc) P p; @@ -225,13 +339,14 @@ VL vl; P p; DCP *dcp; { - int i,j,k,*win,np; + int i,j,k,*win,np,x; VL nvl,tvl; VN vn,vnt,vn1; P p0,f,g,f0,g0,s,t,lp,m; P *fp0,*fpt,*l,*tl; DCP dc,dc0,dcl; int count,nv; + int *nonzero; if ( !cmpq(DEG(DC(p)),ONE) ) { NEWDC(dc); DEG(dc) = ONE; COEF(dc) = p; NEXT(dc) = 0; @@ -241,9 +356,56 @@ DCP *dcp; for ( nv = 0, tvl = nvl; tvl; tvl = NEXT(tvl), nv++); W_CALLOC(nv,struct oVN,vn); W_CALLOC(nv,struct oVN,vnt); W_CALLOC(nv,struct oVN,vn1); + W_CALLOC(nv,int,nonzero); + for ( i = 0, tvl = NEXT(nvl); tvl; tvl = NEXT(tvl), i++ ) vn1[i].v = vn[i].v = tvl->v; vn1[i].v = vn[i].v = 0; + + /* determine a heuristic bound of deg(GCD(p,p')) */ + while ( 1 ) { + for ( i = 0; vn1[i].v; i++ ) + vn1[i].n = ((unsigned int)random())%256+1; + substvp(nvl,LC(p),vn1,&p0); + if ( p0 ) { + substvp(nvl,p,vn1,&p0); + if ( sqfrchk(p0) ) { + ufctr(p0,1,&dc0); + if ( NEXT(NEXT(dc0)) == 0 ) { + NEWDC(dc); DEG(dc) = ONE; COEF(dc) = p; NEXT(dc) = 0; + *dcp = dc; + return; + } else { + for ( dc0 = NEXT(dc0), np = 0; dc0; dc0 = NEXT(dc0), np++ ); + break; + } + } + } + } + + /* determine the position of variables which is not allowed to + be set to 0 */ + for ( i = 0; vn1[i].v; i++ ) { + x = vn1[i].n; vn1[i].n = 0; + substvp(nvl,LC(p),vn1,&p0); + if ( !p0 ) + vn1[i].n = x; + else { + substvp(nvl,p,vn1,&p0); + if ( !sqfrchk(p0) ) + vn1[i].n = x; + else { + ufctr(p0,1,&dc0); + for ( dc0 = NEXT(dc0), j = 0; dc0; dc0 = NEXT(dc0), j++ ); + if ( j > np ) + vn1[i].n = x; + } + } + } + for ( i = 0; vn1[i].v; i++ ) + if (vn1[i].n ) + nonzero[i] = 1; + count = 0; while ( 1 ) { while ( 1 ) { @@ -267,14 +429,26 @@ DCP *dcp; NEWDC(dc); DEG(dc) = ONE; COEF(dc) = p; NEXT(dc) = 0; *dcp = dc; return; - } else - goto MAIN; - } + } else { + for ( dc = NEXT(dc0), i = 0; dc; dc = NEXT(dc), i++ ); + if ( i <= np ) + goto MAIN; + if ( i < np ) + np = i; + } + } } if ( nextbin(vnt,j) ) break; } - next(vn); + while ( 1 ) { + next(vn); + for ( i = 0; vn[i].v; i++ ) + if ( nonzero[i] && !vn[i].n ) + break; + if ( !vn[i].v ) + break; + } } MAIN : #if 0 @@ -355,7 +529,10 @@ DCP *dcp; else if ( iscycp(p) ) cycp(VR(p),UDEG(p),dcp); else { - hensel(5,5,p,&list); + if ( use_new_hensel ) + hensel2(5,5,p,&list); + else + hensel(5,5,p,&list); if ( list->n == 1 ) { NEWDC(dc); DEG(dc) = ONE; COEF(dc) = p; NEXT(dc) = 0; *dcp = dc; @@ -729,7 +906,31 @@ DCP *dcp; vn1[i].v = vn[i].v = tvl->v; vn1[i].v = vn[i].v = 0; - for ( dcr0 = 0, g = p, d = deg(VR(g),g), found = 0; ; ) { + /* determine a heuristic bound of deg(GCD(p,p')) */ + while ( 1 ) { + for ( i = 0; vn1[i].v; i++ ) + vn1[i].n = ((unsigned int)random())%256+1; + substvp(nvl,LC(p),vn1,&tmp); + if ( tmp ) { + substvp(nvl,p,vn1,&p0); + usqp(p0,&dc0); + for ( d1 = 0, dc = dc0; dc; dc = NEXT(dc) ) + if ( DEG(dc) ) + d1 += (QTOS(DEG(dc))-1)*UDEG(COEF(dc)); + if ( d1 == 0 ) { + /* p is squarefree */ + NEWDC(dc); DEG(dc) = ONE; COEF(dc) = p; NEXT(dc) = 0; + *dcp = dc; + return; + } else { + d = d1+1; /* XXX : try searching better evaluation */ + found = 0; + break; + } + } + } + + for ( dcr0 = 0, g = p; ; ) { while ( 1 ) { for ( i = 0, j = 0; vn[i].v; i++ ) if ( vn[i].n ) vnt[j++].v = (V)i;