=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/fctr.c,v retrieving revision 1.2 retrieving revision 1.17 diff -u -p -r1.2 -r1.17 --- OpenXM_contrib2/asir2000/builtin/fctr.c 2000/08/21 08:31:19 1.2 +++ OpenXM_contrib2/asir2000/builtin/fctr.c 2003/01/04 09:06:16 1.17 @@ -23,7 +23,7 @@ * 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@flab.fujitsu.co.jp of the detailed specification + * 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. * @@ -45,19 +45,24 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/fctr.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/fctr.c,v 1.16 2002/10/31 03:59:50 noro Exp $ */ #include "ca.h" #include "parse.h" void Pfctr(), Pgcd(), Pgcdz(), Plcm(), Psqfr(), Pufctrhint(); -void Pptozp(), Pcont(); +void Pptozp(), Pcont(), Psfcont(); void Pafctr(), Pagcd(); void Pmodsqfr(),Pmodfctr(),Pddd(),Pnewddd(),Pddd_tab(); +void Psfsqfr(),Psffctr(),Psfbfctr(),Psfufctr(),Psfmintdeg(),Psfgcd(); void Pirred_check(), Pnfctr_mod(); +void Pbivariate_hensel_special(); +void sfmintdeg(VL vl,P fx,int dy,int c,P *fr); + struct ftab fctr_tab[] = { - {"fctr",Pfctr,1}, + {"bivariate_hensel_special",Pbivariate_hensel_special,6}, + {"fctr",Pfctr,-2}, {"gcd",Pgcd,-3}, {"gcdz",Pgcdz,2}, {"lcm",Plcm,2}, @@ -65,10 +70,17 @@ struct ftab fctr_tab[] = { {"ufctrhint",Pufctrhint,2}, {"ptozp",Pptozp,1}, {"cont",Pcont,-2}, + {"sfcont",Psfcont,-2}, {"afctr",Pafctr,2}, {"agcd",Pagcd,3}, {"modsqfr",Pmodsqfr,2}, {"modfctr",Pmodfctr,2}, + {"sfsqfr",Psfsqfr,1}, + {"sffctr",Psffctr,1}, + {"sfufctr",Psfufctr,1}, + {"sfbfctr",Psfbfctr,-4}, + {"sfmintdeg",Psfmintdeg,5}, + {"sfgcd",Psfgcd,2}, #if 0 {"ddd",Pddd,2}, {"newddd",Pnewddd,2}, @@ -79,6 +91,40 @@ struct ftab fctr_tab[] = { {0,0,0}, }; +/* bivariate_hensel_special(f(x,y):monic in x,g0(x),h0(y),x,y,d) */ + +void Pbivariate_hensel_special(arg,rp) +NODE arg; +LIST *rp; +{ + DCP dc; + struct oVN vn[2]; + P f,g0,h0,ak,bk,gk,hk; + V vx,vy; + VL nvl; + Q qk,cbd,bb; + int d; + NODE n; + + f = (P)ARG0(arg); + g0 = (P)ARG1(arg); + h0 = (P)ARG2(arg); + vx = VR((P)ARG3(arg)); + vy = VR((P)ARG4(arg)); + d = QTOS((Q)ARG5(arg)); + NEWVL(nvl); nvl->v = vx; + NEWVL(NEXT(nvl)); NEXT(nvl)->v = vy; + NEXT(NEXT(nvl)) = 0; + vn[0].v = vy; vn[0].n = 0; + vn[1].v = 0; vn[1].n = 0; + cbound(nvl,f,&cbd); + addq(cbd,cbd,&bb); + henzq1(g0,h0,bb,&bk,&ak,&qk); + henmv(nvl,vn,f,g0,h0,ak,bk,(P)ONE,(P)ONE,(P)ONE,(P)ONE,qk,d,&gk,&hk); + n = mknode(2,gk,hk); + MKLIST(*rp,n); +} + void Pfctr(arg,rp) NODE arg; LIST *rp; @@ -86,7 +132,12 @@ LIST *rp; DCP dc; asir_assert(ARG0(arg),O_P,"fctr"); - fctrp(CO,(P)ARG0(arg),&dc); + if ( argc(arg) == 1 ) + fctrp(CO,(P)ARG0(arg),&dc); + else { + asir_assert(ARG1(arg),O_P,"fctr"); + fctr_wrt_v_p(CO,(P)ARG0(arg),VR((P)ARG1(arg)),&dc); + } dcptolist(dc,rp); } @@ -106,7 +157,7 @@ P *rp; else if ( !p2 ) *rp = p1; else if ( !qpcheck((Obj)p1) || !qpcheck((Obj)p2) ) - error("gcd : invalid argument"); + gcdprsp(CO,p1,p2,rp); else if ( argc(arg) == 2 ) ezgcdp(CO,p1,p2,rp); else { @@ -246,6 +297,37 @@ P *rp; } } +void Psfcont(arg,rp) +NODE arg; +P *rp; +{ + DCP dc; + int m; + P p,p1; + P *l; + V v; + + asir_assert(ARG0(arg),O_P,"sfcont"); + p = (P)ARG0(arg); + if ( NUM(p) ) + *rp = p; + else { + if ( argc(arg) == 2 ) { + v = VR((P)ARG1(arg)); + change_mvar(CO,p,v,&p1); + if ( VR(p1) != v ) { + *rp = p1; return; + } else + p = p1; + } + for ( m = 0, dc = DC(p); dc; dc = NEXT(dc), m++ ); + l = (P *)ALLOCA(m*sizeof(P)); + for ( m = 0, dc = DC(p); dc; dc = NEXT(dc), m++ ) + l[m] = COEF(dc); + gcdsf(CO,l,m,rp); + } +} + void Pptozp(arg,rp) NODE arg; P *rp; @@ -312,16 +394,106 @@ LIST *rp; dcptolist(dc,rp); } +void Psfgcd(arg,rp) +NODE arg; +LIST *rp; +{ + P ps[2]; + + ps[0] = (P)ARG0(arg); + ps[1] = (P)ARG1(arg); + gcdsf(CO,ps,2,rp); +} + +void Psffctr(arg,rp) +NODE arg; +LIST *rp; +{ + DCP dc; + + mfctrsf(CO,ARG0(arg),&dc); + dcptolist(dc,rp); +} + +void Psfsqfr(arg,rp) +NODE arg; +LIST *rp; +{ + DCP dc; + + sqfrsf(CO,ARG0(arg),&dc); + dcptolist(dc,rp); +} + +void Psfufctr(arg,rp) +NODE arg; +LIST *rp; +{ + DCP dc; + + ufctrsf(ARG0(arg),&dc); + dcptolist(dc,rp); +} + +void Psfbfctr(arg,rp) +NODE arg; +LIST *rp; +{ + V x,y; + DCP dc,dct; + P t; + struct oVL vl1,vl2; + VL vl; + int degbound; + + x = VR((P)ARG1(arg)); + y = VR((P)ARG2(arg)); + vl1.v = x; vl1.next = &vl2; + vl2.v = y; vl2.next = 0; + vl = &vl1; + if ( argc(arg) == 4 ) + degbound = QTOS((Q)ARG3(arg)); + else + degbound = -1; + + sfbfctr((P)ARG0(arg),x,y,degbound,&dc); + for ( dct = dc; dct; dct = NEXT(dct) ) { + reorderp(CO,vl,COEF(dct),&t); COEF(dct) = t; + } + dcptolist(dc,rp); +} + +void Psfmintdeg(arg,rp) +NODE arg; +P *rp; +{ + V x,y; + P r; + struct oVL vl1,vl2; + VL vl; + int dy,c; + + x = VR((P)ARG1(arg)); + y = VR((P)ARG2(arg)); + vl1.v = x; vl1.next = &vl2; + vl2.v = y; vl2.next = 0; + vl = &vl1; + dy = QTOS((Q)ARG3(arg)); + c = QTOS((Q)ARG4(arg)); + sfmintdeg(vl,(P)ARG0(arg),dy,c,&r); + reorderp(CO,vl,r,rp); +} + void Pmodsqfr(arg,rp) NODE arg; LIST *rp; { DCP dc; - if ( !dc ) { + if ( !ARG0(arg) ) { NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0; - } - modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),SQFR,&dc); + } else + modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),SQFR,&dc); dcptolist(dc,rp); } @@ -331,10 +503,10 @@ LIST *rp; { DCP dc; - if ( !dc ) { + if ( !ARG0(arg) ) { NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0; - } - modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),DDD,&dc); + } else + modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),DDD,&dc); dcptolist(dc,rp); } @@ -342,12 +514,12 @@ void Pnewddd(arg,rp) NODE arg; LIST *rp; { - DCP dc; + DCP dc=0; - if ( !dc ) { + if ( !ARG0(arg) ) { NEWDC(dc); COEF(dc) = 0; DEG(dc) = ONE; NEXT(dc) = 0; - } - modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),NEWDDD,&dc); + } else + modfctrp(ARG0(arg),QTOS((Q)ARG1(arg)),NEWDDD,&dc); dcptolist(dc,rp); }