From 0914fe94394eaefba557a304b37c8a25283ee66f Mon Sep 17 00:00:00 2001 From: NippunSharma Date: Wed, 27 Jan 2021 16:01:41 +0530 Subject: [PATCH] added PARAM_IN_WITH_NAME --- src/mlpack/core/util/param.hpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/mlpack/core/util/param.hpp b/src/mlpack/core/util/param.hpp index 73f462e464..e2b58d1dcd 100644 --- a/src/mlpack/core/util/param.hpp +++ b/src/mlpack/core/util/param.hpp @@ -1013,9 +1013,11 @@ using DatasetInfo = DatasetMapper; * collisions are still possible, and they produce bizarre error messages. See * https://github.com/mlpack/mlpack/issues/100 for more information. */ +#define TUPLE_TYPE std::tuple #define PARAM_MATRIX_AND_INFO_IN(ID, DESC, ALIAS) \ - PARAM_IN(std::tuple, ID, DESC, ALIAS, \ - std::tuple(), false) + PARAM_IN_WITH_NAME(TUPLE_TYPE, ID, DESC, ALIAS, \ + "std::tuple", TUPLE_TYPE(), \ + false) /** * Define an input model. From the command line, the user can specify the file @@ -1228,6 +1230,11 @@ using DatasetInfo = DatasetMapper; JOIN(io_option_dummy_object_in_, __COUNTER__) \ (DEF, ID, DESC, ALIAS, #T, REQ, true, false, testName); + #define PARAM_IN_WITH_NAME(T, ID, DESC, ALIAS, NAME, DEF, REQ) \ + static mlpack::util::Option \ + JOIN(io_option_dummy_object_in_, __COUNTER__) \ + (DEF, ID, DESC, ALIAS, NAME, REQ, true, false, testName); + #define PARAM_OUT(T, ID, DESC, ALIAS, DEF, REQ) \ static mlpack::util::Option \ JOIN(io_option_dummy_object_out_, __COUNTER__) \ @@ -1285,6 +1292,11 @@ using DatasetInfo = DatasetMapper; JOIN(JOIN(io_option_dummy_object_in_, __LINE__), opt) \ (DEF, ID, DESC, ALIAS, #T, REQ, true, false, testName); + #define PARAM_IN_WITH_NAME(T, ID, DESC, ALIAS, NAME, DEF, REQ) \ + static mlpack::util::Option \ + JOIN(JOIN(io_option_dummy_object_in_, __LINE__), opt) \ + (DEF, ID, DESC, ALIAS, NAME, REQ, true, false, testName); + #define PARAM_OUT(T, ID, DESC, ALIAS, DEF, REQ) \ static mlpack::util::Option \ JOIN(JOIN(io_option_dummy_object_out_, __LINE__), opt) \