long -> slong in acb_mat/ and acb_mat/test.

This commit is contained in:
William Hart 2015-11-05 17:47:49 +00:00
parent 7e113af67c
commit ec0794bee4
41 changed files with 80 additions and 80 deletions

View file

@ -27,9 +27,9 @@
void
acb_mat_add(acb_mat_t res,
const acb_mat_t mat1, const acb_mat_t mat2, long prec)
const acb_mat_t mat1, const acb_mat_t mat2, slong prec)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(mat1); i++)
for (j = 0; j < acb_mat_ncols(mat1); j++)

View file

@ -28,7 +28,7 @@
void
acb_mat_bound_inf_norm(mag_t b, const acb_mat_t A)
{
long i, j, r, c;
slong i, j, r, c;
mag_t s, t;

View file

@ -25,9 +25,9 @@
#include "acb_mat.h"
void _acb_mat_charpoly(acb_ptr cp, const acb_mat_t mat, long prec)
void _acb_mat_charpoly(acb_ptr cp, const acb_mat_t mat, slong prec)
{
const long n = mat->r;
const slong n = mat->r;
if (n == 0)
{
@ -40,7 +40,7 @@ void _acb_mat_charpoly(acb_ptr cp, const acb_mat_t mat, long prec)
}
else
{
long i, j, k, t;
slong i, j, k, t;
acb_ptr a, A, s;
a = _acb_vec_init(n * n);
@ -94,7 +94,7 @@ void _acb_mat_charpoly(acb_ptr cp, const acb_mat_t mat, long prec)
}
}
void acb_mat_charpoly(acb_poly_t cp, const acb_mat_t mat, long prec)
void acb_mat_charpoly(acb_poly_t cp, const acb_mat_t mat, slong prec)
{
if (mat->r != mat->c)
{

View file

@ -28,7 +28,7 @@
int
acb_mat_contains(const acb_mat_t mat1, const acb_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -28,7 +28,7 @@
int
acb_mat_contains_fmpq_mat(const acb_mat_t mat1, const fmpq_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -28,7 +28,7 @@
int
acb_mat_contains_fmpz_mat(const acb_mat_t mat1, const fmpz_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -26,11 +26,11 @@
#include "acb_mat.h"
long
acb_mat_gauss_partial(acb_mat_t A, long prec)
acb_mat_gauss_partial(acb_mat_t A, slong prec)
{
acb_t e;
acb_ptr * a;
long j, m, n, r, rank, row, col, sign;
slong j, m, n, r, rank, row, col, sign;
m = A->r;
n = A->c;
@ -73,9 +73,9 @@ acb_mat_gauss_partial(acb_mat_t A, long prec)
}
void
acb_vec_get_arf_2norm_squared_bound(arf_t s, acb_srcptr vec, long len, long prec)
acb_vec_get_arf_2norm_squared_bound(arf_t s, acb_srcptr vec, slong len, slong prec)
{
long i;
slong i;
arf_t t;
arf_init(t);
@ -93,9 +93,9 @@ acb_vec_get_arf_2norm_squared_bound(arf_t s, acb_srcptr vec, long len, long prec
}
void
acb_mat_det_inplace(acb_t det, acb_mat_t A, long prec)
acb_mat_det_inplace(acb_t det, acb_mat_t A, slong prec)
{
long i, n, sign, rank;
slong i, n, sign, rank;
int is_real;
n = acb_mat_nrows(A);
@ -151,9 +151,9 @@ acb_mat_det_inplace(acb_t det, acb_mat_t A, long prec)
}
void
acb_mat_det(acb_t det, const acb_mat_t A, long prec)
acb_mat_det(acb_t det, const acb_mat_t A, slong prec)
{
long n = acb_mat_nrows(A);
slong n = acb_mat_nrows(A);
if (n == 0)
{

View file

@ -28,7 +28,7 @@
int
acb_mat_eq(const acb_mat_t mat1, const acb_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -28,7 +28,7 @@
int
acb_mat_equal(const acb_mat_t mat1, const acb_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -26,11 +26,11 @@
#include "double_extras.h"
#include "acb_mat.h"
long _arb_mat_exp_choose_N(const mag_t norm, long prec);
long _arb_mat_exp_choose_N(const mag_t norm, slong prec);
/* evaluates the truncated Taylor series (assumes no aliasing) */
void
_acb_mat_exp_taylor(acb_mat_t S, const acb_mat_t A, long N, long prec)
_acb_mat_exp_taylor(acb_mat_t S, const acb_mat_t A, slong N, slong prec)
{
if (N == 1)
{
@ -54,7 +54,7 @@ _acb_mat_exp_taylor(acb_mat_t S, const acb_mat_t A, long N, long prec)
}
else
{
long i, lo, hi, m, w, dim;
slong i, lo, hi, m, w, dim;
acb_mat_struct * pows;
acb_mat_t T, U;
fmpz_t c, f;
@ -118,9 +118,9 @@ _acb_mat_exp_taylor(acb_mat_t S, const acb_mat_t A, long N, long prec)
}
void
acb_mat_exp(acb_mat_t B, const acb_mat_t A, long prec)
acb_mat_exp(acb_mat_t B, const acb_mat_t A, slong prec)
{
long i, j, dim, wp, N, q, r;
slong i, j, dim, wp, N, q, r;
mag_t norm, err;
acb_mat_t T;
int is_real;

View file

@ -45,9 +45,9 @@ acb_cmpabs_approx(const acb_t x, const acb_t y)
long
acb_mat_find_pivot_partial(const acb_mat_t mat,
long start_row, long end_row, long c)
slong start_row, slong end_row, slong c)
{
long best_row, i;
slong best_row, i;
best_row = -1;

View file

@ -26,11 +26,11 @@
#include "acb_mat.h"
void
acb_mat_init(acb_mat_t mat, long r, long c)
acb_mat_init(acb_mat_t mat, slong r, slong c)
{
if (r != 0 && c != 0)
{
long i;
slong i;
mat->entries = _acb_vec_init(r * c);
mat->rows = (acb_ptr *) flint_malloc(r * sizeof(acb_ptr));

View file

@ -26,7 +26,7 @@
#include "acb_mat.h"
int
acb_mat_inv(acb_mat_t X, const acb_mat_t A, long prec)
acb_mat_inv(acb_mat_t X, const acb_mat_t A, slong prec)
{
if (X == A)
{

View file

@ -28,7 +28,7 @@
int
acb_mat_is_real(const acb_mat_t mat)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(mat); i++)
for (j = 0; j < acb_mat_ncols(mat); j++)

View file

@ -26,11 +26,11 @@
#include "acb_mat.h"
int
acb_mat_lu(long * P, acb_mat_t LU, const acb_mat_t A, long prec)
acb_mat_lu(slong * P, acb_mat_t LU, const acb_mat_t A, slong prec)
{
acb_t d, e;
acb_ptr * a;
long i, j, m, n, r, row, col;
slong i, j, m, n, r, row, col;
int result;
m = acb_mat_nrows(A);

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_mul(acb_mat_t C, const acb_mat_t A, const acb_mat_t B, long prec)
acb_mat_mul(acb_mat_t C, const acb_mat_t A, const acb_mat_t B, slong prec)
{
long ar, ac, br, bc, i, j, k;
slong ar, ac, br, bc, i, j, k;
ar = acb_mat_nrows(A);
ac = acb_mat_ncols(A);

View file

@ -28,7 +28,7 @@
int
acb_mat_ne(const acb_mat_t mat1, const acb_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -28,7 +28,7 @@
void
acb_mat_neg(acb_mat_t dest, const acb_mat_t src)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(src); i++)
for (j = 0; j < acb_mat_ncols(src); j++)

View file

@ -28,7 +28,7 @@
void
acb_mat_one(acb_mat_t mat)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(mat); i++)
for (j = 0; j < acb_mat_ncols(mat); j++)

View file

@ -28,7 +28,7 @@
int
acb_mat_overlaps(const acb_mat_t mat1, const acb_mat_t mat2)
{
long i, j;
slong i, j;
if ((acb_mat_nrows(mat1) != acb_mat_nrows(mat2)) ||
(acb_mat_ncols(mat1) != acb_mat_ncols(mat2)))

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_pow_ui(acb_mat_t B, const acb_mat_t A, ulong exp, long prec)
acb_mat_pow_ui(acb_mat_t B, const acb_mat_t A, ulong exp, slong prec)
{
long d = acb_mat_nrows(A);
slong d = acb_mat_nrows(A);
if (exp <= 2 || d <= 1)
{
@ -53,13 +53,13 @@ acb_mat_pow_ui(acb_mat_t B, const acb_mat_t A, ulong exp, long prec)
else
{
acb_mat_t T, U;
long i;
slong i;
acb_mat_init(T, d, d);
acb_mat_set(T, A);
acb_mat_init(U, d, d);
for (i = ((long) FLINT_BIT_COUNT(exp)) - 2; i >= 0; i--)
for (i = ((slong) FLINT_BIT_COUNT(exp)) - 2; i >= 0; i--)
{
acb_mat_mul(U, T, T, prec); /* todo: sqr */

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_printd(const acb_mat_t mat, long digits)
acb_mat_printd(const acb_mat_t mat, slong digits)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(mat); i++)
{

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_randtest(acb_mat_t mat, flint_rand_t state, long prec, long mag_bits)
acb_mat_randtest(acb_mat_t mat, flint_rand_t state, slong prec, slong mag_bits)
{
long i, j;
slong i, j;
if (n_randint(state, 2))
for (i = 0; i < acb_mat_nrows(mat); i++)

View file

@ -28,7 +28,7 @@
void
acb_mat_set(acb_mat_t dest, const acb_mat_t src)
{
long i, j;
slong i, j;
if (dest != src && acb_mat_ncols(src) != 0)
{

View file

@ -28,7 +28,7 @@
void
acb_mat_set_arb_mat(acb_mat_t dest, const arb_mat_t src)
{
long i, j;
slong i, j;
if (acb_mat_ncols(dest) != 0)
{

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_set_fmpq_mat(acb_mat_t dest, const fmpq_mat_t src, long prec)
acb_mat_set_fmpq_mat(acb_mat_t dest, const fmpq_mat_t src, slong prec)
{
long i, j;
slong i, j;
if (acb_mat_ncols(dest) != 0)
{

View file

@ -28,7 +28,7 @@
void
acb_mat_set_fmpz_mat(acb_mat_t dest, const fmpz_mat_t src)
{
long i, j;
slong i, j;
if (acb_mat_ncols(dest) != 0)
{

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_set_round_arb_mat(acb_mat_t dest, const arb_mat_t src, long prec)
acb_mat_set_round_arb_mat(acb_mat_t dest, const arb_mat_t src, slong prec)
{
long i, j;
slong i, j;
if (acb_mat_ncols(dest) != 0)
{

View file

@ -26,9 +26,9 @@
#include "acb_mat.h"
void
acb_mat_set_round_fmpz_mat(acb_mat_t dest, const fmpz_mat_t src, long prec)
acb_mat_set_round_fmpz_mat(acb_mat_t dest, const fmpz_mat_t src, slong prec)
{
long i, j;
slong i, j;
if (acb_mat_ncols(dest) != 0)
{

View file

@ -26,10 +26,10 @@
#include "acb_mat.h"
int
acb_mat_solve(acb_mat_t X, const acb_mat_t A, const acb_mat_t B, long prec)
acb_mat_solve(acb_mat_t X, const acb_mat_t A, const acb_mat_t B, slong prec)
{
int result;
long n, m, *perm;
slong n, m, *perm;
acb_mat_t LU;
n = acb_mat_nrows(A);

View file

@ -26,10 +26,10 @@
#include "acb_mat.h"
void
acb_mat_solve_lu_precomp(acb_mat_t X, const long * perm,
const acb_mat_t A, const acb_mat_t B, long prec)
acb_mat_solve_lu_precomp(acb_mat_t X, const slong * perm,
const acb_mat_t A, const acb_mat_t B, slong prec)
{
long i, j, c, n, m;
slong i, j, c, n, m;
n = acb_mat_nrows(X);
m = acb_mat_ncols(X);

View file

@ -27,9 +27,9 @@
void
acb_mat_sub(acb_mat_t res,
const acb_mat_t mat1, const acb_mat_t mat2, long prec)
const acb_mat_t mat1, const acb_mat_t mat2, slong prec)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(mat1); i++)
for (j = 0; j < acb_mat_ncols(mat1); j++)

View file

@ -28,7 +28,7 @@
int
main(void)
{
long iter;
slong iter;
flint_rand_t state;
printf("charpoly....");
@ -40,7 +40,7 @@ main(void)
{
acb_mat_t A, B, C, D;
acb_poly_t f, g;
long m, n;
slong m, n;
m = n_randint(state, 8);
n = m;

View file

@ -27,7 +27,7 @@
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("det....");
@ -41,7 +41,7 @@ int main()
fmpq_t Qdet;
acb_mat_t A;
acb_t Adet, imagunit;
long n, qbits, prec;
slong n, qbits, prec;
int imaginary;
n = n_randint(state, 8);

View file

@ -27,7 +27,7 @@
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("exp....");
@ -41,7 +41,7 @@ int main()
acb_mat_t A, E, F, EF, G;
fmpq_mat_t Q;
acb_t c, d;
long n, qbits, prec;
slong n, qbits, prec;
n = n_randint(state, 5);
qbits = 2 + n_randint(state, 300);

View file

@ -27,7 +27,7 @@
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("inv....");
@ -39,7 +39,7 @@ int main()
{
fmpq_mat_t Q, Qinv;
acb_mat_t A, Ainv;
long n, qbits, prec;
slong n, qbits, prec;
int q_invertible, r_invertible, r_invertible2;
n = n_randint(state, 8);

View file

@ -38,7 +38,7 @@ int fmpq_mat_is_invertible(const fmpq_mat_t A)
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("lu....");
@ -50,7 +50,7 @@ int main()
{
fmpq_mat_t Q;
acb_mat_t A, LU, P, L, U, T;
long i, j, n, qbits, prec, *perm;
slong i, j, n, qbits, prec, *perm;
int q_invertible, r_invertible;
n = n_randint(state, 8);

View file

@ -28,7 +28,7 @@
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("mul....");
@ -38,7 +38,7 @@ int main()
for (iter = 0; iter < 10000; iter++)
{
long m, n, k, qbits1, qbits2, rbits1, rbits2, rbits3;
slong m, n, k, qbits1, qbits2, rbits1, rbits2, rbits3;
fmpq_mat_t A, B, C;
acb_mat_t a, b, c, d;

View file

@ -27,7 +27,7 @@
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("solve....");
@ -39,7 +39,7 @@ int main()
{
fmpq_mat_t Q, QX, QB;
acb_mat_t A, X, B;
long n, m, qbits, prec;
slong n, m, qbits, prec;
int q_invertible, r_invertible, r_invertible2;
n = n_randint(state, 8);

View file

@ -27,7 +27,7 @@
int main()
{
long iter;
slong iter;
flint_rand_t state;
printf("transpose....");
@ -37,7 +37,7 @@ int main()
for (iter = 0; iter < 10000; iter++)
{
long m, n;
slong m, n;
acb_mat_t a, b, c;
m = n_randint(state, 10);

View file

@ -28,7 +28,7 @@
void
acb_mat_zero(acb_mat_t mat)
{
long i, j;
slong i, j;
for (i = 0; i < acb_mat_nrows(mat); i++)
for (j = 0; j < acb_mat_ncols(mat); j++)