diff --git a/DESCRIPTION b/DESCRIPTION index e156adb69..8646f3ddd 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -11,8 +11,8 @@ Description: Easily implement a variety of simulation models, with a focus on installed with `install.packages("fastshp", repos="http://rforge.net", type="source")`. URL: https://github.com/PredictiveEcology/SpaDES -Version: 1.0.2 -Date: 2015-09-09 +Version: 1.0.3 +Date: 2015-09-10 Authors@R: c( person(c("Alex", "M"), "Chubaty", email="alexander.chubaty@canada.ca", role=c("aut", "cre")), diff --git a/NEWS b/NEWS index 5e4af7949..778d8818d 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ Known issues: https://github.com/PredictiveEcology/SpaDES/issues +version 1.0.3 +============= +* fully fix `inputs` data.frame construction in `simInit` (#225) + version 1.0.2 ============= * update maintainer's and authors' email addresses diff --git a/R/simList-accessors.R b/R/simList-accessors.R index ed0c1a587..3d9a1788d 100644 --- a/R/simList-accessors.R +++ b/R/simList-accessors.R @@ -854,7 +854,7 @@ setReplaceMethod( columns <- pmatch(names(fileTable), names(value)) setnames(value, old = colnames(value)[na.omit(columns)], new = colnames(fileTable)[!is.na(columns)]) - object@inputs <- bind_rows(list(value, fileTable), stringsAsFactors = FALSE) %>% + object@inputs <- bind_rows(list(value, fileTable)) %>% as.data.frame(stringsAsFactors = FALSE) #object@inputs$file <- file.path(inputPath(object),object@inputs$file) } else { diff --git a/R/simulation.R b/R/simulation.R index 17c884726..cf3851fb9 100644 --- a/R/simulation.R +++ b/R/simulation.R @@ -391,7 +391,7 @@ setMethod( loadTime = as.numeric(time(sim, "seconds")), loaded=TRUE, stringsAsFactors = FALSE) - ), stringsAsFactors = FALSE) + )) } # keep session info for debugging & checkpointing