===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v
retrieving revision 1.11
retrieving revision 1.16
diff -u -p -r1.11 -r1.16
--- OpenXM_contrib2/asir2000/builtin/array.c	2000/12/05 06:59:15	1.11
+++ OpenXM_contrib2/asir2000/builtin/array.c	2001/09/10 02:45:25	1.16
@@ -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.10 2000/11/13 01:48:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.15 2001/09/07 08:54:57 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -90,6 +90,7 @@ void Px962_irredpoly_up2();
 void Pirredpoly_up2();
 void Pnbpoly_up2();
 void Pqsort();
+void Pexponent_vector();
 
 struct ftab array_tab[] = {
 	{"solve_by_lu_gfmmat",Psolve_by_lu_gfmmat,4},
@@ -97,7 +98,10 @@ struct ftab array_tab[] = {
 	{"mat_to_gfmmat",Pmat_to_gfmmat,2},
 	{"generic_gauss_elim_mod",Pgeneric_gauss_elim_mod,2},
 	{"newvect",Pnewvect,-2},
+	{"vector",Pnewvect,-2},
+	{"exponent_vector",Pexponent_vector,-99999999},
 	{"newmat",Pnewmat,-3},
+	{"matrix",Pnewmat,-3},
 	{"newbytearray",Pnewbytearray,-2},
 	{"sepmat_destructive",Psepmat_destructive,2},
 	{"sepvect",Psepvect,2},
@@ -376,6 +380,13 @@ VECT *rp;
 	*rp = vect;
 }
 
+void Pexponent_vector(arg,rp)
+NODE arg;
+DP *rp;
+{
+	nodetod(arg,rp);
+}
+
 void Pnewbytearray(arg,rp)
 NODE arg;
 BYTEARRAY *rp;
@@ -808,7 +819,7 @@ int **rindp,**cindp;
 		if ( DP_Print ) {
 			fprintf(asir_out,"."); fflush(asir_out);
 		}
-		md = lprime[ind];
+		md = get_lprime(ind);
 		get_eg(&tmp0);
 		for ( i = 0; i < row; i++ )
 			for ( j = 0, bmi = bmat[i], wmi = wmat[i]; j < col; j++ )
@@ -895,7 +906,10 @@ RESET:
 			add_eg(&eg_chrem_split,&tmp0,&tmp1);
 
 			get_eg(&tmp0);
-			ret = intmtoratm(crmat,m1,*nm,dn);
+			if ( ind % 16 )
+				ret = 0;
+			else
+				ret = intmtoratm(crmat,m1,*nm,dn);
 			get_eg(&tmp1);
 			add_eg(&eg_intrat,&tmp0,&tmp1);
 			add_eg(&eg_intrat_split,&tmp0,&tmp1);
@@ -953,7 +967,7 @@ int **rindp,**cindp;
 	row = mat->row; col = mat->col;
 	w = (int **)almat(row,col);
 	for ( ind = 0; ; ind++ ) {
-		md = lprime[ind];
+		md = get_lprime(ind);
 		STOQ(md,mdq);
 		for ( i = 0; i < row; i++ )
 			for ( j = 0, ai = a0[i], wi = w[i]; j < col; j++ )
@@ -1035,7 +1049,7 @@ int **rindp,**cindp;
 				add_eg(&eg_mul,&tmp0,&tmp1);
 				/* q = q*md */
 				mulq(q,mdq,&u); q = u;
-				if ( !(count % 2) && intmtoratm_q(xmat,NM(q),*nmmat,dn) ) {
+				if ( !(count % 16) && intmtoratm_q(xmat,NM(q),*nmmat,dn) ) {
 					for ( j = k = l = 0; j < col; j++ )
 						if ( cinfo[j] )
 							rind[k++] = j;	
@@ -1289,7 +1303,7 @@ int md;
 					ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1
 					ONE_STEP1 ONE_STEP1 ONE_STEP1 ONE_STEP1
 				}
-				for ( ; k >= 0; k-- ) {
+				for ( ; k > 0; k-- ) {
 					if ( zzz = *s ) { DMAR(zzz,hc,*tj,md,*tj) } tj++; s++;
 				}
 			}
@@ -1376,13 +1390,51 @@ int md;
 			hc = md-hc;
 			s = redmat[i]+j;
 			tj = sp+j;
-			for ( k = col-j; k >= 0; k-- ) {
+			for ( k = col-j; k > 0; k-- ) {
 				if ( zzz = *s ) { DMAR(zzz,hc,*tj,md,*tj) } tj++; s++;
 			}
 		}
 	}
 }
 
+/*
+	mat[i] : compressed reducers (i=0,...,nred-1)
+	mat[0] < mat[1] < ... < mat[nred-1] w.r.t the term order
+*/
+
+void reduce_sp_by_red_mod_compress (sp,redmat,ind,nred,col,md)
+int *sp;
+CDP *redmat;
+int *ind;
+int nred,col;
+int md;
+{
+	int i,j,k,hc,c,len;
+	int *tj;
+	CDP ri;
+
+	/* reduce the spolys by redmat */
+	for ( i = nred-1; i >= 0; i-- ) {
+		/* reduce sp by redmat[i] */
+		if ( hc = sp[ind[i]] ) {
+			/* sp = sp-hc*redmat[i] */
+			hc = md-hc;
+			ri = redmat[i];
+			len = ri->len;
+			for ( k = 0; k < len; k++ ) {
+				j = ri->body[k].index;
+				c = ri->body[k].c;
+				tj = sp+j;
+#if 1
+				DMAR(c,hc,*tj,md,*tj);
+#else
+				*tj = ((hc*c)+(*tj))%md;
+#endif
+			}
+		}
+	}
+}
+
 #define ONE_STEP2  if ( zzz = *pk ) { DMAR(zzz,a,*tk,md,*tk) } pk++; tk++;
 
 int generic_gauss_elim_mod(mat,row,col,md,colstat)
@@ -1432,7 +1484,7 @@ int *colstat;
 					ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2
 					ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2
 				}
-				for ( ; k >= 0; k -- ) {
+				for ( ; k > 0; k -- ) {
 					if ( zzz = *pk ) { DMAR(zzz,a,*tk,md,*tk) } pk++; tk++;
 				}
 			}
@@ -1465,7 +1517,7 @@ int *colstat;
 					ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2
 					ONE_STEP2 ONE_STEP2 ONE_STEP2 ONE_STEP2
 					}
-					for ( ; k >= 0; k -- ) {
+					for ( ; k > 0; k -- ) {
 						if ( zzz = *pk ) { DMAR(zzz,a,*tk,md,*tk) } pk++; tk++;
 					}
 				}