max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-15 12:28:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed initializer. Format is given by extension in the -o argument

Browse Source
This commit is contained in:
Marco De Lucia 2024-06-11 18:45:40 +02:00
parent 8d0be5ae0d
commit fec92ad3d3
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/initializer.cpp
View File

@ -12,15 +12,15 @@
int main(int argc, char **argv) {
// pre-register expected parameters before calling `parse`
argh::parser cmdl({"-o", "--output"});
cmdl.parse(argc, argv);
if (cmdl[{"-h", "--help"}] || cmdl.pos_args().size() != 2) {
std::cout << "Usage: " << argv[0]
<< " [-o, --output output_file]"
" [-s, --setwd] "
" <script.R>"
<< " [-s, --setwd] "
<< " <PoetScript.R>"
<< std::endl;
return EXIT_SUCCESS;
}
@ -28,6 +28,7 @@ int main(int argc, char **argv) {
RInside R(argc, argv);
R.parseEvalQ(init_r_library);
R.parseEvalQ(kin_r_library);
std::string input_script = cmdl.pos_args()[1];
std::string normalized_path_script;
@ -53,11 +54,19 @@ int main(int argc, char **argv) {
std::string output_file;
cmdl({"-o", "--output"},
curr_path + "/" +
in_file_name.substr(0, in_file_name.find_last_of('.')) + ".rds") >>
output_file;
// MDL: some test to understand
// std::string output_ext = ".rds";
// if (cmdl["q"]) output_ext = ".qs";
// std::cout << "Ouptut ext: " << output_ext << " ; infile substr: "
// << in_file_name.substr(0, in_file_name.find_last_of('.')) << std::endl;
// cmdl({"-o", "--output"},
// curr_path + "/" +
// in_file_name.substr(0, in_file_name.find_last_of('.')) + ".qs") >> output_file;
cmdl({"-o", "--output"}) >> output_file;
if (cmdl[{"-s", "--setwd"}]) {
const std::string dir_path = Rcpp::as<std::string>(
Rcpp::Function("dirname")(normalized_path_script));
@ -71,13 +80,12 @@ int main(int argc, char **argv) {
init.initializeFromList(setup);
// replace file extension by .rds
Rcpp::Function save("saveRDS");
save(init.exportList(), Rcpp::wrap(output_file));
// use the generic handler defined in kin_r_library.R
Rcpp::Function SaveRObj_R("SaveRObj");
SaveRObj_R(init.exportList(), Rcpp::wrap(output_file));
std::cout << "Saved result to " << output_file << std::endl;
// parseGrid(R, grid, results);
return EXIT_SUCCESS;
}
}

3
src/poet.cpp
View File

@ -156,10 +156,9 @@ ParseRet parseInitValues(char **argv, RuntimeParameters &params) {
params.use_ai_surrogate = cmdl["ai-surrogate"];
// MDL: optional flag "qs" to switch to qsave()
// MDL: optional flag "--qs" to switch to qsave()
params.out_ext = "rds";
if (cmdl["qs"]) {
MSG("Enabled <qs> output");
params.out_ext = "qs";
}