=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/Q.c,v retrieving revision 1.19 retrieving revision 1.22 diff -u -p -r1.19 -r1.22 --- OpenXM_contrib2/asir2018/engine/Q.c 2020/10/06 06:31:19 1.19 +++ OpenXM_contrib2/asir2018/engine/Q.c 2022/04/03 01:30:27 1.22 @@ -1,5 +1,6 @@ -/* $OpenXM: OpenXM_contrib2/asir2018/engine/Q.c,v 1.18 2020/10/04 03:14:09 noro Exp $ */ +/* $OpenXM: OpenXM_contrib2/asir2018/engine/Q.c,v 1.21 2021/10/08 07:27:05 noro Exp $ */ #include "ca.h" +#include "parse.h" #include "gmp.h" #include "base.h" #include "inline.h" @@ -97,8 +98,11 @@ void dnq(Q q,Z *r) int sgnq(Q q) { if ( !q ) return 0; - else if ( q->z ) return mpz_sgn(BDY((Z)q)); - else return mpz_sgn(mpq_numref(BDY(q))); + else if ( q->z ) { + int sgn; + sgn = mpz_sgn(BDY((Z)q)); + return sgn; + } else return mpz_sgn(mpq_numref(BDY(q))); } Q mpqtozq(mpq_t a) @@ -671,6 +675,10 @@ void pwrq(Q n1,Q n,Q *nr) nm[0] = mpq_denref(BDY(n1))[0]; dn[0] = mpq_numref(BDY(n1))[0]; } + if ( mpz_sgn(dn)<0 ) { + mpz_neg(nm,nm); + mpz_neg(dn,dn); + } } else { if ( n1->z ) { nm[0] = BDY((Z)n1)[0]; @@ -789,10 +797,10 @@ void lgp(P p,Z *g,Z *l) if ( NUM(p) ) { if ( ((Q)p)->z ) { - MPZTOZ(BDY((Z)p),*g); + absz((Z)p,g); *l = ONE; } else { - MPZTOZ(mpq_numref(BDY((Q)p)),*g); + MPZTOZ(mpq_numref(BDY((Q)p)),g1); absz(g1,g); MPZTOZ(mpq_denref(BDY((Q)p)),*l); } } else {