diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2023-08-10 07:16:20 +0200 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2023-08-10 07:16:20 +0200 |
| commit | 60696f36ce365a82fcaae5189a1118972a4e672f (patch) | |
| tree | cbcf4c0a43e33128920ef1fa063e8d2eae2d0de9 /R | |
| parent | a01fe8923ff50dcc76c34fb09ad500f5f5433063 (diff) | |
| parent | 9abab1e2d4385039b01ad3dc0d9c5966bbe94fee (diff) | |
Merge branch 'main' into dev
Start new development version
Diffstat (limited to 'R')
| -rw-r--r-- | R/illparms.R | 4 | ||||
| -rw-r--r-- | R/read_spreadsheet.R | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/R/illparms.R b/R/illparms.R index eef4bd33..68a6bff6 100644 --- a/R/illparms.R +++ b/R/illparms.R @@ -106,7 +106,7 @@ illparms.saem.mmkin <- function(object, conf.level = 0.95, random = TRUE, errmod ill_parms <- c(ill_parms, names(which(ill_parms_random))) } if (errmod) { - ill_parms_errmod <- ints$errmod[, "lower"] < 0 & ints$errmod[, "est."] > 0 + ill_parms_errmod <- ints$errmod[, "lower"] < 0 & ints$errmod[, "upper"] > 0 ill_parms <- c(ill_parms, names(which(ill_parms_errmod))) } if (slopes) { @@ -115,7 +115,7 @@ illparms.saem.mmkin <- function(object, conf.level = 0.95, random = TRUE, errmod ci <- object$so@results@conf.int rownames(ci) <- ci$name slope_ci <- ci[slope_names, ] - ill_parms_slopes <- slope_ci[, "lower"] < 0 & slope_ci[, "estimate"] > 0 + ill_parms_slopes <- slope_ci[, "lower"] < 0 & slope_ci[, "upper"] > 0 ill_parms <- c(ill_parms, slope_names[ill_parms_slopes]) } } diff --git a/R/read_spreadsheet.R b/R/read_spreadsheet.R index 1c5508da..bad93d43 100644 --- a/R/read_spreadsheet.R +++ b/R/read_spreadsheet.R @@ -12,7 +12,7 @@ #' to contain name and acronym of the parent compound. #' #' The dataset sheets should be named using the dataset numbers read in from -#' the 'Datasets' sheet, i.e. '1', '2', ... . In each dataset sheet, name +#' the 'Datasets' sheet, i.e. '1', '2', ... . In each dataset sheet, the name #' of the observed variable (e.g. the acronym of the parent compound or #' one of its transformation products) should be in the first column, #' the time values should be in the second colum, and the observed value @@ -26,7 +26,7 @@ #' Their names should preferably not contain special characters like spaces, #' so they can be easily used for specifying covariate models. #' -#' An similar data structure is defined as the R6 class [mkindsg], but +#' A similar data structure is defined as the R6 class [mkindsg], but #' is probably more complicated to use. #' #' @param path Absolute or relative path to the spreadsheet file |