More robust parameter file handling

covid-sim.vcxproj

@@ -98,6 +98,8 @@
     <ClCompile Include="src\Error.cpp" />
     <ClCompile Include="src\Kernels.cpp" />
     <ClCompile Include="src\Memory.cpp" />
+    <ClCompile Include="src\ParamFile.cpp" />
+    <ClCompile Include="src\Parsers.cpp" />
     <ClCompile Include="src\Rand.cpp" />
     <ClCompile Include="src\SetupModel.cpp" />
     <ClCompile Include="src\CovidSim.cpp" />
@@ -123,6 +125,8 @@
     <ClInclude Include="src\Model.h" />
     <ClInclude Include="src\ModelMacros.h" />
     <ClInclude Include="src\Param.h" />
+    <ClInclude Include="src\ParamFile.h" />
+    <ClInclude Include="src\Parsers.h" />
     <ClInclude Include="src\Rand.h" />
     <ClInclude Include="src\SetupModel.h" />
     <ClInclude Include="src\CovidSim.h" />

src/CLI.cpp

@@ -9,78 +9,7 @@
 #include "CLI.h"
 #include "Error.h"
 #include "Param.h"
-
-void parse_string(std::string const& input, std::string& output)
-{
-	output = input;
-}
-
-void parse_read_file(std::string const& input, std::string& output)
-{
-	// check to see if the file exists and error out if it doesn't
-	if (static_cast<bool>(std::ifstream(input)) == false)
-	{
-		ERR_CRITICAL_FMT("%s is not a file\n", input.c_str());
-	}
-	output = input;
-}
-
-void parse_write_dir(std::string const& input, std::string& output)
-{
-	// check to see if this prefix already exists as a file and error out
-	if (static_cast<bool>(std::ifstream(input)) == true)
-	{
-		ERR_CRITICAL_FMT("Cannot use this prefix, this path already exists"
-						 " as a file: %s\n", input.c_str());
-	}
-	// TODO: add a platform-independent check to see if the prefix could
-	// be added as a directory or file
-	output = input;
-}
-
-void parse_integer(std::string const& input, int& output)
-{
-	try
-	{
-		std::size_t pos;
-		output = std::stoi(input, &pos);
-		if (pos != input.size())
-		{
-			ERR_CRITICAL_FMT("Detected invalid characters after parsed integer: %s\n", input.c_str());
-		}
-	}
-	catch (const std::invalid_argument& e)
-	{
-		ERR_CRITICAL_FMT("EINVAL: Expected integer got %s\n", input.c_str());
-	}
-	catch (const std::out_of_range& e)
-	{
-		ERR_CRITICAL_FMT("ERANGE: Input integer is out of range. Expected %d to %d. Got %s\n",
-						std::numeric_limits<int>::min(), std::numeric_limits<int>::max(), input.c_str());
-	}
-}
-
-void parse_double(std::string const& input, double& output)
-{
-	try
-	{
-		std::size_t pos;
-		output = std::stod(input, &pos);
-		if (pos != input.size())
-		{
-			ERR_CRITICAL_FMT("Detected invalid characters after parsed double: %s\n", input.c_str());
-		}
-	}
-	catch (const std::invalid_argument& e)
-	{
-		ERR_CRITICAL_FMT("EINVAL: Expected double got %s\n", input.c_str());
-	}
-	catch (const std::out_of_range& e)
-	{
-		ERR_CRITICAL_FMT("ERANGE: Input integer is out of range. Expected %.4e to %.4e. Got %s\n",
-						std::numeric_limits<double>::min(), std::numeric_limits<double>::max(), input.c_str());
-	}
-}
+#include "Parsers.h"
 
 void CmdLineArgs::add_custom_option(std::string const& option, ParserFn func, std::string const& doc)
 {
@@ -94,12 +23,12 @@ void CmdLineArgs::add_custom_option(std::string const& option, ParserFn func, st
 
 void CmdLineArgs::add_double_option(std::string const& option, double& output, std::string const& doc)
 {
-	add_custom_option(option, std::bind(parse_double, std::placeholders::_1, std::ref(output)), doc);
+	add_custom_option(option, std::bind(parse_double_or_exit, std::placeholders::_1, std::ref(output)), doc);
 }
 
 void CmdLineArgs::add_integer_option(std::string const& option, int& output, std::string const& doc)
 {
-	add_custom_option(option, std::bind(parse_integer, std::placeholders::_1, std::ref(output)), doc);
+	add_custom_option(option, std::bind(parse_integer_or_exit, std::placeholders::_1, std::ref(output)), doc);
 }
 
 void CmdLineArgs::add_string_option(std::string const& option, StringParserFn func, std::string& output, std::string const& doc)
@@ -127,10 +56,10 @@ void CmdLineArgs::parse(int argc, char* argv[], Param& P)
 
 	// Get seeds.
 	int i = argc - 4;
-	parse_integer(argv[i], P.setupSeed1);
-	parse_integer(argv[i+1], P.setupSeed2);
-	parse_integer(argv[i+2], P.runSeed1);
-	parse_integer(argv[i+3], P.runSeed2);
+	parse_integer_or_exit(argv[i], P.setupSeed1);
+	parse_integer_or_exit(argv[i+1], P.setupSeed2);
+	parse_integer_or_exit(argv[i+2], P.runSeed1);
+	parse_integer_or_exit(argv[i+3], P.runSeed2);
 
 	for (i = 1; i < argc - 4; i++)
 	{

src/CLI.h

@@ -8,35 +8,6 @@
 // only a forward-declartion, no need to pull in all of Param.h in this header
 struct Param;
 
-// The parse_* functions are kept outside of the CmdLineArgs class because they
-// can be used to parse any string input and are not specific to CLI arguments.
-// e.g. they may eventually be useful for parsing from the (pre)param files
-
-/**
- * Parses and checks if the input string is a readable file on-disk.
- */
-void parse_read_file(std::string const& input, std::string& output);
-
-/**
- *  Parses and checks if the input string is a writable directory.
- */
-void parse_write_dir(std::string const& input, std::string& output);
-
-/**
- *  handles general string.
- */
-void parse_string(std::string const& input, std::string& output);
-
-/**
- * Parses and checks if the input string is an integer.
- */
-void parse_integer(std::string const& input, int& output);
-
-/**
- * Parses and checks if the input string is an double.
- */
-void parse_double(std::string const& input, double& output);
-
 class CmdLineArgs {
 public:
 	// Function prototype for a generic parser function

src/CMakeLists.txt

@@ -3,11 +3,12 @@
 # Set up the IDE
 set(MAIN_SRC_FILES CovidSim.cpp BinIO.cpp Rand.cpp Error.cpp Dist.cpp
   Kernels.cpp Bitmap.cpp SetupModel.cpp CalcInfSusc.cpp Sweep.cpp Update.cpp
-  Param.cpp Direction.cpp InverseCdf.cpp Memory.cpp CLI.cpp)
+  Param.cpp Direction.cpp InverseCdf.cpp Memory.cpp CLI.cpp ParamFile.cpp
+  Parsers.cpp)
 set(MAIN_HDR_FILES CovidSim.h BinIO.h Rand.h Constants.h Country.h Error.h
   Dist.h Kernels.h Bitmap.h Model.h Param.h SetupModel.h ModelMacros.h
   InfStat.h CalcInfSusc.h Sweep.h Update.h MicroCellPosition.hpp Direction.hpp
-  InverseCdf.h Memory.h CLI.h)
+  InverseCdf.h Memory.h CLI.h ParamFile.h Parsers.h)
 source_group(covidsim\\main FILES ${MAIN_SRC_FILES} ${MAIN_HDR_FILES})
 
 # CovidSim target