From 069b739174b5d039f57f0fd1ee6a66f273eea0f0 Mon Sep 17 00:00:00 2001 From: Phuntsok Drak-pa Date: Tue, 19 Mar 2019 14:22:44 +0100 Subject: [PATCH] added number of iterations to arguments list --- src/parseargs.cc | 21 ++++++++++++++------- src/parseargs.hh | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/parseargs.cc b/src/parseargs.cc index a25d6f3..718b4d1 100644 --- a/src/parseargs.cc +++ b/src/parseargs.cc @@ -4,13 +4,18 @@ #include #include -std::tuple parse_args(int t_ac, char **t_av) { +constexpr int DEFAULT_ITERATIONS = 5000; + +std::tuple parse_args(int t_ac, + char **t_av) { namespace po = boost::program_options; po::options_description desc("Allowed options"); desc.add_options()("help,h", "Display this help message")( "input,i", po::value(), "Input image")( "output,o", po::value(), - "Image or video output path")("video,v", "Enable video output"); + "Image or video output path (default: input path + \"_output\")")( + "iterations,n", po::value(), + "Number of iterations (default: 5000)")("video,v", "Enable video output"); po::variables_map vm; po::store(po::parse_command_line(t_ac, t_av, desc), vm); po::notify(vm); @@ -18,9 +23,11 @@ std::tuple parse_args(int t_ac, char **t_av) { std::cout << desc << "\n"; std::exit(1); } - return std::make_tuple(vm["input"].as(), - (vm.count("output")) ? vm["output"].as() - : vm["input"].as() + - std::string{"_output"}, - (vm.count("video")) ? true : false); + return std::make_tuple( + vm["input"].as(), + vm.count("output") + ? vm["output"].as() + : vm["input"].as() + std::string{"_output"}, + vm.count("video") ? true : false, + vm.count("iterations") ? vm["iterations"].as() : DEFAULT_ITERATIONS); } diff --git a/src/parseargs.hh b/src/parseargs.hh index 566928a..7a26718 100644 --- a/src/parseargs.hh +++ b/src/parseargs.hh @@ -4,6 +4,6 @@ #include #include -std::tuple parse_args(int, char**); +std::tuple parse_args(int, char **); #endif /* GENETIC_IMAGE_INCLUDE_GENIMG_PARSEARGS_HH_ */