===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/asir2000/builtin/array.c	2000/11/08 08:02:49	1.9
+++ OpenXM_contrib2/asir2000/builtin/array.c	2001/06/07 05:14:48	1.13
@@ -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.8 2000/09/21 09:19:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.12 2001/06/07 04:54:38 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -57,7 +57,7 @@
 #define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d);
 #endif
 
-extern int Print; /* XXX */
+extern int DP_Print; /* XXX */
 
 void inner_product_mat_int_mod(Q **,int **,int,int,int,Q *);
 void solve_by_lu_mod(int **,int,int,int **,int);
@@ -383,6 +383,7 @@ BYTEARRAY *rp;
 	int len,i,r;
 	BYTEARRAY array;
 	unsigned char *vb;
+	char *str;
 	LIST list;
 	NODE tn;
 
@@ -392,15 +393,29 @@ BYTEARRAY *rp;
 		error("newbytearray : invalid size");
 	MKBYTEARRAY(array,len);
 	if ( argc(arg) == 2 ) {
-		list = (LIST)ARG1(arg);
-		asir_assert(list,O_LIST,"newbytearray");
-		for ( r = 0, tn = BDY(list); tn; r++, tn = NEXT(tn) );
-		if ( r > len ) {
-			*rp = array;
-			return;
+		if ( !ARG1(arg) )
+			error("newbytearray : invalid initialization");
+		switch ( OID((Obj)ARG1(arg)) ) {
+			case O_LIST:
+				list = (LIST)ARG1(arg);
+				asir_assert(list,O_LIST,"newbytearray");
+				for ( r = 0, tn = BDY(list); tn; r++, tn = NEXT(tn) );
+				if ( r <= len ) {
+					for ( i = 0, tn = BDY(list), vb = BDY(array); tn; 
+						i++, tn = NEXT(tn) )
+						vb[i] = (unsigned char)QTOS((Q)BDY(tn));
+				}
+				break;
+			case O_STR:
+				str = BDY((STRING)ARG1(arg));
+				r = strlen(str);
+				if ( r <= len )
+					bcopy(str,BDY(array),r);
+				break;
+			default:
+				if ( !ARG1(arg) )
+					error("newbytearray : invalid initialization");
 		}
-		for ( i = 0, tn = BDY(list), vb = BDY(array); tn; i++, tn = NEXT(tn) )
-			vb[i] = (unsigned char)QTOS((Q)BDY(tn));
 	}
 	*rp = array;
 }
@@ -790,10 +805,10 @@ int **rindp,**cindp;
 	colstat = (int *)MALLOC_ATOMIC(col*sizeof(int));
 	wcolstat = (int *)MALLOC_ATOMIC(col*sizeof(int));
 	for ( ind = 0; ; ind++ ) {
-		if ( Print ) {
+		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++ )
@@ -827,13 +842,13 @@ RESET:
 					}
 		} else {
 			if ( rank < rank0 ) {
-				if ( Print ) {
+				if ( DP_Print ) {
 					fprintf(asir_out,"lower rank matrix; continuing...\n");
 					fflush(asir_out);
 				}
 				continue;
 			} else if ( rank > rank0 ) {
-				if ( Print ) {
+				if ( DP_Print ) {
 					fprintf(asir_out,"higher rank matrix; resetting...\n");
 					fflush(asir_out);
 				}
@@ -841,7 +856,7 @@ RESET:
 			} else {
 				for ( j = 0; (j<col) && (colstat[j]==wcolstat[j]); j++ );
 				if ( j < col ) {
-					if ( Print ) {
+					if ( DP_Print ) {
 						fprintf(asir_out,"inconsitent colstat; resetting...\n");
 						fflush(asir_out);
 					}
@@ -880,7 +895,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);
@@ -897,7 +915,7 @@ RESET:
 					get_eg(&tmp1);
 					add_eg(&eg_gschk,&tmp0,&tmp1);
 					add_eg(&eg_gschk_split,&tmp0,&tmp1);
-					if ( Print ) {
+					if ( DP_Print ) {
 						print_eg("Mod",&eg_mod_split);
 						print_eg("Elim",&eg_elim_split);
 						print_eg("ChRem",&eg_chrem_split);
@@ -938,7 +956,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++ )
@@ -1020,7 +1038,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;