🔧 compile attributes for Rcpp package builds

lenarddome · Aug 16, 2023 · 0095df8 · 0095df8
1 parent e3701b8
commit 0095df8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -1,7 +1,7 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-pspGlobal <- function(model, control, save = FALSE, path = ".", quiet = FALSE) {
-    .Call(`_psp_pspGlobal`, model, control, save, path, quiet)
+pspGlobal <- function(model, discretize, control, save = FALSE, path = ".", extension = ".csv", quiet = FALSE) {
+    .Call(`_psp_pspGlobal`, model, discretize, control, save, path, extension, quiet)
 }
 
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -12,23 +12,25 @@ Rcpp::Rostream<false>& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get();
 #endif
 
 // pspGlobal
-List pspGlobal(Function model, List control, bool save, std::string path, bool quiet);
-RcppExport SEXP _psp_pspGlobal(SEXP modelSEXP, SEXP controlSEXP, SEXP saveSEXP, SEXP pathSEXP, SEXP quietSEXP) {
+List pspGlobal(Function model, Function discretize, List control, bool save, std::string path, std::string extension, bool quiet);
+RcppExport SEXP _psp_pspGlobal(SEXP modelSEXP, SEXP discretizeSEXP, SEXP controlSEXP, SEXP saveSEXP, SEXP pathSEXP, SEXP extensionSEXP, SEXP quietSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
     Rcpp::traits::input_parameter< Function >::type model(modelSEXP);
+    Rcpp::traits::input_parameter< Function >::type discretize(discretizeSEXP);
     Rcpp::traits::input_parameter< List >::type control(controlSEXP);
     Rcpp::traits::input_parameter< bool >::type save(saveSEXP);
     Rcpp::traits::input_parameter< std::string >::type path(pathSEXP);
+    Rcpp::traits::input_parameter< std::string >::type extension(extensionSEXP);
     Rcpp::traits::input_parameter< bool >::type quiet(quietSEXP);
-    rcpp_result_gen = Rcpp::wrap(pspGlobal(model, control, save, path, quiet));
+    rcpp_result_gen = Rcpp::wrap(pspGlobal(model, discretize, control, save, path, extension, quiet));
     return rcpp_result_gen;
 END_RCPP
 }
 
 static const R_CallMethodDef CallEntries[] = {
-    {"_psp_pspGlobal", (DL_FUNC) &_psp_pspGlobal, 5},
+    {"_psp_pspGlobal", (DL_FUNC) &_psp_pspGlobal, 7},
     {NULL, NULL, 0}
 };
 

diff --git a/src/pspGlobal.cpp b/src/pspGlobal.cpp
@@ -249,9 +249,9 @@ List pspGlobal(Function model, Function discretize, List control, bool save = fa
   if (save) {
     vec match = MatchJumpDists(storage, ordinal);
     CreateFile(parameter_names, path + "_parameters" + extension);
-    CreateFile(stimuli_names, path + "_probabilities" + extension);
+    CreateFile(stimuli_names, path + "_continuous" + extension);
     WriteFile(0, jumping_distribution, match, path + "_parameters" + extension);
-    WriteFile(0, continuous, match, path + "_probabilities" + extension);
+    WriteFile(0, continuous, match, path + "_continuous" + extension);
   }
 
   // run parameter space partitioning until parameter is filled
@@ -303,7 +303,7 @@ List pspGlobal(Function model, Function discretize, List control, bool save = fa
       // index locations of currently found patterns in storage
       vec match = MatchJumpDists(storage, ordinal);
       WriteFile(iteration, jumping_distribution, match, path + "_parameters" + extension);
-      WriteFile(0, continuous, match, path + "_probabilities" + extension);
+      WriteFile(0, continuous, match, path + "_continuous" + extension);
     }
 
     // check if either of the parameter_filled thresholds is reached