skpr v1.7.4: Fix bug in skprGUI where a model with hard to change ter…

…ms and a manually specified model would not be converted from a character string to a formula

.Rbuildignore

@@ -18,3 +18,5 @@
 ^pkgdown$
 ^tests/.*$
 _\.new\.png$
+^compile_commands\.json$
+^\.cache$

.gitignore

@@ -8,3 +8,5 @@ src/*.dll
 docs
 # {shinytest2}: Ignore new debug snapshots for `$expect_values()`
 *_.new.png
+compile_commands.json
+.cache

DESCRIPTION

@@ -1,15 +1,15 @@
 Package: skpr
 Title: Design of Experiments Suite: Generate and Evaluate Optimal Designs
-Date: 2024-07-11
-Version: 1.7.3
+Date: 2024-12-03
+Version: 1.7.4
 Authors@R: c(person("Tyler", "Morgan-Wall", email = "[email protected]", role = c("aut", "cre")),
              person("George", "Khoury", email = "[email protected]", role = c("aut")))
 Description: Generates and evaluates D, I, A, Alias, E, T, and G optimal designs. Supports generation and evaluation of blocked and split/split-split/.../N-split plot designs. Includes parametric and Monte Carlo power evaluation functions, and supports calculating power for censored responses. Provides a framework to evaluate power using functions provided in other packages or written by the user. Includes a Shiny graphical user interface that displays the underlying code used to create and evaluate the design to improve ease-of-use and make analyses more reproducible. For details, see Morgan-Wall et al. (2021) <doi:10.18637/jss.v099.i01>.
 Copyright: Institute for Defense Analyses
 Depends: 
   R (>= 3.0.2)
 License: GPL-3
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Imports: 
     utils,
     iterators,
@@ -36,3 +36,4 @@ Encoding: UTF-8
 URL: https://github.com/tylermorganwall/skpr,
     https://tylermorganwall.github.io/skpr/
 BugReports: https://github.com/tylermorganwall/skpr/issues
+Config/build/compilation-database: true

R/skprGUI.R

@@ -1807,7 +1807,7 @@ skprGUI = function(browser = FALSE, return_app = FALSE, multiuser = FALSE, progr
             regex = paste0("(\\b", term, "\\b)|(\\b", term, ":)|(:", term, "\\b)|(\\b", term, "\\s\\*)|(\\*\\s", term, "\\b)|(:", term, ":)")
             regularmodel = regularmodel | grepl(regex, modelsplit, perl = TRUE)
           }
-          paste0("~", paste(modelsplit[!regularmodel], collapse = " + "))
+          as.formula(paste0("~", paste(modelsplit[!regularmodel], collapse = " + ")))
         }
       }
     })

src/RcppExports.cpp

@@ -150,7 +150,7 @@ BEGIN_RCPP
 END_RCPP
 }
 // genOptimalDesign
-List genOptimalDesign(Eigen::MatrixXd initialdesign, const Eigen::MatrixXd& candidatelist, const std::string condition, const Eigen::MatrixXd& momentsmatrix, Eigen::VectorXd initialRows, Eigen::MatrixXd aliasdesign, const Eigen::MatrixXd& aliascandidatelist, double minDopt, double tolerance, int augmentedrows, int kexchange);
+Rcpp::List genOptimalDesign(Eigen::MatrixXd initialdesign, const Eigen::MatrixXd& candidatelist, const std::string condition, const Eigen::MatrixXd& momentsmatrix, Eigen::VectorXd initialRows, Eigen::MatrixXd aliasdesign, const Eigen::MatrixXd& aliascandidatelist, double minDopt, double tolerance, int augmentedrows, int kexchange);
 RcppExport SEXP _skpr_genOptimalDesign(SEXP initialdesignSEXP, SEXP candidatelistSEXP, SEXP conditionSEXP, SEXP momentsmatrixSEXP, SEXP initialRowsSEXP, SEXP aliasdesignSEXP, SEXP aliascandidatelistSEXP, SEXP minDoptSEXP, SEXP toleranceSEXP, SEXP augmentedrowsSEXP, SEXP kexchangeSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;

src/genOptimalDesign.cpp

@@ -1,6 +1,8 @@
+#include <Rcpp.h>
 #include <RcppEigen.h>
 // [[Rcpp::depends(RcppEigen)]]
 #include <queue>
+#include <string>
 
 #include "optimalityfunctions.h"
 #include "nullify_alg.h"
@@ -21,12 +23,12 @@ using namespace Rcpp;
 //`@param augmentedrows The rows that are fixed during the design search.
 //`@return List of design information.
 // [[Rcpp::export]]
-List genOptimalDesign(Eigen::MatrixXd initialdesign, const Eigen::MatrixXd& candidatelist,
-                      const std::string condition,
-                      const Eigen::MatrixXd& momentsmatrix, Eigen::VectorXd initialRows,
-                      Eigen::MatrixXd aliasdesign,
-                      const Eigen::MatrixXd& aliascandidatelist,
-                      double minDopt, double tolerance, int augmentedrows, int kexchange) {
+Rcpp::List genOptimalDesign(Eigen::MatrixXd initialdesign, const Eigen::MatrixXd& candidatelist,
+                            const std::string condition,
+                            const Eigen::MatrixXd& momentsmatrix, Eigen::VectorXd initialRows,
+                            Eigen::MatrixXd aliasdesign,
+                            const Eigen::MatrixXd& aliascandidatelist,
+                            double minDopt, double tolerance, int augmentedrows, int kexchange) {
   RNGScope rngScope;
   int nTrials = initialdesign.rows();
   double numberrows = initialdesign.rows();