From ccf2f60ac7b4973325bc286ce1164273092c0814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Gr=C3=A9my?= Date: Thu, 4 Oct 2018 11:06:34 +0200 Subject: [PATCH] Rename function read_file_process -> read_file. --- tests/test_bkz.cpp | 2 +- tests/test_cvp.cpp | 6 +++--- tests/test_gso.cpp | 4 ++-- tests/test_lll.cpp | 2 +- tests/test_lll_gram.cpp | 2 +- tests/test_sieve.cpp | 4 ++-- tests/test_svp.cpp | 4 ++-- tests/test_utils.h | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/test_bkz.cpp b/tests/test_bkz.cpp index d2192426f..a2d6b2fea 100644 --- a/tests/test_bkz.cpp +++ b/tests/test_bkz.cpp @@ -274,7 +274,7 @@ int test_filename(const char *input_filename, const int block_size, { ZZ_mat A, B; int status = 0; - status |= read_file_process(A, input_filename); + status |= read_file(A, input_filename); B = A; status |= test_bkz(A, block_size, float_type, flags, prec); status |= test_bkz_param(B, block_size); diff --git a/tests/test_cvp.cpp b/tests/test_cvp.cpp index 05fb1790b..73332fb19 100644 --- a/tests/test_cvp.cpp +++ b/tests/test_cvp.cpp @@ -89,13 +89,13 @@ int test_filename(const char *input_filename_lattice, const char *input_filename { ZZ_mat A; int status = 0; - status |= read_file_process(A, input_filename_lattice); + status |= read_file(A, input_filename_lattice); vector> t; - status |= read_file_process(t, input_filename_target); + status |= read_file(t, input_filename_target); vector> b; - status |= read_file_process(b, output_filename); + status |= read_file(b, output_filename); status |= test_cvp(A, t, b, method); return status; diff --git a/tests/test_gso.cpp b/tests/test_gso.cpp index 3b64bf236..49a14cf6b 100644 --- a/tests/test_gso.cpp +++ b/tests/test_gso.cpp @@ -151,8 +151,8 @@ template int test_ggso(ZZ_mat &A) template int test_filename(const char *input_filename) { ZZ_mat A; - int status = read_file_process(A, input_filename); - // if status == 1, read_file_process fails. + int status = read_file(A, input_filename); + // if status == 1, read_file fails. if (status == 1) { return 1; diff --git a/tests/test_lll.cpp b/tests/test_lll.cpp index b86eb1db9..6e8d7a5cd 100644 --- a/tests/test_lll.cpp +++ b/tests/test_lll.cpp @@ -119,7 +119,7 @@ int test_filename(const char *input_filename, LLLMethod method, FloatType float_ { ZZ_mat A; int status = 0; - status |= read_file_process(A, input_filename); + status |= read_file(A, input_filename); status |= test_lll(A, method, float_type, flags, prec); return status; } diff --git a/tests/test_lll_gram.cpp b/tests/test_lll_gram.cpp index ac18c4799..42e7484d0 100644 --- a/tests/test_lll_gram.cpp +++ b/tests/test_lll_gram.cpp @@ -179,7 +179,7 @@ template int test_filename(const char *input_filename) { ZZ_mat A; int status = 0; - status |= read_file_process(A, input_filename); + status |= read_file(A, input_filename); status |= test_lll(A); return status; } diff --git a/tests/test_sieve.cpp b/tests/test_sieve.cpp index 4a6be9022..979ed3cf5 100644 --- a/tests/test_sieve.cpp +++ b/tests/test_sieve.cpp @@ -58,9 +58,9 @@ template int test_filename(const char *input_filename, const char *ou { ZZ_mat A; int status = 0; - status |= read_file_process(A, input_filename); + status |= read_file(A, input_filename); vector> b; - status |= read_file_process(b, output_filename); + status |= read_file(b, output_filename); status |= test_sieve(A, b); return status; } diff --git a/tests/test_svp.cpp b/tests/test_svp.cpp index 4a971cda0..77daf8abd 100644 --- a/tests/test_svp.cpp +++ b/tests/test_svp.cpp @@ -266,10 +266,10 @@ int test_filename(const char *input_filename, const char *output_filename, { ZZ_mat A; int status = 0; - status |= read_file_process(A, input_filename); + status |= read_file(A, input_filename); vector> b; - status |= read_file_process(b, output_filename); + status |= read_file(b, output_filename); switch (test) { diff --git a/tests/test_utils.h b/tests/test_utils.h index 310b55864..fa4ae3d82 100644 --- a/tests/test_utils.h +++ b/tests/test_utils.h @@ -12,7 +12,7 @@ using namespace fplll; @param input_filename @return zero if the file is correctly read, 1 otherwise. */ -template int read_file_process(T &X, const char *input_filename) { +template int read_file(T &X, const char *input_filename) { int status = 0; ifstream is; is.exceptions(std::ifstream::failbit | std::ifstream::badbit);