===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/Q.c,v
retrieving revision 1.11
retrieving revision 1.18
diff -u -p -r1.11 -r1.18
--- OpenXM_contrib2/asir2018/engine/Q.c	2019/03/03 05:21:17	1.11
+++ OpenXM_contrib2/asir2018/engine/Q.c	2020/10/04 03:14:09	1.18
@@ -1,11 +1,11 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/Q.c,v 1.10 2018/12/10 22:24:42 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/Q.c,v 1.17 2020/01/09 01:47:41 noro Exp $ */
 #include "ca.h"
 #include "gmp.h"
 #include "base.h"
 #include "inline.h"
 
 mpz_t ONEMPZ;
-Z ONE;
+extern Z ONE;
 int lf_lazy;
 Z current_mod_lf;
 int current_mod_lf_size;
@@ -17,6 +17,10 @@ extern int DP_Print;
 
 void isqrtz(Z a,Z *r);
 void bshiftz(Z a,int n,Z *r);
+int mpz_inttorat(mpz_t c,mpz_t m,mpz_t b,mpz_t nm,mpz_t dn);
+int generic_gauss_elim_hensel64(MAT mat,MAT *nmmat,Z *dn,int **rindp,int **cindp,DP *mb);
+int find_lhs_and_lu_mod64(mp_limb_t **a,int row,int col,mp_limb_t md,int **rinfo,int **cinfo);
+void solve_by_lu_mod64(mp_limb_t **a,int n,mp_limb_t md,mp_limb_signed_t **b,int l,int normalize);
 
 void *gc_realloc(void *p,size_t osize,size_t nsize)
 {
@@ -515,7 +519,7 @@ void factorialz(unsigned int n,Z *nr)
 {
   mpz_t a;
   mpz_init(a);
-  mpz_fac_ui(a,n);
+  mpz_fac_ui(a,(unsigned long)n);
   MPZTOZ(a,*nr);
 }
 
@@ -558,7 +562,7 @@ void subq(Q n1,Q n2,Q *nr)
 
   if ( !n1 ) {
     if ( !n2 ) *nr = 0;
-    else if ( n1->z ) chsgnz((Z)n1,(Z *)nr);
+    else if ( n2->z ) chsgnz((Z)n2,(Z *)nr);
     else {
         mpq_init(t); mpq_neg(t,BDY(n2)); MPQTOQ(t,*nr);
       }
@@ -762,12 +766,15 @@ void lgp(P p,Z *g,Z *l);
 
 void ptozp(P p,int sgn,Q *c,P *pr)
 {
-  Z nm,dn;
+  Z nm,dn,nm1;
 
   if ( !p ) {
     *c = 0; *pr = 0;
   } else {
     lgp(p,&nm,&dn);
+    if ( sgn < 0 ) {
+      chsgnz(nm,&nm1); nm = nm1;
+    }
     divz(nm,dn,(Z *)c);
     divsp(CO,p,(P)*c,pr);
   }
@@ -1229,7 +1236,7 @@ int intmtoratm(MAT mat,Z md,MAT nm,Z *dn)
     return 0;
   row = mat->row; col = mat->col;
   bshiftz(md,1,&t);
-  isqrt(t,&s);
+  isqrtz(t,&s);
   bshiftz(s,64,&b);
   if ( !b ) b = ONE;
   dn0 = ONE;
@@ -1337,6 +1344,15 @@ int mpz_inttorat(mpz_t c,mpz_t m,mpz_t b,mpz_t nm,mpz_
   }
   if ( mpz_cmp(v1,b) >= 0 ) return 0;
   else {
+    mpz_gcd(t,v1,v2);
+    if ( UNIMPZ(t) ) 
+      mpz_set_ui(r1,0); 
+    else {
+      /* v1 /= t, v2 /= t, t=c*v1-v2, r1=t%m */
+      mpz_divexact(v1,v1,t); mpz_divexact(v2,v2,t);
+      mpz_mul(t,c,v1); mpz_sub(t,t,v2); mpz_mod(r1,t,m);
+    }
+    if ( mpz_sgn(r1) ) return 0;
     if ( mpz_sgn(v1)<0  ) {
       mpz_neg(dn,v1); mpz_neg(nm,v2);
     } else {
@@ -1348,7 +1364,7 @@ int mpz_inttorat(mpz_t c,mpz_t m,mpz_t b,mpz_t nm,mpz_
 
 int inttorat(Z c,Z m,Z b,Z *nmp,Z *dnp)
 {
-  Z qq,t,u1,v1,r1;
+  Z qq,t,s,r,u1,v1,r1;
   Z q,u2,v2,r2;
 
   u1 = 0; v1 = ONE; u2 = m; v2 = c;
@@ -1358,27 +1374,37 @@ int inttorat(Z c,Z m,Z b,Z *nmp,Z *dnp)
   }
   if ( cmpz(v1,b) >= 0 ) return 0;
   else {
-    if ( mpz_sgn(BDY(v1))<0  ) {
-      chsgnz(v1,dnp); chsgnz(v2,nmp);
+    /* reduction and check */
+    /* v2/v1 = u2/u1, c*u1-u2 = 0 mod m? */
+    gcdz(v1,v2,&t);
+    if ( UNIZ(t) ) {
+      u1 = v1; u2 = v2; r = 0;
     } else {
-      *dnp = v1; *nmp = v2;
+      divsz(v1,t,&u1); divsz(v2,t,&u2);
+      mulz(c,u1,&t); subz(t,u2,&s); remz(s,m,&r);
     }
+    if ( r ) return 0;
+    if ( mpz_sgn(BDY(u1))<0  ) {
+      chsgnz(u1,dnp); chsgnz(u2,nmp);
+    } else {
+      *dnp = u1; *nmp = u2;
+    }
     return 1;
   }
 }
 
 extern int f4_nocheck;
 
-int mpz_gensolve_check(MAT mat,mpz_t **nm,mpz_t dn,int rank,int *rind,int *cind)
+int mpz_gensolve_check(MAT mat,mpz_t **nm,mpz_t dn,int rank,int clen,int *rind,int *cind)
 {
-  int row,col,clen,i,j,k,l;
+  int row,col,i,j,k,l;
   mpz_t t;
   mpz_t *w;
   Z *mati;
   mpz_t *nmk;
 
   if ( f4_nocheck ) return 1;
-  row = mat->row; col = mat->col; clen = col-rank;
+  row = mat->row; col = mat->col;
   w = (mpz_t *)MALLOC(clen*sizeof(mpz_t));
   mpz_init(t);
   for ( i = 0; i < clen; i++ ) mpz_init(w[i]);
@@ -2020,7 +2046,7 @@ RESET:
         for ( j = k = l = 0; j < col; j++ )
           if ( colstat[j] ) rind[k++] = j;  
           else cind[l++] = j;
-        if ( mpz_gensolve_check(mat,num,den,rank,rind,cind) ) {
+        if ( mpz_gensolve_check(mat,num,den,rank,col-rank,rind,cind) ) {
           MKMAT(r,rank,col-rank); *nm = r;
           for ( i = 0; i < rank; i++ )
             for ( j = 0; j < col-rank; j++ ) {
@@ -2274,7 +2300,7 @@ int generic_gauss_elim_hensel64(MAT mat,MAT *nmmat,Z *
                 rind[k++] = j;  
               else if ( !cinfo[j] )
                 cind[l++] = j;
-            ret = mpz_gensolve_check(mat,nm,den,rank,rind,cind);
+            ret = mpz_gensolve_check(mat,nm,den,rank,ri,rind,cind);
             if ( ret ) {
               *rindp = rind;
               *cindp = cind;