From eb9573c61c90c7f0c72b16ff3b1300bc352b56ec Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 6 Apr 2016 11:32:51 -0400 Subject: [PATCH] MAINT: fro -> frobenius --- acb_mat.h | 2 +- acb_mat/{bound_fro_norm.c => bound_frobenius_norm.c} | 2 +- acb_mat/test/t-trace.c | 12 ++++++------ arb_mat.h | 2 +- arb_mat/{bound_fro_norm.c => bound_frobenius_norm.c} | 2 +- arb_mat/test/t-trace.c | 12 ++++++------ doc/source/acb_mat.rst | 2 +- doc/source/arb_mat.rst | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) rename acb_mat/{bound_fro_norm.c => bound_frobenius_norm.c} (96%) rename arb_mat/{bound_fro_norm.c => bound_frobenius_norm.c} (96%) diff --git a/acb_mat.h b/acb_mat.h index fb114585..e594764c 100644 --- a/acb_mat.h +++ b/acb_mat.h @@ -150,7 +150,7 @@ void acb_mat_transpose(acb_mat_t mat1, const acb_mat_t mat2); void acb_mat_bound_inf_norm(mag_t b, const acb_mat_t A); -void acb_mat_bound_fro_norm(mag_t b, const acb_mat_t A); +void acb_mat_bound_frobenius_norm(mag_t b, const acb_mat_t A); /* Arithmetic */ diff --git a/acb_mat/bound_fro_norm.c b/acb_mat/bound_frobenius_norm.c similarity index 96% rename from acb_mat/bound_fro_norm.c rename to acb_mat/bound_frobenius_norm.c index de4cd6c7..cc453e3e 100644 --- a/acb_mat/bound_fro_norm.c +++ b/acb_mat/bound_frobenius_norm.c @@ -26,7 +26,7 @@ #include "acb_mat.h" void -acb_mat_bound_fro_norm(mag_t b, const acb_mat_t A) +acb_mat_bound_frobenius_norm(mag_t b, const acb_mat_t A) { slong i, j, r, c; mag_t t; diff --git a/acb_mat/test/t-trace.c b/acb_mat/test/t-trace.c index 98bbee85..f6589fc7 100644 --- a/acb_mat/test/t-trace.c +++ b/acb_mat/test/t-trace.c @@ -151,7 +151,7 @@ int main() slong m, n, prec; acb_mat_t A, AH, AHA; acb_t t; - mag_t low, fro; + mag_t low, frobenius; prec = 2 + n_randint(state, 200); @@ -174,10 +174,10 @@ int main() mag_init(low); acb_get_mag_lower(low, t); - mag_init(fro); - acb_mat_bound_fro_norm(fro, A); + mag_init(frobenius); + acb_mat_bound_frobenius_norm(frobenius, A); - if (mag_cmp(low, fro) > 0) + if (mag_cmp(low, frobenius) > 0) { flint_printf("FAIL (frobenius norm)\n", iter); flint_printf("m = %wd, n = %wd, prec = %wd\n", m, n, prec); @@ -189,7 +189,7 @@ int main() mag_printd(low, 15); flint_printf("\n\n"); flint_printf("upper(frobenius_norm(A)) = \n"); - mag_printd(fro, 15); flint_printf("\n\n"); + mag_printd(frobenius, 15); flint_printf("\n\n"); abort(); } @@ -197,7 +197,7 @@ int main() acb_clear(t); mag_clear(low); - mag_clear(fro); + mag_clear(frobenius); acb_mat_clear(A); acb_mat_clear(AH); diff --git a/arb_mat.h b/arb_mat.h index 64a32c61..5209451a 100644 --- a/arb_mat.h +++ b/arb_mat.h @@ -142,7 +142,7 @@ void arb_mat_transpose(arb_mat_t mat1, const arb_mat_t mat2); void arb_mat_bound_inf_norm(mag_t b, const arb_mat_t A); -void arb_mat_bound_fro_norm(mag_t b, const arb_mat_t A); +void arb_mat_bound_frobenius_norm(mag_t b, const arb_mat_t A); /* Arithmetic */ diff --git a/arb_mat/bound_fro_norm.c b/arb_mat/bound_frobenius_norm.c similarity index 96% rename from arb_mat/bound_fro_norm.c rename to arb_mat/bound_frobenius_norm.c index 7aab2a38..f9f544cd 100644 --- a/arb_mat/bound_fro_norm.c +++ b/arb_mat/bound_frobenius_norm.c @@ -26,7 +26,7 @@ #include "arb_mat.h" void -arb_mat_bound_fro_norm(mag_t b, const arb_mat_t A) +arb_mat_bound_frobenius_norm(mag_t b, const arb_mat_t A) { slong i, j, r, c; mag_t t; diff --git a/arb_mat/test/t-trace.c b/arb_mat/test/t-trace.c index a4793694..d4ac1fa9 100644 --- a/arb_mat/test/t-trace.c +++ b/arb_mat/test/t-trace.c @@ -142,7 +142,7 @@ int main() slong m, n, prec; arb_mat_t A, AT, ATA; arb_t t; - mag_t low, fro; + mag_t low, frobenius; prec = 2 + n_randint(state, 200); @@ -165,10 +165,10 @@ int main() mag_init(low); arb_get_mag_lower(low, t); - mag_init(fro); - arb_mat_bound_fro_norm(fro, A); + mag_init(frobenius); + arb_mat_bound_frobenius_norm(frobenius, A); - if (mag_cmp(low, fro) > 0) + if (mag_cmp(low, frobenius) > 0) { flint_printf("FAIL (frobenius norm)\n", iter); flint_printf("m = %wd, n = %wd, prec = %wd\n", m, n, prec); @@ -180,7 +180,7 @@ int main() mag_printd(low, 15); flint_printf("\n\n"); flint_printf("upper(frobenius_norm(A)) = \n"); - mag_printd(fro, 15); flint_printf("\n\n"); + mag_printd(frobenius, 15); flint_printf("\n\n"); abort(); } @@ -188,7 +188,7 @@ int main() arb_clear(t); mag_clear(low); - mag_clear(fro); + mag_clear(frobenius); arb_mat_clear(A); arb_mat_clear(AT); diff --git a/doc/source/acb_mat.rst b/doc/source/acb_mat.rst index bf614c85..85d3ca52 100644 --- a/doc/source/acb_mat.rst +++ b/doc/source/acb_mat.rst @@ -161,7 +161,7 @@ Norms Sets *b* to an upper bound for the infinity norm (i.e. the largest absolute value row sum) of *A*. -.. function:: void acb_mat_bound_fro_norm(mag_t b, const acb_mat_t A) +.. function:: void acb_mat_bound_frobenius_norm(mag_t b, const acb_mat_t A) Sets *b* to an upper bound for the Frobenius norm (i.e. the square root of the sum of squares of magnitudes of entries) of *A*. diff --git a/doc/source/arb_mat.rst b/doc/source/arb_mat.rst index 4b21245b..2d19c2ad 100644 --- a/doc/source/arb_mat.rst +++ b/doc/source/arb_mat.rst @@ -152,7 +152,7 @@ Norms Sets *b* to an upper bound for the infinity norm (i.e. the largest absolute value row sum) of *A*. -.. function:: void arb_mat_bound_fro_norm(mag_t b, const arb_mat_t A) +.. function:: void arb_mat_bound_frobenius_norm(mag_t b, const arb_mat_t A) Sets *b* to an upper bound for the Frobenius norm (i.e. the square root of the sum of squares of entries) of *A*.