=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/array.c,v retrieving revision 1.53 retrieving revision 1.56 diff -u -p -r1.53 -r1.56 --- OpenXM_contrib2/asir2000/builtin/array.c 2006/06/12 11:52:10 1.53 +++ OpenXM_contrib2/asir2000/builtin/array.c 2007/11/23 05:43:23 1.56 @@ -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.52 2006/05/30 07:35:30 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/array.c,v 1.55 2006/10/26 10:49:16 noro Exp $ */ #include "ca.h" #include "base.h" @@ -391,11 +391,13 @@ void Pnewvect(NODE arg,VECT *rp) if ( argc(arg) == 2 ) { list = (LIST)ARG1(arg); asir_assert(list,O_LIST,"newvect"); +#if 0 for ( r = 0, tn = BDY(list); tn; r++, tn = NEXT(tn) ); if ( r > len ) { *rp = vect; return; } +#endif for ( i = 0, tn = BDY(list), vb = BDY(vect); tn; i++, tn = NEXT(tn) ) vb[i] = (pointer)BDY(tn); } @@ -1542,7 +1544,7 @@ int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn } } -int generic_gauss_elim_hensel_dalg(MAT mat,MAT *nmmat,Q *dn,int **rindp,int **cindp) +int generic_gauss_elim_hensel_dalg(MAT mat,DP *mb,MAT *nmmat,Q *dn,int **rindp,int **cindp) { MAT bmat,xmat; Q **a0,**a,**b,**x,**nm; @@ -1566,12 +1568,9 @@ int generic_gauss_elim_hensel_dalg(MAT mat,MAT *nmmat, N wn; Q wq; NumberField nf; - DP *mb; DP m; int col1; - nf = get_numberfield(); - mb = nf->mb; a0 = (Q **)mat->body; row = mat->row; col = mat->col; w = (int **)almat(row,col); @@ -1818,13 +1817,10 @@ int intmtoratm(MAT mat,N md,MAT nm,Q *dn) return 0; row = mat->row; col = mat->col; bshiftn(md,1,&t); - isqrt(t,&b); -#if 0 isqrt(t,&s); bshiftn(s,64,&b); if ( !b ) b = ONEN; -#endif dn0 = ONE; tmat = (N **)mat->body; rmat = (Q **)nm->body;