Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: MCSimMod
Title: Working with 'MCSim' Models
Version: 1.1.9000
Version: 1.2
Authors@R: c(
person("Dustin F.", "Kapraun", role=c("aut", "cre"), email = "kapraun.dustin@epa.gov", comment = c(ORCID = "0000-0001-5570-6383")),
person("Todd J.", "Zurlinden", role="aut", comment = c(ORCID = "0000-0003-1372-3913")),
Expand Down
4 changes: 2 additions & 2 deletions R/MCSim_model.R
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ Model <- setRefClass("Model",
Y0 <<- initStates(parms)
},
updateParms = function(new_parms = NULL) {
"Update values of parameters for the Model object."
"Reset the values of the parameters for the Model object to their default values and then update the values of any parameters named in the argument `new_parms` using values provided in that argument."
parms <<- initParms(new_parms)
},
updateY0 = function(new_states = NULL) {
"Update values of initial conditions of state variables for the Model object."
"Reset the values of the initial conditions of state variables for the Model object to their default values and then update the values of the initial conditions of any state variables named in the argument `new_states` using values provided in that argument."
Y0 <<- initStates(parms, new_states)
},
runModel = function(times, ...) {
Expand Down
7 changes: 5 additions & 2 deletions R/fixPath.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
# fixPath
#----------------
# Private function to create platform-dependent mPath and mName
# based on absolute path generate by normalizePath
# based on absolute path generated by normalizePath

.fixPath <- function(file) {
new.mName <- strsplit(basename(file), "[.]")[[1]][1]
new.mPath <- dirname(file)
if (.Platform$OS.type == "windows") {
new.mPath <- gsub("\\\\", "/", utils::shortPathName(new.mPath))
}

has_space <- grepl(" ", new.mPath)
if (has_space == T) {
if (has_space == TRUE) {
stop("Error: User-defined directory has space which will throw error for .dll/.so compilation")
}

Expand Down
4 changes: 2 additions & 2 deletions man/Model-class.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.