===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v
retrieving revision 1.68
retrieving revision 1.75
diff -u -p -r1.68 -r1.75
--- OpenXM_contrib2/asir2000/builtin/array.c	2015/08/14 13:51:54	1.68
+++ OpenXM_contrib2/asir2000/builtin/array.c	2017/09/17 02:34:02	1.75
@@ -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/builtin/array.c,v 1.67 2015/08/08 14:19:41 fujimoto Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.74 2017/09/15 01:52:51 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
@@ -68,13 +68,15 @@
 extern int DP_Print; /* XXX */
 
 
-void Pnewvect(), Pnewmat(), Psepvect(), Psize(), Pdet(), Pleqm(), Pleqm1(), Pgeninvm();
+void Pnewvect(), Pnewmat(), Psepvect(), Psize(), Pdet(), Pleqm(), Pleqm1(), Pgeninvm(), Ptriangleq();
 void Pinvmat();
 void Pnewbytearray(),Pmemoryplot_to_coord();
 
 void Pgeneric_gauss_elim();
 void Pgeneric_gauss_elim_mod();
 
+void Pindep_rows_mod();
+
 void Pmat_to_gfmmat(),Plu_gfmmat(),Psolve_by_lu_gfmmat();
 void Pgeninvm_swap(), Premainder(), Psremainder(), Pvtol(), Pltov();
 void Pgeninv_sf_swap();
@@ -108,6 +110,7 @@ struct ftab array_tab[] = {
 	{"mat_to_gfmmat",Pmat_to_gfmmat,2},
 	{"generic_gauss_elim",Pgeneric_gauss_elim,1},
 	{"generic_gauss_elim_mod",Pgeneric_gauss_elim_mod,2},
+	{"indep_rows_mod",Pindep_rows_mod,2},
 	{"newvect",Pnewvect,-2},
 	{"vect",Pvect,-99999999},
 	{"vector",Pnewvect,-2},
@@ -148,6 +151,7 @@ struct ftab array_tab[] = {
 	{"mat_col",Pmat_col,2},
 	{"lusolve_prep",Plusolve_prep,1},
 	{"lusolve_main",Plusolve_main,1},
+	{"triangleq",Ptriangleq,1},
 	{0,0,0},
 };
 
@@ -155,8 +159,12 @@ typedef struct _ent { int j; unsigned int e; } ent;
 
 ent *get_row(FILE *,int *l);
 void put_row(FILE *out,int l,ent *a);
-int lu_elim(int *l,ent **a,int k,int i,int mul,int mod);
+void lu_elim(int *l,ent **a,int k,int i,int mul,int mod);
+void lu_append(int *,ent **,int *,int,int,int);
+void solve_l(int *,ent **,int,int *,int);
+void solve_u(int *,ent **,int,int *,int);
 
+
 static int *ul,*ll;
 static ent **u,**l;
 static int modulus;
@@ -221,7 +229,7 @@ ent *get_row(FILE *in,int *l)
 	return a;
 }
 
-int lu_gauss(int *ul,ent **u,int *ll,ent **l,int n,int mod)
+void lu_gauss(int *ul,ent **u,int *ll,ent **l,int n,int mod)
 {
 	int i,j,k,s,mul;
 	unsigned int inv;
@@ -244,7 +252,7 @@ int lu_gauss(int *ul,ent **u,int *ll,ent **l,int n,int
 
 #define INITLEN 10
 
-lu_append(int *l,ent **a,int *l2,int k,int i,int mul)
+void lu_append(int *l,ent **a,int *l2,int k,int i,int mul)
 {
 	int len;
 	ent *p;
@@ -267,7 +275,7 @@ lu_append(int *l,ent **a,int *l2,int k,int i,int mul)
 
 /* a[k] = a[k]-mul*a[i] */ 
 
-int lu_elim(int *l,ent **a,int k,int i,int mul,int mod)
+void lu_elim(int *l,ent **a,int k,int i,int mul,int mod)
 {
 	ent *ak,*ai,*w;
 	int lk,li,j,m,p,q,r,s,t,j0;
@@ -315,7 +323,7 @@ int lu_elim(int *l,ent **a,int k,int i,int mul,int mod
 	l[k] = j;
 }
 
-int solve_l(int *ll,ent **l,int n,int *rhs,int mod)
+void solve_l(int *ll,ent **l,int n,int *rhs,int mod)
 {
 	int j,k,s,len;
 	ent *p;
@@ -329,7 +337,7 @@ int solve_l(int *ll,ent **l,int n,int *rhs,int mod)
 	}
 }
 
-int solve_u(int *ul,ent **u,int n,int *rhs,int mod)
+void solve_u(int *ul,ent **u,int n,int *rhs,int mod)
 {
 	int j,k,s,len,inv;
 	ent *p;
@@ -1172,6 +1180,46 @@ void Pgeneric_gauss_elim(NODE arg,LIST *rp)
 	MKLIST(*rp,n0);
 }
 
+void Pindep_rows_mod(NODE arg,VECT *rp)
+{
+	MAT m,mat;
+	VECT rind;
+	Q **tmat;
+	int **wmat,**row0;
+	Q *rib;
+	int *rowstat,*p;
+	Q q;
+	int md,i,j,k,l,row,col,t,rank;
+
+	asir_assert(ARG0(arg),O_MAT,"indep_rows_mod");
+	asir_assert(ARG1(arg),O_N,"indep_rows_mod");
+	m = (MAT)ARG0(arg); md = QTOS((Q)ARG1(arg));
+	row = m->row; col = m->col; tmat = (Q **)m->body;
+	wmat = (int **)almat(row,col);
+
+	row0 = (int **)ALLOCA(row*sizeof(int *));
+	for ( i = 0; i < row; i++ ) row0[i] = wmat[i];
+
+	rowstat = (int *)MALLOC_ATOMIC(row*sizeof(int));
+	for ( i = 0; i < row; i++ )
+		for ( j = 0; j < col; j++ )
+			if ( q = (Q)tmat[i][j] ) {
+				t = rem(NM(q),md);
+				if ( t && SGN(q) < 0 )
+					t = (md - t) % md;
+				wmat[i][j] = t;
+			} else
+				wmat[i][j] = 0;
+	rank = indep_rows_mod(wmat,row,col,md,rowstat);
+
+	MKVECT(rind,rank);
+	rib = (Q *)rind->body;
+	for ( j = 0; j < rank; j++ ) {
+		STOQ(rowstat[j],rib[j]);
+	}
+    *rp = rind;
+}
+
 /*
 	input : a row x col matrix A
 		A[I] <-> A[I][0]*x_0+A[I][1]*x_1+...
@@ -2308,6 +2356,24 @@ void red_by_vect(int m,unsigned int *p,unsigned int *r
 		}
 }
 
+#if defined(__GNUC__) && SIZEOF_LONG==8
+/* 64bit vector += UNIT vector(normalized) */
+
+void red_by_vect64(int m, U64 *p,unsigned int *c,U64 *r,unsigned int hc,int len)
+{
+  U64 t;
+
+  /* (p[0],c[0]) is normalized */
+  *p++ = 0; *c++ = 0; r++; len--;
+  for ( ; len; len--, r++, p++, c++ )
+    if ( *r ) {
+      t = (*p)+(*r)*hc;
+      if ( t < *p ) (*c)++;
+      *p = t;
+    }
+}
+#endif
+
 void red_by_vect_sf(int m,unsigned int *p,unsigned int *r,unsigned int hc,int len)
 {
 	*p++ = 0; r++; len--;
@@ -2316,6 +2382,22 @@ void red_by_vect_sf(int m,unsigned int *p,unsigned int
 			*p = _addsf(_mulsf(*r,hc),*p);
 }
 
+extern GZ current_mod_lf;
+extern int current_mod_lf_size;
+
+void red_by_vect_lf(mpz_t *p,mpz_t *r,mpz_t hc,int len)
+{
+	mpz_set_ui(*p++,0); r++; len--;
+	for ( ; len; len--, r++, p++ ) {
+       mpz_addmul(*p,*r,hc);
+#if 0
+       if ( mpz_size(*p) > current_mod_lf_size )
+         mpz_mod(*p,*p,BDY(current_mod_lf));
+#endif
+    }
+}
+
+
 extern unsigned int **psca;
 
 void reduce_sp_by_red_mod_compress (int *sp,CDP *redmat,int *ind,
@@ -2464,6 +2546,43 @@ int generic_gauss_elim_mod2(int **mat0,int row,int col
 	return rank;
 }
 
+int indep_rows_mod(int **mat0,int row,int col,int md,int *rowstat)
+{
+	int i,j,k,l,inv,a,rank;
+	unsigned int *t,*pivot,*pk;
+	unsigned int **mat;
+
+	for ( i = 0; i < row; i++ ) rowstat[i] = i;
+	mat = (unsigned int **)mat0;
+	for ( rank = 0, j = 0; j < col; j++ ) {
+		for ( i = rank; i < row; i++ )
+			mat[i][j] %= md;
+		for ( i = rank; i < row; i++ )
+			if ( mat[i][j] )
+				break;
+		if ( i == row ) continue;
+		if ( i != rank ) {
+			t = mat[i]; mat[i] = mat[rank]; mat[rank] = t;
+			k = rowstat[i]; rowstat[i] = rowstat[rank]; rowstat[rank] = k;
+		}
+		pivot = mat[rank];
+		inv = invm(pivot[j],md);
+		for ( k = j, pk = pivot+k; k < col; k++, pk++ )
+			if ( *pk ) {
+				if ( *pk >= (unsigned int)md )
+					*pk %= md;
+				DMAR(*pk,inv,0,md,*pk)
+			}
+		for ( i = rank+1; i < row; i++ ) {
+			t = mat[i];
+			if ( a = t[j] )
+				red_by_vect(md,t+j,pivot+j,md-a,col-j);
+		}
+		rank++;
+	}
+	return rank;
+}
+
 int generic_gauss_elim_sf(int **mat0,int row,int col,int md,int *colstat)
 {
 	int i,j,k,l,inv,a,rank;
@@ -2990,9 +3109,7 @@ void mat_to_gfmmat(MAT m,unsigned int md,GFMMAT *rp)
 	TOGFMMAT(row,col,wmat,*rp);
 }
 
-void Pgeninvm_swap(arg,rp)
-NODE arg;
-LIST *rp;
+void Pgeninvm_swap(NODE arg,LIST *rp)
 {
 	MAT m;
 	pointer **mat;
@@ -3038,12 +3155,8 @@ LIST *rp;
 	}
 }
 
-gauss_elim_geninv_mod_swap(mat,row,col,md,invmatp,indexp)
-unsigned int **mat;
-int row,col;
-unsigned int md;
-unsigned int ***invmatp;
-int **indexp;
+int gauss_elim_geninv_mod_swap(unsigned int **mat,int row,int col,unsigned int md,
+    unsigned int ***invmatp,int **indexp)
 {
 	int i,j,k,inv,a,n,m;
 	unsigned int *t,*pivot,*s;
@@ -3750,4 +3863,45 @@ void Pmat_col(NODE arg,VECT *rp)
 		BDY(vect)[i] = BDY(mat)[i][j];
 	}
 	*rp = vect;
+}
+
+NODE triangleq(NODE e)
+{
+  int n,i,k;
+  V v;
+  VL vl;
+  P *p;
+  NODE r,r1;
+
+  n = length(e);
+  p = (P *)MALLOC(n*sizeof(P));
+  for ( i = 0; i < n; i++, e = NEXT(e) ) p[i] = (P)BDY(e);
+  i = 0;
+  while ( 1 ) {
+    for ( ; i < n && !p[i]; i++ );
+    if ( i == n ) break;
+    if ( OID(p[i]) == O_N ) return 0;
+    v = p[i]->v;
+    for ( k = i+1; k < n; k++ )
+      if ( p[k] ) {
+        if ( OID(p[k]) == O_N ) return 0;
+        if ( p[k]->v == v ) p[k] = 0;
+      }
+    i++;
+  }
+  for ( r = 0, i = 0; i < n; i++ ) {
+    if ( p[i] ) {
+      MKNODE(r1,p[i],r); r = r1;
+    }
+  }
+  return r;
+}
+
+void Ptriangleq(NODE arg,LIST *rp)
+{
+  NODE ret;
+
+  asir_assert(ARG0(arg),O_LIST,"sparseleq");
+  ret = triangleq(BDY((LIST)ARG0(arg)));
+  MKLIST(*rp,ret);
 }