From fb21bec0dcf85d548333077743df2cf9725e1278 Mon Sep 17 00:00:00 2001 From: Anrijs Abele Date: Wed, 18 Dec 2024 11:49:45 +0000 Subject: [PATCH 1/2] Removing the non-numeric or non-logical variables from the model features options --- DESCRIPTION | 2 +- R/shiny_modelbuilder.R | 6 +++--- man/model_builder.Rd | 2 +- man/model_builder_shiny.Rd | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 08d1088..4ebd2bf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -16,7 +16,7 @@ BugReports: https://github.com/4DModeller/fdmr/issues License: GPL (>= 3) Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.2 Additional_repositories: https://inla.r-inla-download.org/R/testing Imports: colorspace, diff --git a/R/shiny_modelbuilder.R b/R/shiny_modelbuilder.R index b390c82..577fcdd 100644 --- a/R/shiny_modelbuilder.R +++ b/R/shiny_modelbuilder.R @@ -1,7 +1,7 @@ #' Interactively set and see the result of different priors #' #' @param spatial_data Spatial data (must be SpatialPoints or SpatialPointsDataFrame) -#' @param measurement_data Measurement data (data.frame, SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements) +#' @param measurement_data Measurement data (SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements) #' @param time_variable Time variable name in measurement_data #' @param mesh INLA/fmesher mesh #' @param data_distribution Data distribution, Poisson or Gaussian @@ -65,7 +65,7 @@ model_builder_shiny <- function(spatial_data, citation_control_group <- "Prior explanation text modified from https://www.paulamoraga.com/book-geospatial/sec-geostatisticaldataexamplest.html" initial_equation_val <- "formula <- model_var ~ 0 + Intercept(1)" - features <- names(measurement_data) + features <- names(measurement_data@data[base::sapply(measurement_data@data, is.numeric) | base::sapply(measurement_data@data, is.logical)]) if (is.null(features)) { stop("We require the columns of measurement_data to have the names of the features to use in the model.") } @@ -697,7 +697,7 @@ model_builder_shiny <- function(spatial_data, #' Interactively set and see the result of different priors #' #' @param spatial_data Spatial data -#' @param measurement_data Measurement data (data.frame, SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements) +#' @param measurement_data Measurement data (SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements) #' @param time_variable Time variable name in measurement_data #' @param mesh INLA/fmesher mesh #' @param log_folder Folder to write logs to (character) diff --git a/man/model_builder.Rd b/man/model_builder.Rd index 3ea0ac1..d8b8374 100644 --- a/man/model_builder.Rd +++ b/man/model_builder.Rd @@ -16,7 +16,7 @@ model_builder( \arguments{ \item{spatial_data}{Spatial data} -\item{measurement_data}{Measurement data (data.frame, SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements)} +\item{measurement_data}{Measurement data (SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements)} \item{time_variable}{Time variable name in measurement_data} diff --git a/man/model_builder_shiny.Rd b/man/model_builder_shiny.Rd index 22baa87..e728197 100644 --- a/man/model_builder_shiny.Rd +++ b/man/model_builder_shiny.Rd @@ -16,7 +16,7 @@ model_builder_shiny( \arguments{ \item{spatial_data}{Spatial data (must be SpatialPoints or SpatialPointsDataFrame)} -\item{measurement_data}{Measurement data (data.frame, SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements)} +\item{measurement_data}{Measurement data (SpatialPointsDataFrame, SpatialPolygonsDataFrame with a named time column and at least 1 named feature column with measurements)} \item{time_variable}{Time variable name in measurement_data} From 7ee39ea4d872579f619426e8e574a670b99669b0 Mon Sep 17 00:00:00 2001 From: "Anrijs K. Abele" <57137242+aabelean@users.noreply.github.com> Date: Wed, 18 Dec 2024 12:12:43 +0000 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea84989..4e4f9cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Removed non-numeric/non-logical variable features from `shiny_modelbuilder` - [PR #341](https://github.com/4DModeller/fdmr/pull/341) - Updated documentation for all functions to reflect better the inputs and outputs - [PR #332](https://github.com/4DModeller/fdmr/pull/332) - Fixed an error in `model_viewer` description - [PR #331](https://github.com/4DModeller/fdmr/pull/331) - Added to `retrieve_tutorial_data` an option to save tutorial data at a user-specified location or in a temporary directory as default - [PR #330](https://github.com/4DModeller/fdmr/pull/330)