From 4f53fc3abe422712edd6093baa89c8169a6d3ac5 Mon Sep 17 00:00:00 2001 From: gk Date: Wed, 24 Apr 2024 14:46:25 +0200 Subject: [PATCH] Version 0.6.6 - small fixes --- DESCRIPTION | 2 +- R/resource_handling.R | 2 +- R/variable_generation.R | 4 ++-- man/createResourceStubsFromCsv.Rd | 2 +- vignettes/simplaceUtil.Rmd | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d8d3e66..37ca3c5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,4 +25,4 @@ VignetteBuilder: knitr Suggests: knitr, rmarkdown, rsvg, DiagrammeRsvg Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 diff --git a/R/resource_handling.R b/R/resource_handling.R index 4e12a58..0793038 100644 --- a/R/resource_handling.R +++ b/R/resource_handling.R @@ -13,7 +13,7 @@ #' @export #' #' @examples -#' stubs <- createCsvResourceStubs( +#' stubs <- createResourceStubsFromCsv( #' filename = system.file("input","weather.csv", package="simplaceUtil"), #' id = "weather", #' sep =",", diff --git a/R/variable_generation.R b/R/variable_generation.R index 4c186f4..7450ab2 100644 --- a/R/variable_generation.R +++ b/R/variable_generation.R @@ -47,7 +47,7 @@ get_variable_value <- function(l,pos,default=TRUE) { if(get_variable_datatype(l)=="DOUBLEARRAY") { n <- strsplit(l[[pos]],",",TRUE)[[1]] - n <- na.omit(as.numeric(n)) + n <- stats::na.omit(as.numeric(n)) if(length(n)>0) { if(default) { @@ -65,7 +65,7 @@ get_variable_value <- function(l,pos,default=TRUE) { else if(get_variable_datatype(l)=="INTARRAY") { n <- strsplit(l[[pos]],",",TRUE)[[1]] - n <- na.omit(as.integer(n)) + n <- stats::na.omit(as.integer(n)) if(length(n)>0) { if(default) { diff --git a/man/createResourceStubsFromCsv.Rd b/man/createResourceStubsFromCsv.Rd index 860c49e..1b7c979 100644 --- a/man/createResourceStubsFromCsv.Rd +++ b/man/createResourceStubsFromCsv.Rd @@ -39,7 +39,7 @@ list of two strings ('interface' and 'resource') Creates XML stubs for interface and resource section from CSV file structure } \examples{ -stubs <- createCsvResourceStubs( +stubs <- createResourceStubsFromCsv( filename = system.file("input","weather.csv", package="simplaceUtil"), id = "weather", sep =",", diff --git a/vignettes/simplaceUtil.Rmd b/vignettes/simplaceUtil.Rmd index 1b6a592..720fbed 100644 --- a/vignettes/simplaceUtil.Rmd +++ b/vignettes/simplaceUtil.Rmd @@ -398,7 +398,7 @@ Data can be given in CSV or XML format. The structure of the data has to be compatible with Simplace. ```{r} -stubs <- createCsvResourceStubs( +stubs <- createResourceStubsFromCsv( filename = system.file("input","weather.csv", package="simplaceUtil"), id = "weather", sep =",",