[BACK]Return to array.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/array.c between version 1.53 and 1.55

version 1.53, 2006/06/12 11:52:10 version 1.55, 2006/10/26 10:49:16
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * 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.54 2006/06/17 10:12:06 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 1542  int generic_gauss_elim_hensel(MAT mat,MAT *nmmat,Q *dn
Line 1542  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;          MAT bmat,xmat;
         Q **a0,**a,**b,**x,**nm;          Q **a0,**a,**b,**x,**nm;
Line 1566  int generic_gauss_elim_hensel_dalg(MAT mat,MAT *nmmat,
Line 1566  int generic_gauss_elim_hensel_dalg(MAT mat,MAT *nmmat,
         N wn;          N wn;
         Q wq;          Q wq;
         NumberField nf;          NumberField nf;
         DP *mb;  
         DP m;          DP m;
         int col1;          int col1;
   
         nf = get_numberfield();  
         mb = nf->mb;  
         a0 = (Q **)mat->body;          a0 = (Q **)mat->body;
         row = mat->row; col = mat->col;          row = mat->row; col = mat->col;
         w = (int **)almat(row,col);          w = (int **)almat(row,col);
Line 1818  int intmtoratm(MAT mat,N md,MAT nm,Q *dn)
Line 1815  int intmtoratm(MAT mat,N md,MAT nm,Q *dn)
                 return 0;                  return 0;
         row = mat->row; col = mat->col;          row = mat->row; col = mat->col;
         bshiftn(md,1,&t);          bshiftn(md,1,&t);
         isqrt(t,&b);  
 #if 0  
         isqrt(t,&s);          isqrt(t,&s);
         bshiftn(s,64,&b);          bshiftn(s,64,&b);
         if ( !b )          if ( !b )
                 b = ONEN;                  b = ONEN;
 #endif  
         dn0 = ONE;          dn0 = ONE;
         tmat = (N **)mat->body;          tmat = (N **)mat->body;
         rmat = (Q **)nm->body;          rmat = (Q **)nm->body;

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.55

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>