=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/PU.c,v retrieving revision 1.3 retrieving revision 1.6 diff -u -p -r1.3 -r1.6 --- OpenXM_contrib2/asir2000/engine/PU.c 2000/08/21 08:31:26 1.3 +++ OpenXM_contrib2/asir2000/engine/PU.c 2001/06/07 04:54:40 1.6 @@ -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,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/engine/PU.c,v 1.2 1999/12/27 04:16:31 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/PU.c,v 1.5 2001/03/29 09:49:57 noro Exp $ */ #include "ca.h" @@ -500,9 +500,7 @@ P p1,p2,*pr; factorial(QTOS(n)+QTOS(m),&t); mulq(u,t,&s); addq(s,s,&f); for ( index = 0, q = ONE, c = 0; cmpq(f,q) >= 0; ) { - mod = lprime[index++]; - if ( !mod ) - error("sqfrum : lprime[] exhausted."); + mod = get_lprime(index++); ptomp(mod,LC(q1),&tg); if ( !tg ) continue; @@ -549,9 +547,7 @@ P p1,p2,*pr; factorial(QTOS(n)+QTOS(m),&t); mulq(u,t,&s); addq(s,s,&f); for ( index = 0, q = ONE, c = 0; cmpq(f,q) >= 0; ) { - mod = lprime[index++]; - if ( !mod ) - error("sqfrum : lprime[] exhausted."); + mod = get_lprime(index++); ptomp(mod,LC(q1),&tg); if ( !tg ) continue; @@ -705,7 +701,10 @@ P *pr; { Q c; - ptozp(p,1,&c,pr); + if ( qpcheck((Obj)p) ) + ptozp(p,1,&c,pr); + else + *pr = p; } void mindegp(vl,p,mvlp,pr)