===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v
retrieving revision 1.36
retrieving revision 1.39
diff -u -p -r1.36 -r1.39
--- OpenXM_contrib2/asir2000/builtin/array.c	2004/09/14 07:23:34	1.36
+++ OpenXM_contrib2/asir2000/builtin/array.c	2004/12/01 12:55:19	1.39
@@ -45,13 +45,15 @@
  * 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.35 2004/06/30 20:01:36 ohara Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.38 2004/09/21 05:23:13 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
 #include "parse.h"
 #include "inline.h"
 
+#define F4_INTRAT_PERIOD 8 
+
 #if 0
 #undef DMAR
 #define DMAR(a1,a2,a3,d,r) (r)=dmar(a1,a2,a3,d);
@@ -112,7 +114,7 @@ struct ftab array_tab[] = {
 	{"ltov",Pltov,1},
 	{"size",Psize,1},
 	{"det",Pdet,-2},
-	{"nd_det",Pnd_det,1},
+	{"nd_det",Pnd_det,-2},
 	{"invmat",Pinvmat,-2},
 	{"leqm",Pleqm,2},
 	{"leqm1",Pleqm1,2},
@@ -1118,7 +1120,7 @@ RESET:
 			add_eg(&eg_chrem_split,&tmp0,&tmp1);
 
 			get_eg(&tmp0);
-			if ( ind % 16 )
+			if ( ind % F4_INTRAT_PERIOD )
 				ret = 0;
 			else
 				ret = intmtoratm(crmat,m1,*nm,dn);
@@ -1170,6 +1172,7 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn
 	int *rind,*cind;
 	int count;
 	struct oEGT eg_mul,eg_inv,tmp0,tmp1;
+	int period;
 
 	a0 = (Q **)mat->body;
 	row = mat->row; col = mat->col;
@@ -1217,6 +1220,7 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn
 			*cindp = cind = (int *)MALLOC_ATOMIC((ri)*sizeof(int));
 
 			init_eg(&eg_mul); init_eg(&eg_inv);
+			period = F4_INTRAT_PERIOD;
 			for ( q = ONE, count = 0; ; count++ ) {
 				fprintf(stderr,".");
 				/* wc = -b mod md */
@@ -1257,20 +1261,22 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn
 				add_eg(&eg_mul,&tmp0,&tmp1);
 				/* q = q*md */
 				mulq(q,mdq,&u); q = u;
-				if ( !(count % 16) && intmtoratm_q(xmat,NM(q),*nmmat,dn) ) {
-					for ( j = k = l = 0; j < col; j++ )
-						if ( cinfo[j] )
-							rind[k++] = j;	
-						else
-							cind[l++] = j;
-					if ( gensolve_check(mat,*nmmat,*dn,rind,cind) ) {
-						fprintf(stderr,"\n");
-						print_eg("INV",&eg_inv);
-						print_eg("MUL",&eg_mul);
-						fflush(asir_out);
-						return rank;
-					}
-				}
+				if ( !(count % period) )
+					if ( intmtoratm_q(xmat,NM(q),*nmmat,dn) ) {
+						for ( j = k = l = 0; j < col; j++ )
+							if ( cinfo[j] )
+								rind[k++] = j;	
+							else
+								cind[l++] = j;
+						if ( gensolve_check(mat,*nmmat,*dn,rind,cind) ) {
+							fprintf(stderr,"\n");
+							print_eg("INV",&eg_inv);
+							print_eg("MUL",&eg_mul);
+							fflush(asir_out);
+							return rank;
+						}
+					} else
+						period *=2;
 			}
 	}
 }
@@ -2919,5 +2925,8 @@ void printimat(int **mat,int row,int col)
 
 void Pnd_det(NODE arg,P *rp)
 {
-	nd_det(ARG0(arg),rp);
+	if ( argc(arg) == 1 )
+		nd_det(0,ARG0(arg),rp);
+	else
+		nd_det(QTOS((Q)ARG1(arg)),ARG0(arg),rp);
 }