fixed bug in getCatVarDummyNames

jhelvy · jhelvy · commit 58cb38a67463 · 2021-03-18T16:24:01.000-04:00
diff --git a/NEWS.md b/NEWS.md
@@ -9,6 +9,7 @@
 ## Bugs
 
 - Fixed bug where model with single variable would error due to a matrix being converted to a vector in the `standardDraws()` function
+- Fixed bug in `getCatVarDummyNames()` - previously used string matching, which can accidentally match with other similarly-named variables.
 
 # logitr 0.1.1
 
diff --git a/R/modelInputs.R b/R/modelInputs.R
@@ -254,9 +254,9 @@ addIntPars <- function(data, parNames, intNames, parTypes) {
 }
 
 getCatVarDummyNames <- function(data, discPar) {
-  allVars <- names(data)
-  matches <- which(grepl(paste0(discPar, "_"), allVars))
-  return(allVars[matches][-1])
+  levels <- as.vector(as.matrix(unique(data[discPar])))
+  varNames <- sort(paste(discPar, levels, sep = "_"))
+  return(varNames[-1])
 }
 
 getParSetup <- function(parNames, priceName, randPars, randPrice) {

Original file line number	Diff line number	Diff line change
`@@ -254,9 +254,9 @@ addIntPars <- function(data, parNames, intNames, parTypes) {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`getCatVarDummyNames <- function(data, discPar) {`
`257`		`- allVars <- names(data)`
`258`		`- matches <- which(grepl(paste0(discPar, "_"), allVars))`
`259`		`- return(allVars[matches][-1])`
	`257`	`+ levels <- as.vector(as.matrix(unique(data[discPar])))`
	`258`	`+ varNames <- sort(paste(discPar, levels, sep = "_"))`
	`259`	`+ return(varNames[-1])`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`getParSetup <- function(parNames, priceName, randPars, randPrice) {`