better name checking in GP terms

nicholasjclark · Nov 14, 2023 · 0cf0567 · 0cf0567
1 parent 8044118
commit 0cf0567
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 2 deletions.
diff --git a/R/families.R b/R/families.R
@@ -349,7 +349,7 @@ family_to_mgcvfam = function(family){
   } else if(family$family == 'student'){
     gaussian()
   } else if(family$family == 'lognormal'){
-    mgcv::Tweedie(p = 1.5, link = 'identity')
+    gaussian()
   } else if(family$family == 'tweedie'){
     mgcv::Tweedie(p = 1.5, link = 'log')
   } else {

diff --git a/R/gp.R b/R/gp.R
@@ -603,7 +603,8 @@ prep_gp_covariate = function(data,
 #' Clean GP names so no illegal characters are used in Stan code
 #' @noRd
 clean_gpnames = function(gp_names){
-  gp_names_clean <- gsub('(', '_', gp_names, fixed = TRUE)
+  gp_names_clean <- gsub(' ', '_', gp_names, fixed = TRUE)
+  gp_names_clean <- gsub('(', '_', gp_names_clean, fixed = TRUE)
   gp_names_clean <- gsub(')', '_', gp_names_clean, fixed = TRUE)
   gp_names_clean <- gsub(':', 'by', gp_names_clean, fixed = TRUE)
   gp_names_clean <- gsub('.', '_', gp_names_clean, fixed = TRUE)

diff --git a/src/RcppExports.o b/src/RcppExports.o
diff --git a/src/mvgam.dll b/src/mvgam.dll
diff --git a/src/trend_funs.o b/src/trend_funs.o
diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf